task ids validators updates

Author: mahenzon

tests/schemas/task.py

@@ -1,27 +1,41 @@
 from __future__ import annotations
 
+from typing import Annotated
+
 from pydantic import (
     ConfigDict,
     field_validator,
+    BeforeValidator,
 )
 
 from fastapi_jsonapi.schema_base import BaseModel
 
 
+def func_validator(value: list[str] | None) -> list[str]:
+    """
+    return `[]`, if value is None both on get and on create
+
+    :param value:
+    :return:
+    """
+    return value or []
+
+
 class TaskBaseSchema(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
     # TODO: check BeforeValidator annotated
     task_ids: list[str] | None = None
+    another_task_ids: Annotated[list[str] | None, BeforeValidator(func_validator)]
 
     # noinspection PyMethodParameters
-    @field_validator("task_ids", mode="before", check_fields=False)
-    @classmethod
-    def task_ids_validator(cls, value: list[str] | None):
+    @field_validator("task_ids", mode="before")
+    @staticmethod
+    def task_ids_validator(value: list[str] | None):
         """
         return `[]`, if value is None both on get and on create
         """
-        return value or []
+        return func_validator(value)
 
 
 class TaskPatchSchema(TaskBaseSchema):

tests/test_api/test_validators.py

@@ -251,7 +251,6 @@ class UserAnnotatedSequenceNamesSchema(UserAttributesBaseSchema):
         assert detail["msg"].endswith(format_error(flag_name)), detail["msg"]
 
 
-@pytest.mark.xfail(reason="tasks ids passthrough not checked yet")
 @pytest.mark.usefixtures("refresh_db")
 class TestTaskValidators:
     async def test_base_model_validator_pre_true_get_one(
@@ -262,6 +261,7 @@ async def test_base_model_validator_pre_true_get_one(
         task_with_none_ids: Task,
     ):
         assert task_with_none_ids.task_ids is None
+        assert task_with_none_ids.another_task_ids is None
         url = app.url_path_for(f"get_{resource_type}_detail", obj_id=task_with_none_ids.id)
         res = await client.get(url)
         assert res.status_code == status.HTTP_200_OK, res.text
@@ -271,15 +271,17 @@ async def test_base_model_validator_pre_true_get_one(
             "data": {
                 "id": ViewBase.get_db_item_id(task_with_none_ids),
                 "type": resource_type,
+                # dont' pass fields at all
             },
             "jsonapi": {"version": "1.0"},
             "meta": None,
         }
         assert attributes == {
             # not `None`! schema validator returns empty list `[]`
             "task_ids": [],
+            "another_task_ids": [],
         }
-        assert attributes == TaskBaseSchema.model_validate(task_with_none_ids)
+        assert attributes == TaskBaseSchema.model_validate(task_with_none_ids).model_dump()
 
     async def test_base_model_model_validator_get_list(
         self,
@@ -289,6 +291,7 @@ async def test_base_model_model_validator_get_list(
         task_with_none_ids: Task,
     ):
         assert task_with_none_ids.task_ids is None
+        assert task_with_none_ids.another_task_ids is None
         url = app.url_path_for(f"get_{resource_type}_list")
         res = await client.get(url)
         assert res.status_code == status.HTTP_200_OK, res.text
@@ -300,6 +303,7 @@ async def test_base_model_model_validator_get_list(
                 "attributes": {
                     # not `None`! schema validator returns empty list `[]`
                     "task_ids": [],
+                    "another_task_ids": [],
                 },
             },
         ]
@@ -315,6 +319,7 @@ async def test_base_model_model_validator_create(
         task_data = {
             # should be converted to [] by schema on create
             "task_ids": None,
+            "another_task_ids": None,
         }
         data_create = {
             "data": {
@@ -332,12 +337,14 @@ async def test_base_model_model_validator_create(
         # we sent request with `None`, but value in db is `[]`
         # because validator converted data before object creation
         assert task.task_ids == []
+        assert task.another_task_ids == []
         assert response_data == {
             "data": {
                 "type": resource_type,
                 "attributes": {
                     # should be empty list
                     "task_ids": [],
+                    "another_task_ids": [],
                 },
             },
             "jsonapi": {"version": "1.0"},