feat: ensure name/organization are not both null on update

Author: jacob-a-brown

api/contact.py

@@ -307,6 +307,41 @@ async def update_contact(
     :param session: Database session
     :return: Updated contact response
     """
+    contact = simple_get_by_id(session, Contact, contact_id)
+
+    if (
+        contact.name is None
+        and contact_data.name is None
+        and contact_data.organization is None
+    ):
+        raise PydanticStyleException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail=[
+                {
+                    "loc": ["body", "organization"],
+                    "msg": "organization cannot be None if name is None.",
+                    "type": "value_error",
+                    "input": {"organization": contact_data.organization},
+                }
+            ],
+        )
+    elif (
+        contact.organization is None
+        and contact_data.organization is None
+        and contact_data.name is None
+    ):
+        raise PydanticStyleException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail=[
+                {
+                    "loc": ["body", "name"],
+                    "msg": "name cannot be None if organization is None.",
+                    "type": "value_error",
+                    "input": {"name": contact_data.name},
+                }
+            ],
+        )
+
     return model_patcher(session, Contact, contact_id, contact_data, user=user)
 
 

schemas/contact.py

@@ -206,6 +206,7 @@ class UpdateContact(BaseUpdateModel):
     name: str | None = None
     role: str | None = None
     thing_id: int | None = None
+    organization: str | None = None
     # email: str | None = None
     # phone: str | None = None
     # address: str | None = None

tests/conftest.py

@@ -335,7 +335,7 @@ def second_contact():
             release_status="private",
             name="Test Second Contact",
             role="Owner",
-            organization="Test Second Organization",
+            organization=None,
         )
         session.add(contact)
         session.commit()
@@ -403,6 +403,25 @@ def second_address(second_contact):
         session.commit()
 
 
+@pytest.fixture(scope="function")
+def third_contact():
+    with session_ctx() as session:
+        contact = Contact(
+            release_status="private",
+            name=None,
+            role="Owner",
+            organization="Third Organization",
+        )
+        session.add(contact)
+        session.commit()
+        session.refresh(contact)
+
+        yield contact
+
+        session.delete(contact)
+        session.commit()
+
+
 @pytest.fixture(scope="session")
 def asset():
     with session_ctx() as session:

tests/test_contact.py

@@ -725,6 +725,36 @@ def test_patch_contact_404_not_found(contact):
     assert data["detail"] == f"Contact with ID {bad_contact_id} not found."
 
 
+def test_patch_contact_409_null_name(second_contact):
+    payload = {"name": None}
+    response = client.patch(
+        f"/contact/{second_contact.id}",
+        json=payload,
+    )
+
+    assert response.status_code == 409
+    data = response.json()
+    assert data["detail"][0]["loc"] == ["body", "name"]
+    assert data["detail"][0]["msg"] == "name cannot be None if organization is None."
+    assert data["detail"][0]["type"] == "value_error"
+    assert data["detail"][0]["input"] == {"name": None}
+
+
+def test_patch_contact_409_null_organization(third_contact):
+    payload = {"organization": None}
+    response = client.patch(
+        f"/contact/{third_contact.id}",
+        json=payload,
+    )
+
+    assert response.status_code == 409
+    data = response.json()
+    assert data["detail"][0]["loc"] == ["body", "organization"]
+    assert data["detail"][0]["msg"] == "organization cannot be None if name is None."
+    assert data["detail"][0]["type"] == "value_error"
+    assert data["detail"][0]["input"] == {"organization": None}
+
+
 def test_patch_email(email):
     payload = {"email": "boo@bar.com", "release_status": "archived"}
     response = client.patch(f"/contact/email/{email.id}", json=payload)