updated patch logic and refactor

Author: CosmoV

fastapi_jsonapi/data_layers/sqla_orm.py

@@ -319,15 +319,14 @@ async def update_object(
         has_updated = False
         for field_name, new_value in new_data.items():
             # TODO: get field alias (if present) and get attribute by alias (rarely used, but required)
-            try:
-                old_value = getattr(obj, field_name)
-
-                if old_value != new_value:
-                    setattr(obj, field_name, new_value)
-                    has_updated = True
-            except AttributeError:
-                err_message = f'Can\'t find an attribute "{field_name}" in model {self.model.__name__}'
-                logging.warning(err_message)
+            missing = object()
+
+            if (old_value := getattr(obj, field_name, missing)) is missing:
+                continue
+
+            if old_value != new_value:
+                setattr(obj, field_name, new_value)
+                has_updated = True
         try:
             await self.session.commit()
         except DBAPIError as e:

fastapi_jsonapi/querystring.py

@@ -150,18 +150,15 @@ def filters(self) -> List[dict]:
         if filters is not None:
             try:
                 loaded_filters = json.loads(filters)
-
-                if not isinstance(loaded_filters, list):
-                    msg = (
-                        "Incorrect filters format, expected list of "
-                        f"conditions but got {type(loaded_filters).__name__}"
-                    )
-                    raise InvalidFilters(msg)
-
-                results.extend(json.loads(filters))
             except (ValueError, TypeError):
                 msg = "Parse error"
                 raise InvalidFilters(msg)
+
+            if not isinstance(loaded_filters, list):
+                msg = f"Incorrect filters format, expected list of conditions but got {type(loaded_filters).__name__}"
+                raise InvalidFilters(msg)
+
+            results.extend(loaded_filters)
         if self._get_key_values("filter["):
             results.extend(self._simple_filters(self._get_key_values("filter[")))
         return results

fastapi_jsonapi/utils/sqla.py

@@ -1,9 +1,9 @@
 from typing import Type
 
-from fastapi_jsonapi.data_typing import TypeModel, TypeSchema
+from fastapi_jsonapi.data_typing import TypeModel
 
 
-def get_related_model_cls(cls: TypeSchema, relation_name: str) -> Type[TypeModel]:
+def get_related_model_cls(cls: Type[TypeModel], relation_name: str) -> Type[TypeModel]:
     """
 
     SQLA Get related model class

tests/test_api/test_api_sqla_with_includes.py

@@ -46,6 +46,34 @@ def association_key(data: dict):
     return data["type"], data["id"]
 
 
+def build_app_custom(
+    schema,
+    schema_in_patch,
+    schema_in_post,
+    model,
+    resource_type: str = "misc",
+) -> FastAPI:
+    router: APIRouter = APIRouter()
+
+    RoutersJSONAPI(
+        router=router,
+        path="/misc",
+        tags=["Misc"],
+        class_detail=DetailViewBaseGeneric,
+        class_list=ListViewBaseGeneric,
+        schema=schema,
+        resource_type=resource_type,
+        schema_in_patch=schema_in_patch,
+        schema_in_post=schema_in_post,
+        model=model,
+    )
+
+    app = build_app_plain()
+    app.include_router(router, prefix="")
+
+    return app
+
+
 async def test_root(client: AsyncClient):
     response = await client.get("/docs")
     assert response.status_code == status.HTTP_200_OK
@@ -891,31 +919,11 @@ async def test_create_user_and_fetch_data(self, app: FastAPI, client: AsyncClien
         assert response_data["data"]["attributes"] == create_user_body["data"]["attributes"]
         assert response_data["data"]["id"] == user_id
 
-    def _build_app_custom(self, schema, schema_in_post, model, resource_type: str = "misc") -> FastAPI:
-        router: APIRouter = APIRouter()
-
-        RoutersJSONAPI(
-            router=router,
-            path="/misc",
-            tags=["Misc"],
-            class_detail=DetailViewBaseGeneric,
-            class_list=ListViewBaseGeneric,
-            schema=schema,
-            resource_type=resource_type,
-            schema_in_patch=UserPatchSchema,
-            schema_in_post=schema_in_post,
-            model=model,
-        )
-
-        app = build_app_plain()
-        app.include_router(router, prefix="")
-
-        return app
-
     async def test_create_id_by_client(self):
         resource_type = "user"
-        app = self._build_app_custom(
+        app = build_app_custom(
             UserSchema,
+            UserPatchSchema,
             UserInSchemaAllowIdOnPost,
             User,
             resource_type=resource_type,
@@ -949,7 +957,7 @@ async def test_create_id_by_client(self):
             }
 
     async def test_create_id_by_client_uuid_type(self):
-        app = self._build_app_custom(IdCastSchema, IdCastSchema, IdCast)
+        app = build_app_custom(IdCastSchema, IdCastSchema, IdCastSchema, IdCast)
 
         new_id = str(uuid4())
         create_body = {
@@ -975,7 +983,8 @@ async def test_create_id_by_client_uuid_type(self):
 
     async def test_create_with_relationship_to_the_same_table(self):
         resource_type = "self_relationship"
-        app = self._build_app_custom(
+        app = build_app_custom(
+            SelfRelationshipSchema,
             SelfRelationshipSchema,
             SelfRelationshipSchema,
             SelfRelationship,
@@ -1090,6 +1099,39 @@ async def test_patch_object(
             "meta": None,
         }
 
+    async def test_do_nothing_with_field_not_presented_in_model(
+        self,
+        user_1: User,
+    ):
+        class UserPatchSchemaWithExtraAttribute(UserPatchSchema):
+            attr_which_is_not_presented_in_model: str
+
+        resource_type = "user"
+        app = build_app_custom(
+            UserSchema,
+            UserPatchSchemaWithExtraAttribute,
+            UserPatchSchemaWithExtraAttribute,
+            User,
+            resource_type=resource_type,
+        )
+        new_attrs = UserPatchSchemaWithExtraAttribute(
+            name=fake.name(),
+            age=fake.pyint(),
+            email=fake.email(),
+            attr_which_is_not_presented_in_model=fake.name(),
+        ).dict()
+
+        patch_user_body = {
+            "data": {
+                "id": user_1.id,
+                "attributes": new_attrs,
+            },
+        }
+        async with AsyncClient(app=app, base_url="http://test") as client:
+            url = app.url_path_for(f"update_{resource_type}_detail", obj_id=user_1.id)
+            res = await client.patch(url, json=patch_user_body)
+            assert res.status_code == status.HTTP_200_OK, res.text
+
 
 class TestPatchObjectRelationshipsToOne:
     async def test_ok_when_foreign_key_of_related_object_is_nullable(