allow zip to mismatch as long as it's within the same borough

Author: WillNilges

src/meshapi/validation.py

@@ -130,12 +130,19 @@ def __init__(self, street_address: str, city: str, state: str, zip_code: str):
 
         # For some insane reason this is an integer, so we have to cast it to a string
         found_zip = str(nyc_planning_resp["features"][0]["properties"]["postalcode"])
-        if found_zip != zip_code:
+
+        # There's a chance the zip code the member is familiar with has changed.
+        # To mitigate this, we're gonna continue processing the record as long
+        # as the zip code is in the same borough.
+        if NYCZipCodes.get_borough(found_zip) != NYCZipCodes.get_borough(zip_code):
             raise AddressError(
                 f"(NYC) Could not find address '{street_address}, {city}, {state} {zip_code}'. "
                 f"Zip code ({zip_code}) is incorrect or not within city limits"
             )
 
+        if found_zip != zip_code:
+            logging.warning(f"Got a different zip code from geosearch.planninglabs.nyc. {found_zip} != {zip_code}")
+
         addr_props = nyc_planning_resp["features"][0]["properties"]
 
         # Get the rest of the address info

src/meshapi/views/forms.py

@@ -199,6 +199,10 @@ def process_join_form(r: JoinFormRequest, request: Optional[Request] = None) ->
         logging.warning(f"Changed city: {r.city} != {nyc_addr_info.city}")
         changed_info["city"] = nyc_addr_info.city
 
+    if r.zip_code != nyc_addr_info.zip:
+        logging.warning(f"Changed zip_code (still in the same borough): {r.zip_code} != {nyc_addr_info.zip}")
+        changed_info["zip_code"] = nyc_addr_info.zip
+
     # Let the member know we need to confirm some info with them. We'll send
     # back a dictionary with the info that needs confirming.
     # This is not a rejection. We expect another join form submission with all
@@ -431,6 +435,8 @@ def process_join_form(r: JoinFormRequest, request: Optional[Request] = None) ->
                 notify_string += f"Changed street_address: {r.street_address} != {nyc_addr_info.street_address}\n"
             if r.city != nyc_addr_info.city:
                 notify_string += f"Changed city: {r.city} != {nyc_addr_info.city}"
+            if r.zip_code != nyc_addr_info.zip:
+                notify_string += f"Changed zip code: {r.zip_code} != {nyc_addr_info.zip}"
             notify_admins(notify_string)
     else:
         logging.info(success_message)

src/meshapi/zips.py

@@ -1,3 +1,6 @@
+from typing import Optional
+
+
 bronx = [
     "10466",
     "10468",
@@ -229,8 +232,29 @@
     "10306",
 ]
 
+BRONX = "bronx"
+NEW_YORK = "new_york"
+KINGS = "kings"
+QUEENS = "queens"
+RICHMOND = "richmond"
+
+zips = {
+    BRONX: bronx,
+    NEW_YORK: new_york,
+    KINGS: kings,
+    QUEENS: queens,
+    RICHMOND: richmond
+}
 
 class NYCZipCodes:
     @staticmethod
     def match_zip(zip: str) -> bool:
         return any(zip in a for a in [bronx, new_york, kings, queens, richmond])
+
+    @staticmethod
+    def get_borough(zip_code: str) -> Optional[str]:
+        for borough, z in zips.items():
+            if zip_code in z:
+                return borough
+        return None
+