OAM-48: Added destination/source filter for Wards/Services

OpenLMIS · Jun 13, 2024 · b8113d9 · b8113d9
1 parent 3462463
commit b8113d9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/org/openlmis/stockmanagement/service/SourceDestinationBaseService.java b/src/main/java/org/openlmis/stockmanagement/service/SourceDestinationBaseService.java
@@ -332,6 +332,21 @@ private List<ValidSourceDestinationDto> createAssignmentDto(
             return true;
           }
         })
+        .filter(assignment -> {
+          // check if assignment facility is type Ward/Service AND is in the same zone as facility
+          if (assignment.getNode().isRefDataFacility()) {
+            FacilityDto assignmentFacility =
+                facilitiesById.get(assignment.getNode().getReferenceId());
+            if (assignmentFacility.getType().getCode().equals("WS")) {
+              return assignmentFacility.getGeographicZone().getId()
+                  .equals(facility.getGeographicZone().getId());
+            } else {
+              return true;
+            }
+          } else {
+            return true;
+          }
+        })
         .filter(assignment -> !assignment.getNode().isRefDataFacility()
             || hasGeoAffinity(assignment, facility, facilitiesById))
         .collect(Collectors.toList());

diff --git a/src/test/java/org/openlmis/stockmanagement/service/SourceDestinationBaseServiceTest.java b/src/test/java/org/openlmis/stockmanagement/service/SourceDestinationBaseServiceTest.java
@@ -397,7 +397,13 @@ public void shouldReturnListOfDestinationDtosWhenFindValidDestinationAssignment(
     assertThat(facility.getName(), is(FACILITY_NODE_NAME));
     assertThat(facility.getIsFreeTextAllowed(), is(false));
   }
-
+/*
+*
+*
+*
+*
+*
+* */
   @Test
   public void
         shouldReturnListOfAllDestinationDtosWhenFindValidDestinationAssignmentWithParams()
@@ -780,6 +786,7 @@ private GeographicZoneDto generateGeographicZone(UUID districtLevelId, UUID regi
   private FacilityDto createFacilityDtoWithFacilityType(UUID facilityId, UUID facilityTypeId) {
     FacilityTypeDto facilityDto = new FacilityTypeDto();
     facilityDto.setId(facilityTypeId);
+    facilityDto.setCode("TEST");
     return FacilityDto.builder()
         .id(facilityId)
         .type(facilityDto)