Overhaul

microsetta_private_api/LEGACY/locale_data/english_gut.py

@@ -567,7 +567,7 @@
     'TEXT_I_HAVE_READ_SIMPLIFIED': 'Yes, you will be in this research study.',
     'PERSON_ATTAINING_ASSENT': 'Signature Of Person Obtaining Assent',
     'TEXT_ASSENT_WITNESS': 'In my judgment, the participant is voluntarily and knowingly giving assent and possesses the legal capacity to give assent to participate in the study.',
-    'OBTAINER_NAME': 'Name of person obtaining assent',
+    'ASSENT_OBTAINER': 'Name of person obtaining assent',
     'TEXT_I_HAVE_READ_PARENT': 'I have read (or someone has read to me) this form. I am aware that I am being asked to provide consent for my child to be in a research study. I voluntarily agree to allow my child to participate in this study. I understand how my child’s personal data will be processed, my related rights, and that I consent to the processing of my child’s sample and data as provided in this document.',
     'PARTICIPANT_NAME': 'Participant name',
     'PARTICIPANT_PARENT_1': 'Parent/Guardian name',

microsetta_private_api/LEGACY/locale_data/spain_spanish_gut.py

@@ -67,7 +67,7 @@
     'TEXT_I_HAVE_READ_SIMPLIFIED': 'Sí, estarás en este estudio de investigación.',
     'PERSON_ATTAINING_ASSENT': 'Firma de la persona que obtiene el consentimiento',
     'TEXT_ASSENT_WITNESS': 'A mi juicio, el participante está dando su consentimiento voluntaria y conscientemente y posee la capacidad legal de dar su consentimiento para participar en el estudio.',
-    'OBTAINER_NAME': 'Nombre de la persona que obtiene el consentimiento',
+    'ASSENT_OBTAINER': 'Nombre de la persona que obtiene el consentimiento',
     'TEXT_I_HAVE_READ_PARENT': 'He leído (o alguien me ha leído) este formulario. Soy consciente de que se le está pidiendo a mi hijo que participe en un estudio de investigación. Acepto voluntariamente que mi hijo participe en este estudio',
     'PARTICIPANT_NAME': 'Nombre del participante',
     'PARTICIPANT_EMAIL': 'Correo electrónico del participante',

microsetta_private_api/LEGACY/locale_data/spanish_gut.py

@@ -67,7 +67,7 @@
     'TEXT_I_HAVE_READ_SIMPLIFIED': 'Sí, estarás en este estudio de investigación.',
     'PERSON_ATTAINING_ASSENT': 'Firma de la persona que obtiene el consentimiento',
     'TEXT_ASSENT_WITNESS': 'A mi juicio, el participante está dando su consentimiento voluntaria y conscientemente y posee la capacidad legal de dar su consentimiento para participar en el estudio.',
-    'OBTAINER_NAME': 'Nombre de la persona que obtiene el consentimiento',
+    'ASSENT_OBTAINER': 'Nombre de la persona que obtiene el consentimiento',
     'TEXT_I_HAVE_READ_PARENT': 'He leído (o alguien me ha leído) este formulario. Soy consciente de que se le está pidiendo a mi hijo que participe en un estudio de investigación. Acepto voluntariamente que mi hijo participe en este estudio',
     'PARTICIPANT_NAME': 'Nombre del participante',
     'PARTICIPANT_PARENT_1': 'Nombre del Padre de Familia / Guardian',

microsetta_private_api/admin/admin_impl.py

@@ -681,6 +681,20 @@ def generate_activation_codes(body, token_info):
     return jsonify(results), 200
 
 
+def generate_ffq_codes(body, token_info):
+    validate_admin_access(token_info)
+
+    quantity = body.get("code_quantity", 1)
+    with Transaction() as t:
+        admin_repo = AdminRepo(t)
+        code_list = []
+        for i in range(quantity):
+            code_list.append(admin_repo.create_ffq_code())
+        t.commit()
+
+    return jsonify(code_list), 200
+
+
 def list_barcode_query_fields(token_info):
     validate_admin_access(token_info)
 
@@ -821,7 +835,6 @@ def delete_account(account_id, token_info):
         src_repo = SourceRepo(t)
         samp_repo = SampleRepo(t)
         sar_repo = SurveyAnswersRepo(t)
