Merge master into master-overhaul via conflict resolution branch

.github/workflows/python-package-conda.yml

@@ -56,6 +56,7 @@ jobs:
         VS_PASSWORD: "${{ secrets.VS_PASSWORD }}"
         VS_CRYPTOKEY: "${{ secrets.VS_CRYPTOKEY }}"
         VS_REGCODE: "${{ secrets.VS_REGCODE }}"
+        GOOGLE_GEOCODING_KEY: "${{ secrets.GOOGLE_GEOCODING_KEY }}"
       run: |
         # pull out the port so we can modify the configuration file easily
         pgport=${{ job.services.postgres.ports[5432] }}

microsetta_private_api/LEGACY/locale_data/__init__.py

@@ -11,7 +11,7 @@
 
 
 available_locales = set([
-    'american_gut', 'british_gut', 'spanish_gut', 'spain_spanish_gut'])
+    'american_gut', 'british_gut', 'spanish_gut', 'spain_spanish_gut', 'japanese_gut'])
 
 
 media_locale = {

microsetta_private_api/admin/tests/test_admin_api.py

@@ -61,6 +61,9 @@ def setup_test_data():
                           12345,
                           "US"
                       ),
+                      32.8798916,
+                      -117.2363115,
+                      False,
                       "en_US",
                       True)
         acct_repo.create_account(acc)
@@ -904,7 +907,7 @@ def test_metadata_qiita_compatible_two_templates(self):
 
         # confirm that the results for the other survey, attached to a
         # different source, did not receive the merged 502/gender_v2 attribute.
-        self.assertEqual(result['000051101']['gender_v2'], 'Unspecified')
+        self.assertEqual(result['000051101']['gender_v2'], 'not provided')
         self.assertEqual(result['000051101']['birth_year'], '1968')
 
         # clean up by deleting the survey we added for testing.

microsetta_private_api/admin/tests/test_admin_repo.py

@@ -89,6 +89,9 @@ def setup_test_data():
                               12345,
                               "US"
                           ),
+                          32.8798916,
+                          -117.2363115,
+                          False,
                           "en_US",
                           True)
             acct_repo.create_account(acc)
@@ -107,6 +110,9 @@ def setup_test_data():
                               12345,
                               "US"
                           ),
+                          32.8798916,
+                          -117.2363115,
+                          False,
                           "en_US",
                           True)
             acct_repo.create_account(acc)

microsetta_private_api/api/_account.py

@@ -13,6 +13,7 @@
 from microsetta_private_api.config_manager import SERVER_CONFIG
 from microsetta_private_api.repo.perk_fulfillment_repo import\
     PerkFulfillmentRepo
+from microsetta_private_api.util.google_geocoding import geocode_address
 
 
 def find_accounts_for_login(token_info):
@@ -58,6 +59,12 @@ def register_account(body, token_info):
     new_acct_id = str(uuid.uuid4())
     body["id"] = new_acct_id
 
+    # We need these keys to exist to create the account object, but we'll
+    # update them momentarily
+    body["latitude"] = None
+    body["longitude"] = None
+    body["cannot_geocode"] = False
+
     account_obj = Account.from_dict(body, token_info[JWT_ISS_CLAIM_KEY],
                                     token_info[JWT_SUB_CLAIM_KEY])
 
@@ -75,6 +82,15 @@ def register_account(body, token_info):
         for sub_id in subscription_ids:
             pfr.claim_unclaimed_subscription(sub_id, new_acct_id)
 
+        # Now that we've successfully created an account, geocode it
+        latitude, longitude, _, _, cannot_geocode = geocode_address(
+            new_acct.address
+        )
+        new_acct.latitude = latitude
+        new_acct.longitude = longitude
+        new_acct.cannot_geocode = cannot_geocode
+        acct_repo.update_account(new_acct)
+
         t.commit()
 
     response = jsonify(new_acct.to_api())
@@ -123,6 +139,17 @@ def update_account(account_id, body, token_info):
         )
         acc.language = body['language']
 
+        # Whenever someone updates their address, we need to update geocoding
+        # info. We don't need to check if they're actually changing their
+        # address, as the geocoding code prevents duplicate requests from
+        # reaching Google's API
+        latitude, longitude, _, _, cannot_geocode = geocode_address(
+            acc.address
+        )
+        acc.latitude = latitude
+        acc.longitude = longitude
+        acc.cannot_geocode = cannot_geocode
+
         # 422 handling is done inside acct_repo
         acct_repo.update_account(acc)
         t.commit()

microsetta_private_api/api/tests/test_api.py

@@ -81,6 +81,9 @@
     "first_name": "Jane",
     "last_name": "Doe",
     "language": "en_US",
+    "latitude": 32.8798916,
+    "longitude": -117.2363115,
+    "cannot_geocode": False,
     "consent_privacy_terms": True
 }
 DUMMY_ACCT_INFO_2 = {
@@ -96,6 +99,9 @@
     "first_name": "Obie",
     "last_name": "Dobie",
     "language": "en_US",
+    "latitude": 32.8798916,
+    "longitude": -117.2363115,
+    "cannot_geocode": False,
     "consent_privacy_terms": True
 }
 DUMMY_ACCT_ADMIN = {
@@ -110,6 +116,9 @@
     "email": TEST_EMAIL_3,
     "first_name": "Obie",
     "last_name": "Dobie",
+    "latitude": 32.8798916,
+    "longitude": -117.2363115,
+    "cannot_geocode": False,
     "consent_privacy_terms": True,
 }
 
