#13206 use house number too for searching facility by address (#13264)

* #13206 use souse number too for searching facility by address

* #13206 use souse number too for searching facility by address - remove unused variable declarations in test

---------

Co-authored-by: Levente Gal <levente.gal.ext@vitagroup.ag>

Author: leventegal-she

sormas-api/src/main/java/de/symeda/sormas/api/infrastructure/facility/FacilityFacade.java

@@ -64,7 +64,7 @@ List<FacilityReferenceDto> getByNameAndType(
 		FacilityType type,
 		boolean includeArchivedEntities);
 
-	FacilityReferenceDto getByAddress(String street, String postalCode, String city);
+	FacilityReferenceDto getByAddress(String street, String houseNumber, String postalCode, String city);
 
 	List<FacilityReferenceDto> getLaboratoriesByName(String name, boolean includeArchivedEntities);
 

sormas-backend/src/main/java/de/symeda/sormas/backend/infrastructure/facility/FacilityFacadeEjb.java

@@ -333,9 +333,9 @@ public List<FacilityReferenceDto> getByNameAndType(
 	}
 
 	@Override
-	public FacilityReferenceDto getByAddress(String street, String postalCode, String city) {
+	public FacilityReferenceDto getByAddress(String street, String houseNumber, String postalCode, String city) {
 
-		return toReferenceDto(service.getByAddress(street, postalCode, city));
+		return toReferenceDto(service.getByAddress(street, houseNumber, postalCode, city));
 	}
 
 	@Override

sormas-backend/src/main/java/de/symeda/sormas/backend/infrastructure/facility/FacilityService.java

@@ -16,6 +16,7 @@
 package de.symeda.sormas.backend.infrastructure.facility;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.BiFunction;
 
 import javax.ejb.EJB;
@@ -200,7 +201,7 @@ public List<Facility> getFacilitiesByNameAndType(
 		return em.createQuery(cq).getResultList();
 	}
 
-	public Facility getByAddress(String street, String postalCode, String city) {
+	public Facility getByAddress(String street, String houseNumber, String postalCode, String city) {
 
 		if (StringUtils.isAnyBlank(street, postalCode, city)) {
 			return null;
@@ -213,6 +214,9 @@ public Facility getByAddress(String street, String postalCode, String city) {
 		Predicate filter = cb.and(
 			createBasicFilter(cb, from),
 			cb.equal(cb.lower(cb.trim(from.get(Facility.STREET))), street.trim().toLowerCase()),
+			cb.equal(
+				cb.lower(cb.trim(from.get(Facility.HOUSE_NUMBER))),
+				Optional.ofNullable(houseNumber).map(s -> s.trim().toLowerCase()).orElse(null)),
 			cb.equal(cb.lower(cb.trim(from.get(Facility.POSTAL_CODE))), postalCode.trim().toLowerCase()),
 			cb.equal(cb.lower(cb.trim(from.get(Facility.CITY))), city.trim().toLowerCase()));
 

sormas-backend/src/test/java/de/symeda/sormas/backend/infrastructure/facility/FacilityFacadeEjbTest.java

@@ -228,29 +228,34 @@ public void testGetByAddress() {
 		RDCF rdcf = creator.createRDCF();
 		FacilityDto fac1 = creator.createFacility("Fac1", rdcf.region, rdcf.district, facility -> {
 			facility.setStreet("Street1");
+			facility.setHouseNumber("1");
 			facility.setPostalCode("PostalCode1");
 			facility.setCity("City1");
 		});
-		FacilityDto fac2 = creator.createFacility("Fac2", rdcf.region, rdcf.district, facility -> {
+		creator.createFacility("Fac2", rdcf.region, rdcf.district, facility -> {
 			facility.setStreet("Street2");
+			facility.setHouseNumber("2");
 			facility.setPostalCode("PostalCode2");
 			facility.setCity("City2");
 		});
 		FacilityDto fac3 = creator.createFacility("Fac3", rdcf.region, rdcf.district, facility -> {
 			facility.setStreet("Street3");
+			facility.setHouseNumber("3");
 			facility.setPostalCode("PostalCode2");
 			facility.setCity("City2");
 		});
-		FacilityDto fac4 = creator.createFacility("Fac4", rdcf.region, rdcf.district, facility -> {
+		creator.createFacility("Fac4", rdcf.region, rdcf.district, facility -> {
 			facility.setStreet("Street2");
+			facility.setHouseNumber("4");
 			facility.setPostalCode("PostalCode2");
 			facility.setCity("City2");
 		});
 
 		FacilityFacade facade = getFacilityFacade();
-		assertEquals(fac1.getUuid(), facade.getByAddress("Street1", "PostalCode1", "City1").getUuid());
-		assertEquals(fac3.getUuid(), facade.getByAddress("Street3", "PostalCode2", "City2").getUuid());
-		assertNull(facade.getByAddress("Street5", "PostalCode5", "City5"));
-		assertNull(facade.getByAddress("Street2", "PostalCode2", "City2"));
+		assertEquals(fac1.getUuid(), facade.getByAddress("Street1", "1", "PostalCode1", "City1").getUuid());
+		assertEquals(fac3.getUuid(), facade.getByAddress("Street3", "3", "PostalCode2", "City2").getUuid());
+		assertNull(facade.getByAddress("Street5", "", "PostalCode5", "City5"));
+		assertNull(facade.getByAddress("Street2", null, "PostalCode2", "City2"));
+		assertNull(facade.getByAddress("Street2", "1", "PostalCode2", "City2"));
 	}
 }