OAM-65: Added extra test checks

Changed columnDefinition constant to boolean
OpenLMIS · May 17, 2024 · 622df5f · 622df5f
1 parent a0b40a4
commit 622df5f
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 10 deletions.
diff --git a/...ava/org/openlmis/stockmanagement/web/ValidSourceDestinationControllerIntegrationTest.java b/...ava/org/openlmis/stockmanagement/web/ValidSourceDestinationControllerIntegrationTest.java
@@ -47,6 +47,7 @@ public class ValidSourceDestinationControllerIntegrationTest extends BaseWebTest
 
   private static final String PROGRAM_ID = "programId";
   private static final String FACILITY_ID = "facilityId";
+  private static final String INCLUDE_DISABLED = "includeDisabled";
   private static final String API_VALID_DESTINATIONS = "/api/validDestinations";
   private static final String API_VALID_SOURCES = "/api/validSources";
   private static final String PROGRAM_EXP = "$.programId";
@@ -85,10 +86,11 @@ public void shouldGetValidSourcesOrDestinationsByProgramAndFacility()
     verifyZeroInteractions(permissionService);
 
     //1. perform valid destinations
-    performSourcesOrDestinations(program, facility, sourceDestination, API_VALID_DESTINATIONS);
+    performSourcesOrDestinations(program, facility, false, sourceDestination,
+        API_VALID_DESTINATIONS);
 
     //2. perform valid sources
-    performSourcesOrDestinations(program, facility, sourceDestination, API_VALID_SOURCES);
+    performSourcesOrDestinations(program, facility, false, sourceDestination, API_VALID_SOURCES);
   }
 
   @Test
@@ -101,19 +103,21 @@ public void shouldGeAllValidSourcesOrDestinationsWhenProgramAndFacilityAreNotPro
     destinationAssignmentDto.setIsFreeTextAllowed(true);
     ValidSourceDestinationDto sourceAssignmentDto = destinationAssignmentDto;
 
-    when(validSourceService.findSources(null, null, false, pageRequest))
+    when(validSourceService.findSources(null, null, true, pageRequest))
             .thenReturn(Pagination.getPage(singletonList(sourceAssignmentDto)));
 
-    when(validDestinationService.findDestinations(null, null, false, pageRequest))
+    when(validDestinationService.findDestinations(null, null, true, pageRequest))
             .thenReturn(Pagination.getPage(singletonList(destinationAssignmentDto)));
 
     verifyZeroInteractions(permissionService);
 
     //1. perform valid destinations
-    performSourcesOrDestinations(null, null, destinationAssignmentDto, API_VALID_DESTINATIONS);
+    performSourcesOrDestinations(null, null, true, destinationAssignmentDto,
+        API_VALID_DESTINATIONS);
 
     //2. perform valid sources
-    performSourcesOrDestinations(null, null, sourceAssignmentDto, API_VALID_SOURCES);
+    performSourcesOrDestinations(null, null, true, sourceAssignmentDto,
+        API_VALID_SOURCES);
   }
 
   @Test
