updated logic

Author: CosmoV

fastapi_jsonapi/data_layers/sqla_orm.py

@@ -180,12 +180,16 @@ async def apply_relationships(self, obj: TypeModel, data_create: BaseJSONAPIItem
                 )
             else:
                 assert isinstance(relationship_in, BaseJSONAPIRelationshipDataToOneSchema)
-                related_data = await self.get_related_object(
-                    related_model=related_model,
-                    related_id_field=relationship_info.id_field_name,
-                    id_value=relationship_in.data.id,
-                )
 
+                if relationship_in.data:
+                    related_data = await self.get_related_object(
+                        related_model=related_model,
+                        related_id_field=relationship_info.id_field_name,
+                        id_value=relationship_in.data.id,
+                    )
+                else:
+                    setattr(obj, relation_name, None)
+                    continue
             try:
                 hasattr(obj, relation_name)
             except MissingGreenlet:

tests/schemas.py

@@ -400,8 +400,14 @@ class CustomUUIDItemSchema(CustomUUIDItemAttributesSchema):
     id: UUID = Field(client_can_set_id=True)
 
 
-class SelfRelationshipSchema(BaseModel):
+class SelfRelationshipAttributesSchema(BaseModel):
     name: str
+
+    class Config:
+        orm_mode = True
+
+
+class SelfRelationshipSchema(SelfRelationshipAttributesSchema):
     self_relationship: Optional["SelfRelationshipSchema"] = Field(
         relationship=RelationshipInfo(
             resource_type="self_relationship",

tests/test_api/test_api_sqla_with_includes.py

@@ -52,6 +52,7 @@
     CustomUUIDItemAttributesSchema,
     PostAttributesBaseSchema,
     PostCommentAttributesBaseSchema,
+    SelfRelationshipAttributesSchema,
     SelfRelationshipSchema,
     UserAttributesBaseSchema,
     UserBioAttributesBaseSchema,
@@ -1845,10 +1846,12 @@ async def test_remove_to_one_relationship_using_by_update(self, async_session: A
         assert child_obj.self_relationship_id == parent_obj.id
 
         async with AsyncClient(app=app, base_url="http://test") as client:
+            expected_name = fake.name()
             update_body = {
                 "data": {
+                    "id": str(child_obj.id),
                     "attributes": {
-                        "name": fake.name(),
+                        "name": expected_name,
                     },
                     "relationships": {
                         "self_relationship": {
@@ -1857,9 +1860,23 @@ async def test_remove_to_one_relationship_using_by_update(self, async_session: A
                     },
                 },
             }
+            params = {
+                "include": "self_relationship",
+            }
             url = app.url_path_for(f"update_{resource_type}_detail", obj_id=child_obj.id)
-            res = await client.patch(url, json=update_body)
+            res = await client.patch(url, params=params, json=update_body)
             assert res.status_code == status.HTTP_200_OK, res.text
+            assert res.json() == {
+                "data": {
+                    "attributes": SelfRelationshipAttributesSchema(name=expected_name).dict(),
+                    "id": str(child_obj.id),
+                    "relationships": {"self_relationship": {"data": None}},
+                    "type": "self_relationship",
+                },
+                "included": [],
+                "jsonapi": {"version": "1.0"},
+                "meta": None,
+            }
 
             await async_session.refresh(child_obj)
             assert child_obj.self_relationship_id is None