Skip to content

[BUG] Enforce mutual exclusivity for contact person and organisation #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rishavtarway wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[BUG] Enforce mutual exclusivity for contact person and organisation #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbf1574
fix: reject contacts that specify both person and organisation
rishavtarway Mar 3, 2026
bc29e25
style: apply ruff-format after contact validation changes
rishavtarway Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/routers/resource_router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ def register_resource(
resource_create: clz_create, # type: ignore
user: KeycloakUser = Depends(get_user_or_raise),
):
_raise_if_contact_person_and_organisation_are_both_filled(resource_create)
platform = getattr(resource_create, "platform", None)
platform_resource_identifier = getattr(
resource_create, "platform_resource_identifier", None
Expand Down Expand Up @@ -546,6 +547,7 @@ def put_resource(
resource_create_instance: clz_create, # type: ignore
user: KeycloakUser = Depends(get_user_or_raise),
):
_raise_if_contact_person_and_organisation_are_both_filled(resource_create_instance)
self._raise_if_identifier_is_wrong_type(identifier)
with DbSession() as session:
try:
Expand Down Expand Up @@ -908,6 +910,19 @@ def _raise_error_on_invalid_schema(possible_schemas, schema):
)


def _raise_if_contact_person_and_organisation_are_both_filled(resource):
if not (hasattr(resource, "person") and hasattr(resource, "organisation")):
return
if (
getattr(resource, "person", None) is not None
and getattr(resource, "organisation", None) is not None
):
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="Person and organisation cannot be both filled.",
)


def _raise_if_contains_binary_blob(item):
distributions = []
if hasattr(item, "distribution") and (distribution := getattr(item, "distribution")):
Expand Down
12 changes: 8 additions & 4 deletions src/tests/routers/resource_routers/test_router_contact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,17 @@ def test_post_duplicate_email(
assert set(contact["email"]) == {"b@example.com", "c@example.com"}, msg


@pytest.mark.skip(reason="https://github.com/aiondemand/AIOD-rest-api/issues/518")
def test_person_and_organisation_both_specified(client: TestClient):
headers = {"Authorization": "Fake token"}
body = {"person": 1, "organisation": 1}
with logged_in_user():
client.post("/persons", json={"name": "test person"}, headers=headers)
client.post("/organisations", json={"name": "test organisation"}, headers=headers)
person_res = client.post("/persons", json={"name": "test person"}, headers=headers)
organisation_res = client.post(
"/organisations", json={"name": "test organisation"}, headers=headers
)
body = {
"person": person_res.json()["identifier"],
"organisation": organisation_res.json()["identifier"],
}
response = client.post("/contacts", json=body, headers=headers)
assert response.status_code == 400, response.json()
assert response.json()["detail"] == "Person and organisation cannot be both filled."
Expand Down
Loading