-        template_repo = SurveyTemplateRepo(t)
 
         acct = acct_repo.get_account(account_id)
         if acct is None:
@@ -831,8 +844,6 @@ def delete_account(account_id, token_info):
             if acct.account_type == 'deleted':
                 return None, 204
 
-        sample_count = 0
-        account_has_external = False
         sources = src_repo.get_sources_in_account(
             account_id,
             allow_revoked=True
@@ -845,44 +856,21 @@ def delete_account(account_id, token_info):
                 allow_revoked=True
             )
 
-            has_samples = len(samples) > 0
-            sample_count += len(samples)
-            has_external = template_repo.has_external_surveys(account_id,
-                                                              source.id)
-
-            if has_external:
-                account_has_external = True
-
             for sample in samples:
                 # we scrub rather than disassociate in the event that the
                 # sample is in our freezers but not with an up-to-date scan
                 samp_repo.scrub(account_id, source.id, sample.id)
 
             surveys = sar_repo.list_answered_surveys(account_id, source.id)
-            if has_samples or has_external:
-                # if we have samples or external surveys, we need to scrub
-                # survey / source free text
-                for survey_id in surveys:
-                    sar_repo.scrub(account_id, source.id, survey_id)
-
-                # We're including scrubbed sources to detect external surveys
-                # so we need to make sure the source isn't already scrubbed
-                if source.source_data.date_revoked is None:
-                    src_repo.scrub(account_id, source.id)
-
-            if not has_samples and not has_external:
-                # if we do not have associated samples, or external surveys,
-                # then the source is safe to delete
-                for survey_id in surveys:
-                    sar_repo.delete_answered_survey(account_id, survey_id)
-                src_repo.delete_source(account_id, source.id)
-
-        # an account is safe to delete if there are no associated samples
-        # and does not have external surveys
-        if sample_count > 0 or account_has_external:
-            acct_repo.scrub(account_id)
-        else:
-            acct_repo.delete_account(account_id)
+            for survey_id in surveys:
+                sar_repo.scrub(account_id, source.id, survey_id)
+
+            # We're including scrubbed sources to detect external surveys
+            # so we need to make sure the source isn't already scrubbed
+            if source.source_data.date_revoked is None:
+                src_repo.scrub(account_id, source.id)
+
+        acct_repo.scrub(account_id)
 
         t.commit()
 

microsetta_private_api/admin/tests/test_admin_api.py

@@ -61,8 +61,8 @@ def setup_test_data():
                           12345,
                           "US"
                       ),
-                      "fakekit",
-                      "en_US")
+                      "en_US",
+                      True)
         acct_repo.create_account(acc)
 
         with t.cursor() as cur:
@@ -1269,3 +1269,19 @@ def mock_func(*args, **kwargs):
                 data=json.dumps(info),
                 headers=MOCK_HEADERS)
             self.assertEqual(204, response.status_code)
+
+    def test_generate_ffq_codes(self):
+        input_json = json.dumps({"code_quantity": 2})
+
+        response = self.client.post(
+            "api/admin/generate_ffq_codes",
+            content_type='application/json',
+            data=input_json,
+            headers=MOCK_HEADERS
+        )
+        self.assertEqual(200, response.status_code)
+
+        response_obj = json.loads(response.data)
+
+        for ffq_code in response_obj:
+            self.assertEqual("TMI", ffq_code[0:3])

microsetta_private_api/admin/tests/test_admin_repo.py

@@ -89,8 +89,8 @@ def setup_test_data():
                               12345,
                               "US"
                           ),
-                          "fakekit",
-                          "en_US")
+                          "en_US",
+                          True)
             acct_repo.create_account(acc)
 
             acc = Account(ADMIN_ACCT_ID,
@@ -107,8 +107,8 @@ def setup_test_data():
                               12345,
                               "US"
                           ),
-                          "fakekit",
-                          "en_US")
+                          "en_US",
+                          True)
             acct_repo.create_account(acc)
             t.commit()
 
@@ -1323,3 +1323,18 @@ def test_set_kit_uuids_for_dak_order(self):
                 self.assertEqual(len(curr_records), 2)
                 for expected_record in expected_records:
                     self.assertIn(expected_record, curr_records)
