rename method and write tests to see if it works

puzzle · Nov 17, 2023 · 64d8262 · 64d8262
1 parent 4d80d2e
commit 64d8262
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/backend/src/main/java/ch/puzzle/okr/mapper/OverviewMapper.java b/backend/src/main/java/ch/puzzle/okr/mapper/OverviewMapper.java
@@ -69,7 +69,7 @@ private OverviewDto createOverviewDto(Overview overview) {
         return new OverviewDto(
                 new OverviewTeamDto(overview.getOverviewId().getTeamId(), overview.getTeamName(),
                         overview.isWriteable(),
-                        organisationBusinessService.teamHasInactiveOrganisations(overview.getOverviewId().getTeamId())),
+                        organisationBusinessService.teamHasInActiveOrganisations(overview.getOverviewId().getTeamId())),
                 objectives);
     }
 

diff --git a/backend/src/main/java/ch/puzzle/okr/service/business/OrganisationBusinessService.java b/backend/src/main/java/ch/puzzle/okr/service/business/OrganisationBusinessService.java
@@ -54,7 +54,7 @@ public List<Organisation> getActiveOrganisations() {
         return persistenceService.getActiveOrganisations();
     }
 
-    public boolean teamHasInactiveOrganisations(Long teamId) {
+    public boolean teamHasInActiveOrganisations(Long teamId) {
         return !getOrganisationsByTeam(teamId).stream()
                 .filter(organisation -> organisation.getState() == OrganisationState.INACTIVE).toList().isEmpty();
     }

diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/OrganisationBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/OrganisationBusinessServiceTest.java
@@ -17,6 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
@@ -34,6 +36,9 @@ class OrganisationBusinessServiceTest {
     private static final Organisation organisationThree = Organisation.Builder.builder().withId(2L)
             .withOrgName("org_three").withState(OrganisationState.ACTIVE).build();
 
+    private static final Organisation organisationInActive = Organisation.Builder.builder().withId(2L)
+            .withOrgName("org_in_active").withState(OrganisationState.INACTIVE).build();
+
     @Mock
     LdapTemplate ldapTemplate;
 
@@ -78,4 +83,18 @@ void getOrganisationsByTeamId() {
         organisationBusinessService.getOrganisationsByTeam(1L);
         verify(organisationPersistenceService, times(1)).getOrganisationsByTeamId(1L);
     }
+
+    @Test
+    void teamHasInActiveOrganisations() {
+        when(organisationPersistenceService.getOrganisationsByTeamId(anyLong()))
+                .thenReturn(List.of(organisationInActive, organisationOne, organisationTwo));
+        assertTrue(organisationBusinessService.teamHasInActiveOrganisations(1L));
+    }
+
+    @Test
+    void teamHasNoInActiveOrganisations() {
+        when(organisationPersistenceService.getOrganisationsByTeamId(anyLong()))
+                .thenReturn(List.of(organisationOne, organisationTwo, organisationThree));
+        assertFalse(organisationBusinessService.teamHasInActiveOrganisations(1L));
+    }
 }