pull apart to get zip

Author: WillNilges

src/meshapi/tests/sample_join_form_data.py

@@ -134,6 +134,41 @@
     },
 }
 
+valid_join_form_submission_zip_is_updated = {
+    "first_name": "John",
+    "last_name": "Smith",
+    "email_address": "[email protected]",
+    "phone_number": "+1 585-758-3425",  # CSH's phone number :P
+    "parsed_phone": "+1 585-758-3425",  # CSH's phone number :P
+    "street_address": "151 Broome Street",  # Also covers New York County Test Case
+    "parsed_street_address": "151 Broome Street",
+    "city": "Manhattan",
+    "parsed_city": "New York",
+    "state": "NY",
+    "zip_code": "10002",
+    "parsed_zip_code": "10003",
+    "apartment": "",
+    "roof_access": True,
+    "referral": "Googled it or something IDK",
+    "ncl": True,
+    "trust_me_bro": True,
+    "dob_addr_response": {
+        "features": [
+            {
+                "properties": {
+                    "housenumber": "151",
+                    "street": "Broome Street",
+                    "borough": "New York",
+                    "region_a": "NY",
+                    "postalcode": "10003",
+                    "addendum": {"pad": {"bin": 1077609}},
+                },
+                "geometry": {"coordinates": [0, 0]},
+            }
+        ]
+    },
+}
+
 valid_join_form_submission_with_apartment_in_address = {
     "first_name": "John",
     "last_name": "Smith",

src/meshapi/tests/test_join_form.py

@@ -32,6 +32,7 @@
     valid_join_form_submission_city_needs_expansion,
     valid_join_form_submission_phone_needs_expansion,
     valid_join_form_submission_street_needs_expansion,
+    valid_join_form_submission_zip_is_updated,
     valid_join_form_submission_with_apartment_in_address,
 )
 from .util import TestThread
@@ -94,6 +95,9 @@ def pull_apart_join_form_submission(submission):
     del request["parsed_street_address"]
     del request["dob_addr_response"]
     del request["parsed_phone"]
+
+    if "parsed_zip_code" in request:
+        del request["parsed_zip_code"]
     if "parsed_city" in request:
         del request["parsed_city"]
 
@@ -105,6 +109,7 @@ def pull_apart_join_form_submission(submission):
     s.street_address = submission["parsed_street_address"]
     s.city = submission["parsed_city"] if "parsed_city" in submission else submission["city"]
     s.state = submission["state"]
+    s.zip_code = submission["parsed_zip_code"] if "parsed_zip_code" in submission else submission["zip_code"]
     s.phone_number = submission["parsed_phone"]
 
     return request, s
@@ -222,14 +227,15 @@ def test_valid_join_form_captcha_valid(self, mock_get_client_ip, validate_captch
 
     @parameterized.expand(
         [
-            [valid_join_form_submission_phone_needs_expansion],
-            [valid_join_form_submission_city_needs_expansion],
-            [valid_join_form_submission_street_needs_expansion],
-            [richmond_join_form_submission],
-            [kings_join_form_submission],
-            [queens_join_form_submission],
-            [bronx_join_form_submission],
-            [valid_join_form_submission_with_apartment_in_address],
+            #[valid_join_form_submission_phone_needs_expansion],
+            #[valid_join_form_submission_city_needs_expansion],
+            #[valid_join_form_submission_street_needs_expansion],
+            [valid_join_form_submission_zip_is_updated],
+            #[richmond_join_form_submission],
+            #[kings_join_form_submission],
+            #[queens_join_form_submission],
+            #[bronx_join_form_submission],
+            #[valid_join_form_submission_with_apartment_in_address],
         ]
     )
     def test_valid_join_form_with_member_confirmation(self, submission):
@@ -261,9 +267,9 @@ def test_valid_join_form_with_member_confirmation(self, submission):
         self.assertEqual(
             code,
             response.status_code,
-            f"status code incorrect for Valid Join Form. Should be {code}, but got {response.status_code}.\n Response is: {response.content.decode('utf-8')}",
+            f"status code incorrect for test_valid_join_form_with_member_confirmation. Should be {code}, but got {response.status_code}.\n Response is: {response.content.decode('utf-8')}",
         )
-        validate_successful_join_form_submission(self, "Valid Join Form", s, response)
+        validate_successful_join_form_submission(self, "test_valid_join_form_with_member_confirmation", s, response)
 
     def test_phone_number_is_silently_corrected(self):
         self.requests_mocker.get(

src/meshapi/zips.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-
 bronx = [
     "10466",
     "10468",
@@ -238,13 +237,8 @@
 QUEENS = "queens"
 RICHMOND = "richmond"
 
-zips = {
-    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
@@ -257,4 +251,3 @@ def get_borough(zip_code: str) -> Optional[str]:
             if zip_code in z:
                 return borough
         return None
-