update person (#505)

Author: PGijsbers

src/connectors/example/resources/resource/persons.json

@@ -36,7 +36,7 @@
       "keyword2"
     ],
     "relevant_link": ["https://www.example.com/a_relevant_link", "https://www.example.com/another_relevant_link"],
-    "language": [
+    "languages": [
       "eng",
       "fra",
       "spa"
@@ -68,6 +68,7 @@
       "Voice Recognition",
       "Computer Vision."
     ],
-    "price_per_hour_euro": 75.5
+    "price_per_hour_euro": 75.5,
+    "member_of": []
     }
 ]

src/database/model/agent/person.py

@@ -7,6 +7,7 @@
 from database.model.agent.contact import Contact
 from database.model.agent.expertise import Expertise
 from database.model.agent.language import Language
+from database.model.agent.organisation import Organisation
 from database.model.concept.aiod_entry import AIoDEntryORM
 from database.model.field_length import NORMAL
 from database.model.helper_functions import many_to_many_link_factory
@@ -50,11 +51,14 @@ class Person(PersonBase, Agent, table=True):  # type: ignore [call-arg]
     expertise: list[Expertise] = Relationship(
         link_model=many_to_many_link_factory("person", Expertise.__tablename__)
     )
-    language: list[Language] = Relationship(
+    languages: list[Language] = Relationship(
         link_model=many_to_many_link_factory("person", Language.__tablename__)
     )
     contact_details: Optional[Contact] = Relationship(sa_relationship_kwargs={"uselist": False})
-    # TODO(jos): memberOf? This should probably be on Agent
+
+    member_of: list[Organisation] = Relationship(
+        link_model=many_to_many_link_factory("person", Organisation.__tablename__)
+    )
 
     class RelationshipConfig(Agent.RelationshipConfig):
         contact_details: int | None = OneToOne(
@@ -70,14 +74,22 @@ class RelationshipConfig(Agent.RelationshipConfig):
             default_factory_pydantic=list,
             on_delete_trigger_orphan_deletion=list,
         )
-        language: list[str] = ManyToMany(
+        languages: list[str] = ManyToMany(
             description="A language this person masters, in ISO639-3",
             _serializer=AttributeSerializer("name"),
             deserializer=FindByNameDeserializerList(Language),
             example=["eng", "fra", "spa"],
             default_factory_pydantic=list,
         )
 
+        member_of: list[int] = ManyToMany(
+            description="The list of Organisations that a Person affiliates with.",
+            _serializer=AttributeSerializer("identifier"),
+            deserializer=FindByIdentifierDeserializerList(Organisation),
+            example=[],
+            default_factory_pydantic=list,
+        )
+
 
 deserializer_list = FindByIdentifierDeserializerList(Person)
 AIoDEntryORM.RelationshipConfig.editor.deserializer = deserializer_list  # type: ignore

src/tests/routers/resource_routers/test_router_person.py

@@ -7,6 +7,7 @@
 from authentication import keycloak_openid
 from database.model.agent.contact import Contact
 from database.model.agent.person import Person
+from database.model.agent.organisation import Organisation
 from database.model.platform.platform import Platform
 from database.session import DbSession
 from tests.testutils.default_sqlalchemy import AI4EUROPE_CMS_TOKEN
@@ -18,19 +19,23 @@ def test_happy_path(
     body_agent: dict,
     person: Person,
     contact: Contact,
+    organisation: Organisation,
+
 ):
     with DbSession() as session:
         person.platform_resource_identifier = "2"
         session.add(person)
         session.add(contact)
+        session.merge(organisation)
         session.commit()
 
     body = copy.copy(body_agent)
     body["expertise"] = ["machine learning"]
-    body["language"] = ["eng", "nld"]
+    body["languages"] = ["eng", "nld"]
     body["price_per_hour_euro"] = 10.50
     body["wants_to_be_contacted"] = True
     body["contact_details"] = 1
+    body["member_of"] = [1]
 
     response = client.post("/persons/v1", json=body, headers={"Authorization": "Fake token"})
     assert response.status_code == 200, response.json()
@@ -40,15 +45,16 @@ def test_happy_path(
 
     response_json = response.json()
     assert response_json["identifier"] == 2
-    assert response_json["ai_resource_identifier"] == 2
-    assert response_json["agent_identifier"] == 2
+    assert response_json["ai_resource_identifier"] == 3
+    assert response_json["agent_identifier"] == 3
 
     assert set(response_json["expertise"]) == {"machine learning"}
-    assert set(response_json["language"]) == {"eng", "nld"}
+    assert set(response_json["languages"]) == {"eng", "nld"}
 
     assert response_json["price_per_hour_euro"] == 10.50
     assert response_json["wants_to_be_contacted"]
     assert response_json["contact_details"] == 1
+    assert response_json["member_of"] == [1]
 
 
 @pytest.fixture(