@@ -252,12 +256,13 @@ public void shouldReturn204WhenDestinationAssignmentRemoved() throws Exception {
   }
 
   private void performSourcesOrDestinations(
-      UUID programId, UUID facilityId,
+      UUID programId, UUID facilityId, boolean includeDisabled,
       ValidSourceDestinationDto sourceDestinationDto, String uri) throws Exception {
     ResultActions resultActions = mvc.perform(get(uri)
         .param(ACCESS_TOKEN, ACCESS_TOKEN_VALUE)
         .param(PROGRAM_ID, programId != null ? programId.toString() : null)
         .param(FACILITY_ID, facilityId != null ? facilityId.toString() : null)
+        .param(INCLUDE_DISABLED, Boolean.toString(includeDisabled))
         .param("page", "0")
         .param("size", "20"));
 

diff --git a/src/main/java/org/openlmis/stockmanagement/domain/BaseEntity.java b/src/main/java/org/openlmis/stockmanagement/domain/BaseEntity.java
@@ -27,7 +27,7 @@
 @MappedSuperclass
 public abstract class BaseEntity {
   protected static final String TEXT_COLUMN_DEFINITION = "text";
-  protected static final String BOOLEAN_COLUMN_DEFINITION = "bool";
+  protected static final String BOOLEAN_COLUMN_DEFINITION = "boolean";
   protected static final String PG_UUID = "pg-uuid";
 
   @Id

diff --git a/src/test/java/org/openlmis/stockmanagement/service/SourceDestinationBaseServiceTest.java b/src/test/java/org/openlmis/stockmanagement/service/SourceDestinationBaseServiceTest.java
@@ -314,8 +314,7 @@ public void shouldReturn400WhenDestinationNotFound() throws Exception {
   }
 
   @Test
-  public void
-      shouldReturnListOfAllDestinationDtosWhenIncludeDisabledTrue()
+  public void shouldReturnListOfAllDestinationDtosWhenIncludeDisabledTrue()
       throws Exception {
     //given
     UUID facilityTypeId = randomUUID();
@@ -370,6 +369,7 @@ public void shouldReturnListOfDestinationDtosWhenFindValidDestinationAssignment(
 
     List<ValidDestinationAssignment> validDestinationAssignments = asList(
         createOrganizationDestination(mockedOrganizationNode(ORGANIZATION_NODE_NAME)),
+        createOrganizationDestination(mockedOrganizationNode(ORGANIZATION_NODE_NAME, true)),
         createFacilityDestination(mockedFacilityNode(facilityId, FACILITY_NODE_NAME)),
         createFacilityDestination(mockedFacilityNode(facilityId, FACILITY_NODE_NAME))
     );
@@ -398,6 +398,54 @@ public void shouldReturnListOfDestinationDtosWhenFindValidDestinationAssignment(
     assertThat(facility.getIsFreeTextAllowed(), is(false));
   }
 
+  @Test
+  public void
+        shouldReturnListOfAllDestinationDtosWhenFindValidDestinationAssignmentWithParams()
+      throws Exception {
+    //given
+    UUID programId = randomUUID();
+    UUID facilityTypeId = randomUUID();
+    UUID facilityId = randomUUID();
+    FacilityDto facilityDto = createFacilityDtoWithFacilityType(facilityId, facilityTypeId);
+    facilityDto.setName(FACILITY_NODE_NAME);
+    PageRequest pageRequest = PageRequest.of(0,4);
+
+    when(facilityReferenceDataService.findOne(facilityId)).thenReturn(facilityDto);
+
+    doNothing().when(programFacilityTypeExistenceService)
+        .checkProgramAndFacilityTypeExist(programId, facilityTypeId);
+
+    List<ValidDestinationAssignment> validDestinationAssignments = asList(
+        createOrganizationDestination(mockedOrganizationNode(ORGANIZATION_NODE_NAME)),
+        createOrganizationDestination(mockedOrganizationNode(ORGANIZATION_NODE_NAME, true)),
+        createFacilityDestination(mockedFacilityNode(facilityId, FACILITY_NODE_NAME)),
+        createFacilityDestination(mockedFacilityNode(facilityId, FACILITY_NODE_NAME))
+    );
+
+    when(destinationRepository.findByProgramIdAndFacilityTypeId(
+        programId, facilityTypeId, Pageable.unpaged()))
+        .thenReturn(validDestinationAssignments);
+
+    when(facilityReferenceDataService.findByIds(anyListOf(UUID.class))).thenReturn(
+        Collections.singletonMap(facilityId, facilityDto));
+
+    //when
+    Page<ValidSourceDestinationDto> validDestinations =
+        validDestinationService.findDestinations(programId, facilityId, true, pageRequest);
+
+    //then
+    assertThat(validDestinations.getContent().size(), is(4));
+    assertThat(validDestinations.getTotalPages(), is(1));
+
+    ValidSourceDestinationDto organization = validDestinations.getContent().get(0);
+    assertThat(organization.getName(), is(ORGANIZATION_NODE_NAME));
+    assertThat(organization.getIsFreeTextAllowed(), is(true));
+
+    ValidSourceDestinationDto facility = validDestinations.getContent().get(2);
+    assertThat(facility.getName(), is(FACILITY_NODE_NAME));
+    assertThat(facility.getIsFreeTextAllowed(), is(false));
+  }
+
   @Test
   public void shouldReturnListOfAllSourcesDtosWhenIncludeDisabledParamTrue()
           throws Exception {