@@ -484,6 +493,9 @@ def _create_dummy_acct_from_t(t, create_dummy_1=True,
                 input_obj['address']['country_code'],
                 input_obj['address']['street2']
             ),
+            input_obj['latitude'],
+            input_obj['longitude'],
+            input_obj['cannot_geocode'],
             input_obj['language'],
             input_obj['consent_privacy_terms']
         )
@@ -728,6 +740,16 @@ def validate_dummy_acct_response_body(self, response_obj,
         expected_dict[ACCT_TYPE_KEY] = ACCT_TYPE_VAL
         expected_dict[CREATION_TIME_KEY] = real_creation_time
         expected_dict[UPDATE_TIME_KEY] = real_update_time
+
+        # the lat, long, and cannot_geocode need to be ignored for the sake of
+        # comparisons
+        expected_dict.pop("latitude", None)
+        expected_dict.pop("longitude", None)
+        expected_dict.pop("cannot_geocode", None)
+        response_obj.pop("latitude", None)
+        response_obj.pop("longitude", None)
+        response_obj.pop("cannot_geocode", None)
+
         self.assertEqual(expected_dict, response_obj)
 
         return real_acct_id_from_body
@@ -1249,6 +1271,9 @@ def test_account_update_fail_400_without_required_fields(self):
 
         dummy_acct_id = create_dummy_acct()
         changed_acct_dict = self.make_updated_acct_dict()
+        changed_acct_dict.pop('latitude', None)
+        changed_acct_dict.pop('longitude', None)
+        changed_acct_dict.pop('cannot_geocode', None)
         changed_acct_dict.pop("consent_privacy_terms")
 
         input_url = "/api/accounts/{0}".format(dummy_acct_id)

microsetta_private_api/api/tests/test_integration.py

@@ -207,6 +207,9 @@ def setup_test_data():
                               "US",
                               ""
                           ),
+                          32.8798916,
+                          -117.2363115,
+                          False,
                           "en_US",
                           True)
             acct_repo.create_account(acc)
@@ -849,6 +852,9 @@ def test_edit_account_info(self):
         # Hard to guess these two, so let's pop em out
         acc.pop("creation_time")
         acc.pop("update_time")
+        acc.pop("latitude")
+        acc.pop("longitude")
+        acc.pop("cannot_geocode")
         acc.pop('kit_name')
         self.assertDictEqual(acc, regular_data, "Check Initial Account Match")
 
@@ -892,6 +898,9 @@ def test_edit_account_info(self):
         fuzzy_data["account_id"] = "aaaaaaaa-bbbb-cccc-dddd-eeeeffffffff"
         acc.pop('creation_time')
         acc.pop('update_time')
+        acc.pop("latitude")
+        acc.pop("longitude")
+        acc.pop("cannot_geocode")
         acc.pop('kit_name')
         acc.pop('consent_privacy_terms')
         self.assertDictEqual(fuzzy_data, acc, "Check Fuzz Account Match")
@@ -911,6 +920,9 @@ def test_edit_account_info(self):
 
         acc.pop('creation_time')
         acc.pop('update_time')
+        acc.pop("latitude")
+        acc.pop("longitude")
+        acc.pop("cannot_geocode")
         acc.pop('kit_name')
         regular_data['account_type'] = 'standard'
         regular_data["account_id"] = "aaaaaaaa-bbbb-cccc-dddd-eeeeffffffff"
@@ -1210,6 +1222,23 @@ def test_delete_source(self):
             headers=MOCK_HEADERS
         )
         check_response(resp, 422)
+        self.assertIn("sample", resp.json["message"],
+                      "Failure message should complain about samples")
+
+        # Remove the sample.
+        resp = self.client.delete(
+            '/api/accounts/%s/sources/%s/samples/%s?language_tag=en_US' %
+            (ACCT_ID, source_id_from_obj, sample_id),
+            headers=MOCK_HEADERS
+        )
+        check_response(resp)
+
+        # Now delete the source (Hopefully successfully!
+        resp = self.client.delete(
+            loc + "?language_tag=en_US",
+            headers=MOCK_HEADERS
+        )
+        check_response(resp, 204)
 
     def test_associate_sample_and_survey(self):
         """
@@ -1771,6 +1800,9 @@ def test_scrub_source(self):
                               "US",
                               ""
                           ),
+                          32.8798916,
+                          -117.2363115,
+                          False,
                           "en_US",
                           True)
             accountRepo.create_account(acc)

microsetta_private_api/celery_utils.py

@@ -64,10 +64,6 @@ def __call__(self, *args, **kwargs):
         # "fetch_ffqs": {
         #     "task": "microsetta_private_api.util.vioscreen.fetch_ffqs",
         #     "schedule":  60 * 60 * 24  # every 24 hours
-        # },
-        # "geocode_accounts": {
-        #     "task": "microsetta_private_api.tasks.geocode_accounts",
-        #     "schedule": 60
         # }
     }