Extend address query api with static addresses even if no hashkey is given

Author: Sandra Thieme

src/main/java/net/contargo/iris/address/service/AddressServiceWrapper.java

@@ -14,6 +14,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,7 @@
 import static net.contargo.iris.address.nominatim.service.AddressDetailKey.STREET;
 
 import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
 
 
 /**
@@ -203,6 +205,16 @@ public List<Address> getAddressesByQuery(String query) {
 
         if (addresses.isEmpty()) {
             addresses.addAll(addressService.getAddressesByQuery(query));
+
+            List<Address> matchingStaticAddresses = addresses.stream()
+                    .map(a ->
+                                staticAddressService.findAddresses(a.getPostcode(), a.getCity(), a.getCountryCode())
+                                .getAddresses())
+                    .flatMap(Collection::stream)
+                    .distinct()
+                    .collect(toList());
+
+            addresses.addAll(matchingStaticAddresses);
         }
 
         return addresses;

src/test/java/net/contargo/iris/address/service/AddressServiceWrapperUnitTest.java

@@ -420,15 +420,31 @@ public void getAddressesByQuery() {
 
         Address address = new Address();
         address.setDisplayName("Gartenstr. 67, Karlsruhe (Südweststadt)");
+        address.getAddress().put("city", "Karlsruhe");
+        address.getAddress().put("postcode", "76135");
+        address.getAddress().put("country_code", "de");
+        address.getAddress().put("street", "Gartenstr.");
 
         when(addressServiceMock.getAddressesByQuery("Gartenstraße 67, Karlsruhe")).thenReturn(singletonList(address));
 
-        List<Address> addresses = sut.getAddressesByQuery("Gartenstraße 67, Karlsruhe");
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity("Karlsruhe");
+        staticAddress1.setPostalcode("76135");
 
-        assertThat(addresses, hasSize(1));
-        assertThat(addresses.get(0), is(address));
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity("Karlsruhe");
+        staticAddress2.setPostalcode("76135");
+        staticAddress2.setSuburb("Südweststadt");
 
-        verifyZeroInteractions(staticAddressServiceMock);
+        when(staticAddressServiceMock.findAddresses("76135", "Karlsruhe", "de")).thenReturn(new AddressList("",
+                asList(staticAddress1.toAddress(), staticAddress2.toAddress())));
+
+        List<Address> addresses = sut.getAddressesByQuery("Gartenstraße 67, Karlsruhe");
+
+        assertThat(addresses, hasSize(3));
+        assertThat(addresses.get(0).getDisplayName(), is("Gartenstr. 67, Karlsruhe (Südweststadt)"));
+        assertThat(addresses.get(1).getDisplayName(), is("76135 Karlsruhe"));
+        assertThat(addresses.get(2).getDisplayName(), is("76135 Karlsruhe (Südweststadt)"));
     }