Merge pull request #442 from VariantEffect/bugfix/estelle/441/fixAddContributor

Modified add_contributor function and add two more related tests.

Author: EstelleDa

tests/helpers/constants.py

@@ -177,6 +177,17 @@
     "is_first_login": True,
 }
 
+TEST_USER2 = {
+    "username": "1111-2222-3333-4444",
+    "first_name": "First",
+    "last_name": "Last",
+    "email": "[email protected]",
+    "is_active": True,
+    "is_staff": False,
+    "is_superuser": False,
+    "is_first_login": True,
+}
+
 CONTRIBUTOR = {
     "orcid_id": TEST_USER["username"],
     "given_name": TEST_USER["first_name"],

tests/helpers/util/contributor.py

@@ -12,11 +12,13 @@ def add_contributor(db: Session, urn: str, model: Any, orcid_id: str, given_name
     assert item is not None
 
     try:
-        contributor = db.execute(select(Contributor).where(Contributor.orcid_id == orcid_id)).one()
+        # scalar_one(): extract the ORM instance from the result
+        contributor = db.execute(select(Contributor).where(Contributor.orcid_id == orcid_id)).scalar_one()
     except NoResultFound:
         contributor = Contributor(orcid_id=orcid_id, given_name=given_name, family_name=family_name)
         db.add(contributor)
 
-    item.contributors = [contributor]
+    if contributor not in item.contributors:
+        item.contributors.append(contributor)
     db.add(item)
     db.commit()

tests/routers/test_experiments.py

@@ -36,6 +36,7 @@
     TEST_PUBMED_IDENTIFIER,
     TEST_PUBMED_URL_IDENTIFIER,
     TEST_USER,
+    TEST_USER2,
 )
 from tests.helpers.dependency_overrider import DependencyOverrider
 from tests.helpers.util.contributor import add_contributor
@@ -712,6 +713,33 @@ def test_admin_can_update_other_users_private_experiment(
     assert (test_field, response_data[test_field]) == (test_field, test_value)
 
 
+def test_can_add_two_contributors(session, client, setup_router_db):
+    experiment = create_experiment(client)
+    change_ownership(session, experiment["urn"], ExperimentDbModel)
+    add_contributor(
+        session,
+        experiment["urn"],
+        ExperimentDbModel,
+        TEST_USER["username"],
+        TEST_USER["first_name"],
+        TEST_USER["last_name"],
+    )
+    add_contributor(
+        session,
+        experiment["urn"],
+        ExperimentDbModel,
+        TEST_USER2["username"],
+        TEST_USER2["first_name"],
+        TEST_USER2["last_name"],
+    )
+    response = client.get(f"/api/v1/experiments/{experiment['urn']}")
+    assert response.status_code == 200
+    response_data = response.json()
+    assert len(response_data["contributors"]) == 2
+    assert any(c["orcidId"] == TEST_USER["username"] for c in response_data["contributors"])
+    assert any(c["orcidId"] == TEST_USER2["username"] for c in response_data["contributors"])
+
+
 def test_can_edit_published_experiment(client, setup_router_db):
     pass
 

tests/routers/test_score_set.py

@@ -467,6 +467,39 @@ def test_anonymous_user_cannot_get_user_private_score_set(session, client, setup
     assert f"score set with URN '{score_set['urn']}' not found" in response_data["detail"]
 
 
+def test_can_add_contributor_in_both_experiment_and_score_set(session, client, setup_router_db):
+    experiment = create_experiment(client)
+    score_set = create_seq_score_set(client, experiment["urn"])
+    change_ownership(session, score_set["urn"], ScoreSetDbModel)
+    change_ownership(session, experiment["urn"], ExperimentDbModel)
+    add_contributor(
+        session,
+        score_set["urn"],
+        ScoreSetDbModel,
+        TEST_USER["username"],
+        TEST_USER["first_name"],
+        TEST_USER["last_name"],
+    )
+    add_contributor(
+        session,
+        experiment["urn"],
+        ExperimentDbModel,
+        TEST_USER["username"],
+        TEST_USER["first_name"],
+        TEST_USER["last_name"],
+    )
+    score_set_response = client.get(f"/api/v1/score-sets/{score_set['urn']}")
+    assert score_set_response.status_code == 200
+    ss_response_data = score_set_response.json()
+    assert len(ss_response_data["contributors"]) == 1
+    assert any(c["orcidId"] == TEST_USER["username"] for c in ss_response_data["contributors"])
+    experiment_response = client.get(f"/api/v1/experiments/{experiment['urn']}")
+    assert experiment_response.status_code == 200
+    exp_response_data = experiment_response.json()
+    assert len(exp_response_data["contributors"]) == 1
+    assert any(c["orcidId"] == TEST_USER["username"] for c in exp_response_data["contributors"])
+
+
 def test_contributor_can_get_other_users_private_score_set(session, client, setup_router_db):
     experiment = create_experiment(client)
     score_set = create_seq_score_set(client, experiment["urn"])