Search static address if hashkey is provided as query

Author: Sandra Thieme

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

@@ -17,6 +17,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import static net.contargo.iris.address.nominatim.service.AddressDetailKey.CITY;
 import static net.contargo.iris.address.nominatim.service.AddressDetailKey.COUNTRY;
@@ -36,6 +37,7 @@
 public class AddressServiceWrapper {
 
     private static final Logger LOG = LoggerFactory.getLogger(AddressServiceWrapper.class);
+    private static final Pattern HASHKEY_MATCHER = Pattern.compile("^[A-Z0-9]{5}$");
 
     private final AddressService addressService;
     private final StaticAddressService staticAddressService;
@@ -193,6 +195,16 @@ private static List<AddressList> getSimpleAddressList(List<Address> addresses) {
 
     public List<Address> getAddressesByQuery(String query) {
 
-        return addressService.getAddressesByQuery(query);
+        List<Address> addresses = new ArrayList<>();
+
+        if (HASHKEY_MATCHER.matcher(query).matches()) {
+            addresses.add(getByHashKey(query));
+        }
+
+        if (addresses.isEmpty()) {
+            addresses.addAll(addressService.getAddressesByQuery(query));
+        }
+
+        return addresses;
     }
 }

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

@@ -427,5 +427,26 @@ public void getAddressesByQuery() {
 
         assertThat(addresses, hasSize(1));
         assertThat(addresses.get(0), is(address));
+
+        verifyZeroInteractions(staticAddressServiceMock);
+    }
+
+
+    @Test
+    public void getAddressesByQueryWithHashkey() {
+
+        StaticAddress address = new StaticAddress();
+        address.setCity("Karlsruhe");
+        address.setPostalcode("76135");
+
+        when(staticAddressServiceMock.findByHashKey("D5EHW")).thenReturn(address);
+
+        List<Address> addresses = sut.getAddressesByQuery("D5EHW");
+
+        assertThat(addresses, hasSize(1));
+        assertThat(addresses.get(0).getCity(), is("Karlsruhe"));
+        assertThat(addresses.get(0).getPostcode(), is("76135"));
+
+        verifyZeroInteractions(addressServiceMock);
     }
 }