+
+    def test_create_ffq_code(self):
+        with Transaction() as t:
+            admin_repo = AdminRepo(t)
+            ffq_code = admin_repo.create_ffq_code()
+
+            with t.dict_cursor() as cur:
+                cur.execute(
+                    "SELECT registration_code_used "
+                    "FROM campaign.ffq_registration_codes "
+                    "WHERE ffq_registration_code = %s",
+                    (ffq_code,)
+                )
+                row = cur.fetchone()
+                self.assertEqual(row['registration_code_used'], None)

microsetta_private_api/api/__init__.py

@@ -12,12 +12,13 @@
 from ._consent import (
     render_consent_doc,
     check_consent_signature,
-    sign_consent_doc
+    sign_consent_doc,
+    get_signed_consent
 )
 from ._source import (
-    create_source, read_source, update_source, delete_source,
-    read_sources, create_human_source_from_consent,
-    check_duplicate_source_name, scrub_source
+    create_source, read_source, update_source, read_sources,
+    create_human_source_from_consent, check_duplicate_source_name,
+    scrub_source
 )
 from ._survey import (
     read_survey_template, read_survey_templates, read_answered_survey,
@@ -45,7 +46,7 @@
     get_vioscreen_dietary_scores_descriptions,
     get_vioscreen_food_components_by_code,
     get_vioscreen_food_components_descriptions,
-    get_vioscreen_sessions
+    get_vioscreen_sessions, get_vioscreen_registry_entries, check_ffq_code
 )
 
 from ._campaign import (
@@ -82,13 +83,13 @@
     'create_source',
     'read_source',
     'update_source',
-    'delete_source',
     'scrub_source',
     'read_sources',
     'check_duplicate_source_name',
     'create_human_source_from_consent',
     'check_consent_signature',
     'sign_consent_doc',
+    'get_signed_consent',
     'read_survey_template',
     'read_survey_templates',
     'read_answered_survey',
@@ -124,7 +125,9 @@
     'create_interested_user',
     'get_interested_user_address_update',
     'put_interested_user_address_update',
+    'get_vioscreen_sessions',
+    'get_vioscreen_registry_entries',
+    'check_ffq_code',
     'get_opt_out',
-    'put_opt_out',
-    'get_vioscreen_sessions'
+    'put_opt_out'
 ]

microsetta_private_api/api/_account.py

@@ -118,7 +118,8 @@ def update_account(account_id, body, token_info):
             body['address']['city'],
             body['address']['state'],
             body['address']['post_code'],
-            body['address']['country_code']
+            body['address']['country_code'],
+            body['address']['street2']
         )
         acc.language = body['language']
 

microsetta_private_api/api/_consent.py

@@ -7,6 +7,7 @@
 from microsetta_private_api.repo.consent_repo import ConsentRepo
 from microsetta_private_api.repo.transaction import Transaction
 from microsetta_private_api.api.literals import CONSENT_DOC_NOT_FOUND_MSG
+from werkzeug.exceptions import NotFound
 
 
 def render_consent_doc(account_id, language_tag, token_info):
@@ -52,7 +53,6 @@ def check_consent_signature(account_id, source_id, consent_type, token_info):
 
 
 def sign_consent_doc(account_id, source_id, consent_type, body, token_info):
-
     _validate_account_access(token_info, account_id)
 
     with Transaction() as t:
@@ -62,12 +62,27 @@ def sign_consent_doc(account_id, source_id, consent_type, body, token_info):
         try:
             consent_repo.sign_consent(account_id, consent_sign)
             t.commit()
-        except Exception:
-            return jsonify(code=404, message=CONSENT_DOC_NOT_FOUND_MSG), 404
+        except NotFound as e:
+            return jsonify(code=404, message=e.description), 404
 
     response = jsonify({"result": True})
     response.status_code = 201
     response.headers['Location'] = '/api/accounts/%s' % \
         (account_id)
 
     return response
+
+
+def get_signed_consent(account_id, source_id, consent_type, token_info):
+    _validate_account_access(token_info, account_id)
+
+    with Transaction() as t:
+        consent_repo = ConsentRepo(t)
+        signed_consent = consent_repo.get_latest_signed_consent(
+            source_id,
+            consent_type
+        )
+        if signed_consent is None:
+            return jsonify(code=404, message="No signed consent found"), 404
+
+    return jsonify(signed_consent.to_api()), 200