Merge 6be213a into 67a5393

biocore · Jan 29, 2020 · 8a7f9a5 · 8a7f9a5
2 parents 67a5393 + 6be213a
commit 8a7f9a5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/ci/pip_requirements.txt b/ci/pip_requirements.txt
@@ -3,3 +3,4 @@ pyjwt[crypto]
 pytest < 5.3.4
 pytest-cov
 coveralls
+pycountry
diff --git a/microsetta_private_api/api/implementation.py b/microsetta_private_api/api/implementation.py
@@ -300,12 +300,13 @@ def render_consent_doc(account_id):
                            tl=american_gut._NEW_PARTICIPANT)
 
 
-# This function simply passes its arguments on to the create_source function;
-# however, it is necessary because connexion will not allow two endpoints to
-# use the same implementation function (it throws an error
-# "AssertionError: View function mapping is overwriting an existing endpoint
-# function")
 def create_human_source_from_consent(account_id, body):
+    # A human source's participant name becomes the source name. Note pop
+    # removes the existing `participant_name` key if exists, else errors.
+    # Not adding any error handling here because if 'participant_name' isn't
+    # here, we SHOULD be getting an error.
+    body['source_name'] = body.pop('participant_name')
+
     # NB: Don't expect to handle errors 404, 422 in this function; expect to
     # farm out to `create_source`
     return create_source(account_id, body)
diff --git a/microsetta_private_api/api/microsetta_private_api.yaml b/microsetta_private_api/api/microsetta_private_api.yaml
@@ -135,8 +135,8 @@ paths:
               properties:  # each is a form field name
                 age_range:
                   $ref: '#/components/schemas/age_range'
-                participant_name:
-                  $ref: '#/components/schemas/participant_name'
+                participant_name:  # Field is named participant_name, but contents are used to fill source's name
+                  $ref: '#/components/schemas/source_name'
                 participant_email:
                   $ref: '#/components/schemas/participant_email'
                 parent_1_name:
@@ -201,14 +201,12 @@ paths:
                   source_name: "Ophelia Doe"
                   source_type: human
                   consent:
-                    participant_name: "Ophelia Q. Doe"
                     participant_email: "nunnery@example.com"
                     age_range: "18-plus"
                 - source_id: "df077cd7-f2c7-42e4-b8ed-9c7e9dd47ce5"
                   source_name: "P. Doe"
                   source_type: human
                   consent:
-                    participant_name: "Persephone Doe"
                     participant_email: "pomegranate@example.com"
                     age_range: "0-6"
                     child_info:
@@ -1013,13 +1011,12 @@ components:
       type: string
       readOnly: true # sent in GET, not in POST/PUT/PATCH
       example: "b0b0b0b0-b0b0-b0b0-b0b0-b0b0b0b0b0b0"
+    source_name:
+      type: string
     source_type:
       type: string
       enum: [human, animal, environmental]
       example: human
-    participant_name:
-      type: string
-      example: "Hija Doe"
     participant_email:
       type: string
       format: email
@@ -1048,12 +1045,14 @@ components:
         source_type:
           type: string
           enum: [animal, environmental]
-        source_name:
+        source_description:
           type: string
+          nullable: true
       example:
         source_id: "bda6867f-fb9d-4f21-ba24-5fba64976ee2"
         source_name: "office windowsill"
         source_type: environmental
+        source_description: "my office windowsill"
       additionalProperties: false
     human_source:
       type: object
@@ -1068,8 +1067,6 @@ components:
         consent:
           type: object
           properties:
-            participant_name:
-              $ref: '#/components/schemas/participant_name'
             participant_email:
               $ref: '#/components/schemas/participant_email'
             age_range:
@@ -1229,15 +1226,13 @@ components:
         source_name: "Nell Doe"
         source_type: human
         consent:
-          participant_name: "Nellie Doe"
           participant_email: "nell@example.com"
           age_range: "18-plus"
     human_child_source:
       value:
         source_name: "K. Doe"
         source_type: human
         consent:
-          participant_name: "Kelly Doe"
           participant_email: "kd@kidsmail.com"
           age_range: "7-12"
           child_info:
@@ -1249,13 +1244,13 @@ components:
       value:
         source_name: "Fluffy"
         source_type: animal
+        source_description: "A fluffy cat"
     human_adult_source_w_id:
       value:
         source_id: "5fa970c6-d36b-4d54-9bed-c45c3c85adac"
         source_name: "Nell Doe"
         source_type: human
         consent:
-          participant_name: "Nellie Doe"
           participant_email: "nell@example.com"
           age_range: "18-plus"
     human_child_source_w_id:
@@ -1264,7 +1259,6 @@ components:
         source_name: "K. Doe"
         source_type: human
         consent:
-          participant_name: "Kelly Doe"
           participant_email: "kd@kidsmail.com"
           age_range: "7-12"
           child_info:
@@ -1277,6 +1271,7 @@ components:
         source_id: "42f799a8-e814-4b91-a291-2dbd50fda75d"
         source_name: "Fluffy"
         source_type: animal
+        source_description: "A fluffy cat"
 
   securitySchemes:
     Oauth2Scheme: