fix: 🐞 version metadata changes (#52)

* fix: schema types for study metadata

* fix: metadata return for version steps

* fix: test version and collaborators metadata

apis/study_metadata/study_central_contact.py

@@ -83,14 +83,14 @@ def validate_is_valid_email(instance):
                     "id": {"type": "string"},
                     "first_name": {"type": "string", "minLength": 1},
                     "last_name": {"type": "string", "minLength": 1},
-                    "degree": {"type": "string", "minLength": 1},
-                    "identifier": {"type": "string", "minLength": 1},
-                    "identifier_scheme": {"type": "string", "minLength": 1},
-                    "identifier_scheme_uri": {"type": "string", "minLength": 1},
+                    "degree": {"type": "string"},
+                    "identifier": {"type": "string"},
+                    "identifier_scheme": {"type": "string"},
+                    "identifier_scheme_uri": {"type": "string"},
                     "affiliation": {"type": "string", "minLength": 1},
                     "affiliation_identifier": {
                         "type": "string",
-                        "minLength": 1,
+
                     },
                     "affiliation_identifier_scheme": {
                         "type": "string",

apis/study_metadata/study_collaborators.py

@@ -59,7 +59,6 @@ def post(self, study_id: int):
                     "name",
                     "identifier",
                     "identifier_scheme",
-                    "identifier_scheme_uri",
                 ],
             },
         }

apis/study_metadata/study_conditions.py

@@ -53,7 +53,7 @@ def post(self, study_id: int):
                 "properties": {
                     "id": {"type": "string"},
                     "name": {"type": "string", "minLength": 1},
-                    "classification_code": {"type": "string", "minLength": 1},
+                    "classification_code": {"type": "string"},
                     "scheme": {"type": "string"},
                     "scheme_uri": {"type": "string"},
                     "condition_uri": {"type": "string"},

apis/study_metadata/study_keywords.py

@@ -52,7 +52,7 @@ def post(self, study_id: int):
                 "properties": {
                     "id": {"type": "string"},
                     "name": {"type": "string", "minLength": 1},
-                    "classification_code": {"type": "string", "minLength": 1},
+                    "classification_code": {"type": "string"},
                     "scheme": {"type": "string"},
                     "scheme_uri": {"type": "string"},
                     "keyword_uri": {"type": "string"},

model/dataset_metadata/dataset_contributor.py

@@ -45,8 +45,8 @@ def to_dict(self):
     def to_dict_metadata(self):
         return {
             "id": self.id,
-            "given_name": self.given_name,
-            "family_name": self.family_name,
+            "first_name": self.given_name,
+            "last_name": self.family_name,
             "name_type": self.name_type,
             "contributor_type": self.contributor_type,
             "creator": self.creator,

model/study_metadata/study_collaborators.py

@@ -37,8 +37,8 @@ def to_dict(self):
             "id": self.id,
             "name": self.name,
             "identifier": self.identifier,
-            "scheme": self.scheme,
-            "scheme_uri": self.scheme_uri,
+            "identifier_scheme": self.scheme,
+            "identifier_scheme_uri": self.scheme_uri,
             "created_at": self.created_at,
         }
 

model/study_metadata/study_eligibility.py

@@ -71,7 +71,7 @@ def to_dict_metadata(self):
         """Converts the study metadata to a dictionary"""
         return {
             "sex": self.sex,
-            "minimum_age_value": self.minimum_age_value,
+            "maximum_age_value": self.maximum_age_value,
             "gender_based": self.gender_based,
         }
 

tests/functional/test_study_metadata_api.py

@@ -726,8 +726,8 @@ def test_post_collaborators_metadata(clients):
 
     assert response_data[0]["name"] == "collaborator1123"
     assert response_data[0]["identifier"] == "collaborator1123"
-    assert response_data[0]["scheme"] == "collaborator1123"
-    assert response_data[0]["scheme_uri"] == "collaborator1123"
+    assert response_data[0]["identifier_scheme"] == "collaborator1123"
+    assert response_data[0]["identifier_scheme_uri"] == "collaborator1123"
 
     admin_response = _admin_client.post(
         f"/study/{study_id}/metadata/collaborators",
@@ -749,8 +749,8 @@ def test_post_collaborators_metadata(clients):
 
     assert admin_response_data[0]["name"] == "admin collaborator1123"
     assert admin_response_data[0]["identifier"] == "collaborator1123"
-    assert admin_response_data[0]["scheme"] == "collaborator1123"
-    assert admin_response_data[0]["scheme_uri"] == "collaborator1123"
+    assert admin_response_data[0]["identifier_scheme"] == "collaborator1123"
+    assert admin_response_data[0]["identifier_scheme_uri"] == "collaborator1123"
 
     editor_response = _editor_client.post(
         f"/study/{study_id}/metadata/collaborators",
@@ -770,8 +770,8 @@ def test_post_collaborators_metadata(clients):
 
     assert editor_response_data[0]["name"] == "editor collaborator1123"
     assert editor_response_data[0]["identifier"] == "collaborator1123"
-    assert editor_response_data[0]["scheme"] == "collaborator1123"
-    assert editor_response_data[0]["scheme_uri"] == "collaborator1123"
+    assert editor_response_data[0]["identifier_scheme"] == "collaborator1123"
+    assert editor_response_data[0]["identifier_scheme_uri"] == "collaborator1123"
 
     viewer_response = _viewer_client.post(
         f"/study/{study_id}/metadata/collaborators",
@@ -814,63 +814,63 @@ def test_get_collaborators_metadata(clients):
 
     assert response_data[0]["name"] == "collaborator1123"
     assert response_data[0]["identifier"] == "collaborator1123"
-    assert response_data[0]["scheme"] == "collaborator1123"
-    assert response_data[0]["scheme_uri"] == "collaborator1123"
+    assert response_data[0]["identifier_scheme"] == "collaborator1123"
+    assert response_data[0]["identifier_scheme_uri"] == "collaborator1123"
 
     assert admin_response_data[0]["name"] == "collaborator1123"
     assert admin_response_data[0]["identifier"] == "collaborator1123"
-    assert admin_response_data[0]["scheme"] == "collaborator1123"
-    assert admin_response_data[0]["scheme_uri"] == "collaborator1123"
+    assert admin_response_data[0]["identifier_scheme"] == "collaborator1123"
+    assert admin_response_data[0]["identifier_scheme_uri"] == "collaborator1123"
 
     assert editor_response_data[0]["name"] == "collaborator1123"
     assert editor_response_data[0]["identifier"] == "collaborator1123"
-    assert editor_response_data[0]["scheme"] == "collaborator1123"
-    assert editor_response_data[0]["scheme_uri"] == "collaborator1123"
+    assert editor_response_data[0]["identifier_scheme"] == "collaborator1123"
+    assert editor_response_data[0]["identifier_scheme_uri"] == "collaborator1123"
 
     assert viewer_response_data[0]["name"] == "collaborator1123"
     assert viewer_response_data[0]["identifier"] == "collaborator1123"
-    assert viewer_response_data[0]["scheme"] == "collaborator1123"
-    assert viewer_response_data[0]["scheme_uri"] == "collaborator1123"
+    assert viewer_response_data[0]["identifier_scheme"] == "collaborator1123"
+    assert viewer_response_data[0]["identifier_scheme_uri"] == "collaborator1123"
 
     assert response_data[1]["name"] == "admin collaborator1123"
     assert response_data[1]["identifier"] == "collaborator1123"
-    assert response_data[1]["scheme"] == "collaborator1123"
-    assert response_data[1]["scheme_uri"] == "collaborator1123"
+    assert response_data[1]["identifier_scheme"] == "collaborator1123"
+    assert response_data[1]["identifier_scheme_uri"] == "collaborator1123"
 
     assert admin_response_data[1]["name"] == "admin collaborator1123"
     assert admin_response_data[1]["identifier"] == "collaborator1123"
-    assert admin_response_data[1]["scheme"] == "collaborator1123"
-    assert admin_response_data[1]["scheme_uri"] == "collaborator1123"
+    assert admin_response_data[1]["identifier_scheme"] == "collaborator1123"
+    assert admin_response_data[1]["identifier_scheme_uri"] == "collaborator1123"
 
     assert editor_response_data[1]["name"] == "admin collaborator1123"
     assert editor_response_data[1]["identifier"] == "collaborator1123"
-    assert editor_response_data[1]["scheme"] == "collaborator1123"
-    assert editor_response_data[1]["scheme_uri"] == "collaborator1123"
+    assert editor_response_data[1]["identifier_scheme"] == "collaborator1123"
+    assert editor_response_data[1]["identifier_scheme_uri"] == "collaborator1123"
 
     assert viewer_response_data[1]["name"] == "admin collaborator1123"
     assert viewer_response_data[1]["identifier"] == "collaborator1123"
-    assert viewer_response_data[1]["scheme"] == "collaborator1123"
-    assert viewer_response_data[1]["scheme_uri"] == "collaborator1123"
+    assert viewer_response_data[1]["identifier_scheme"] == "collaborator1123"
+    assert viewer_response_data[1]["identifier_scheme_uri"] == "collaborator1123"
 
     assert response_data[2]["name"] == "editor collaborator1123"
     assert response_data[2]["identifier"] == "collaborator1123"
-    assert response_data[2]["scheme"] == "collaborator1123"
-    assert response_data[2]["scheme_uri"] == "collaborator1123"
+    assert response_data[2]["identifier_scheme"] == "collaborator1123"
+    assert response_data[2]["identifier_scheme_uri"] == "collaborator1123"
 
     assert admin_response_data[2]["name"] == "editor collaborator1123"
     assert admin_response_data[2]["identifier"] == "collaborator1123"
-    assert admin_response_data[2]["scheme"] == "collaborator1123"
-    assert admin_response_data[2]["scheme_uri"] == "collaborator1123"
+    assert admin_response_data[2]["identifier_scheme"] == "collaborator1123"
+    assert admin_response_data[2]["identifier_scheme_uri"] == "collaborator1123"
 
     assert editor_response_data[2]["name"] == "editor collaborator1123"
     assert editor_response_data[2]["identifier"] == "collaborator1123"
-    assert editor_response_data[2]["scheme"] == "collaborator1123"
-    assert editor_response_data[2]["scheme_uri"] == "collaborator1123"
+    assert editor_response_data[2]["identifier_scheme"] == "collaborator1123"
+    assert editor_response_data[2]["identifier_scheme_uri"] == "collaborator1123"
 
     assert viewer_response_data[2]["name"] == "editor collaborator1123"
     assert viewer_response_data[2]["identifier"] == "collaborator1123"
-    assert viewer_response_data[2]["scheme"] == "collaborator1123"
-    assert viewer_response_data[2]["scheme_uri"] == "collaborator1123"
+    assert viewer_response_data[2]["identifier_scheme"] == "collaborator1123"
+    assert viewer_response_data[2]["identifier_scheme_uri"] == "collaborator1123"
 
 
 def test_delete_collaborators_metadata(clients):

tests/functional/test_study_version_api.py

@@ -430,7 +430,7 @@ def test_get_version_study_metadata(clients):
     assert response_data["design"]["is_patient_registry"] == "yes"
     assert response_data["eligibility"]["sex"] == "All"
     assert response_data["eligibility"]["gender_based"] == "Yes"
-    assert response_data["eligibility"]["minimum_age_value"] == 18
+    assert response_data["eligibility"]["maximum_age_value"] == 61
     assert response_data["primary_identifier"]["identifier"] == "test"
     assert response_data["primary_identifier"]["identifier_type"] == "test"
     assert response_data["secondary_identifiers"][0]["identifier"] == "test"
@@ -494,7 +494,7 @@ def test_get_version_study_metadata(clients):
     assert admin_response_data["design"]["is_patient_registry"] == "yes"
     assert admin_response_data["eligibility"]["sex"] == "All"
     assert admin_response_data["eligibility"]["gender_based"] == "Yes"
-    assert admin_response_data["eligibility"]["minimum_age_value"] == 18
+    assert admin_response_data["eligibility"]["maximum_age_value"] == 61
     assert admin_response_data["primary_identifier"]["identifier"] == "test"
     assert admin_response_data["primary_identifier"]["identifier_type"] == "test"
     assert admin_response_data["secondary_identifiers"][0]["identifier"] == "test"
@@ -564,7 +564,7 @@ def test_get_version_study_metadata(clients):
     assert editor_response_data["design"]["is_patient_registry"] == "yes"
     assert editor_response_data["eligibility"]["sex"] == "All"
     assert editor_response_data["eligibility"]["gender_based"] == "Yes"
-    assert editor_response_data["eligibility"]["minimum_age_value"] == 18
+    assert editor_response_data["eligibility"]["maximum_age_value"] == 61
     assert editor_response_data["primary_identifier"]["identifier"] == "test"
     assert editor_response_data["primary_identifier"]["identifier_type"] == "test"
     assert editor_response_data["secondary_identifiers"][0]["identifier"] == "test"
@@ -634,7 +634,7 @@ def test_get_version_study_metadata(clients):
     assert viewer_response_data["design"]["is_patient_registry"] == "yes"
     assert viewer_response_data["eligibility"]["sex"] == "All"
     assert viewer_response_data["eligibility"]["gender_based"] == "Yes"
-    assert viewer_response_data["eligibility"]["minimum_age_value"] == 18
+    assert viewer_response_data["eligibility"]["maximum_age_value"] == 61
     assert viewer_response_data["primary_identifier"]["identifier"] == "test"
     assert viewer_response_data["primary_identifier"]["identifier_type"] == "test"
     assert viewer_response_data["secondary_identifiers"][0]["identifier"] == "test"
@@ -819,16 +819,16 @@ def test_get_version_dataset_metadata(clients):
     # seach for main title index in response_data[n]["titles"]
     # pylint: disable=line-too-long
 
-    assert response_data["contributors"][0]["given_name"] == "Given Name here"
-    assert response_data["contributors"][0]["family_name"] == "Family Name here"
+    assert response_data["contributors"][0]["last_name"] == "Family Name here"
+    assert response_data["contributors"][0]["first_name"] == "Given Name here"
     assert response_data["contributors"][0]["name_type"] == "Personal"
     assert response_data["contributors"][0]["contributor_type"] == "Con Type"
 
     assert response_data["dates"][0]["date"] == "01-01-1970"
     assert response_data["dates"][0]["type"] == "Type"
 
-    assert response_data["creators"][0]["given_name"] == "Given Name here"
-    assert response_data["creators"][0]["family_name"] == "Family Name here"
+    assert response_data["creators"][0]["last_name"] == "Family Name here"
+    assert response_data["creators"][0]["first_name"] == "Given Name here"
     assert response_data["creators"][0]["name_type"] == "Personal"
 
     assert response_data["funders"][0]["name"] == "Name"
@@ -869,14 +869,14 @@ def test_get_version_dataset_metadata(clients):
     )
     assert response_data["related_identifier"][0]["resource_type"] == "test"
 
-    assert admin_response_data["contributors"][0]["given_name"] == "Given Name here"
-    assert admin_response_data["contributors"][0]["family_name"] == "Family Name here"
+    assert admin_response_data["contributors"][0]["first_name"] == "Given Name here"
+    assert admin_response_data["contributors"][0]["last_name"] == "Family Name here"
     assert admin_response_data["contributors"][0]["name_type"] == "Personal"
     assert admin_response_data["contributors"][0]["contributor_type"] == "Con Type"
     assert admin_response_data["dates"][0]["date"] == "01-01-1970"
     assert admin_response_data["dates"][0]["type"] == "Type"
-    assert admin_response_data["creators"][0]["given_name"] == "Given Name here"
-    assert admin_response_data["creators"][0]["family_name"] == "Family Name here"
+    assert admin_response_data["creators"][0]["first_name"] == "Given Name here"
+    assert admin_response_data["creators"][0]["last_name"] == "Family Name here"
     assert admin_response_data["creators"][0]["name_type"] == "Personal"
     assert admin_response_data["funders"][0]["name"] == "Name"
     assert admin_response_data["funders"][0]["identifier"] == "Identifier"
@@ -912,14 +912,14 @@ def test_get_version_dataset_metadata(clients):
     )
     assert admin_response_data["related_identifier"][0]["resource_type"] == "test"
 
-    assert editor_response_data["contributors"][0]["family_name"] == "Family Name here"
-    assert editor_response_data["contributors"][0]["given_name"] == "Given Name here"
+    assert editor_response_data["contributors"][0]["first_name"] == "Given Name here"
+    assert editor_response_data["contributors"][0]["last_name"] == "Family Name here"
     assert editor_response_data["contributors"][0]["name_type"] == "Personal"
     assert editor_response_data["contributors"][0]["contributor_type"] == "Con Type"
     assert editor_response_data["dates"][0]["date"] == "01-01-1970"
     assert editor_response_data["dates"][0]["type"] == "Type"
-    assert editor_response_data["creators"][0]["given_name"] == "Given Name here"
-    assert editor_response_data["creators"][0]["family_name"] == "Family Name here"
+    assert editor_response_data["creators"][0]["first_name"] == "Given Name here"
+    assert editor_response_data["creators"][0]["last_name"] == "Family Name here"
     assert editor_response_data["creators"][0]["name_type"] == "Personal"
     assert editor_response_data["funders"][0]["name"] == "Name"
     assert editor_response_data["funders"][0]["identifier"] == "Identifier"