From 10dbb63bff8d595a2248bab974293c8ad4260516 Mon Sep 17 00:00:00 2001
From: kennardy <kirill.lehtman189@gmail.com>
Date: Fri, 10 Jul 2026 15:05:09 +0200
Subject: [PATCH] feat(fields): add dedicated schema list field

---
 backend/app/core/fields/schema_field.py | 127 ++++++++++++++++--------
 1 file changed, 85 insertions(+), 42 deletions(-)

diff --git a/backend/app/core/fields/schema_field.py b/backend/app/core/fields/schema_field.py
index bf00c80..26c10f5 100644
--- a/backend/app/core/fields/schema_field.py
+++ b/backend/app/core/fields/schema_field.py
@@ -1,54 +1,97 @@
-from typing import TypeVar
+from typing import Any, TypeVar
 
-from pydantic import BaseModel
-from tortoise import fields
-from tortoise.exceptions import FieldError
+from pydantic import BaseModel, TypeAdapter
+from tortoise import Model, fields
 from tortoise.fields.data import JSON_DUMPS, JSON_LOADS
 
-SchemaType = TypeVar('SchemaType', bound=BaseModel)
+TModel = TypeVar('TModel', bound=BaseModel)
 
 
-ResultType = TypeVar('ResultType')
+class SchemaField(fields.JSONField[TModel]):
+    def __init__(self, schema: type[TModel] | None = None, **kwargs: Any):
+        self._schema = schema
+        kwargs['decoder'] = self.decode
+        kwargs['encoder'] = self.encode
+        super().__init__(**kwargs)
 
-
-class SchemaField(fields.JSONField[ResultType]):
-    def to_db_value(
-        self,
-        value,
-        instance,
-    ) -> str | None:
+    def to_db_value(self, value: Any, instance: 'Model | type[Model]') -> str | None:
         self.validate(value)
         if value is None:
             return None
-        if isinstance(value, (str, bytes)):
+        model_instance = self.decode(value)
+        return self.encode(model_instance)
+
+    def decode(self, value: Any) -> TModel | None:
+        assert self._schema is not None, 'Schema must be provided'
+        if value is None:
+            return None
+        if isinstance(value, self._schema):
+            return value
+        if isinstance(value, (bytes, str)):
+            if isinstance(value, bytes):
+                value = value.decode()
             try:
-                self.decoder(value)
-            except Exception:
-                raise FieldError(f'Value {value!r} is invalid json value.')
+                value = JSON_LOADS(value)
+            except Exception as e:
+                raise ValueError(f'Malformed JSON in {self.__class__.__name__}: {e}')
+        if isinstance(value, dict):
+            return self._schema.model_validate(value)
+        if value is None:
+            return None
+        raise ValueError(
+            f'Invalid type for {self._schema.__name__}: expected dict or {self._schema.__name__}, got {type(value)}'
+        )
+
+    def encode(self, value: TModel | None) -> str | None:
+        if value is None:
+            return None
+        return JSON_DUMPS(value.model_dump(mode='json'))
+
+
+class SchemaListField(fields.JSONField[list[TModel]]):
+    def __init__(self, schema: type[TModel] | None = None, **kwargs: Any):
+        self._schema = schema
+        self._list_schema_adapter: TypeAdapter[list[TModel]] | None = None
+        kwargs['decoder'] = self.decode
+        kwargs['encoder'] = self.encode
+        super().__init__(**kwargs)
+
+    def _get_list_adapter(self) -> TypeAdapter[list[TModel]]:
+        if self._list_schema_adapter is None:
+            assert self._schema is not None, 'Schema must be provided before first use'
+            self._list_schema_adapter = TypeAdapter(list[self._schema])
+        return self._list_schema_adapter
+
+    def to_db_value(self, value: Any, instance: 'Model | type[Model]') -> str | None:
+        self.validate(value)
+        assert self._schema is not None, 'Schema must be provided'
+        if value is None:
+            return None
+        model_list = self.decode(value)
+        return self.encode(model_list)
+
+    def decode(self, value: Any) -> list[TModel] | None:
+        assert self._schema is not None, 'Schema must be provided'
+        if value is None:
+            return None
+
+        if isinstance(value, (bytes, str)):
             if isinstance(value, bytes):
-                return value.decode()
-            return value
+                value = value.decode()
+            try:
+                value = JSON_LOADS(value)
+            except Exception as e:
+                raise ValueError(f'Malformed JSON in {self.__class__.__name__}: {e}')
+        if isinstance(value, list):
+            if value and isinstance(value[0], self._schema):
+                return value
+            return self._get_list_adapter().validate_python(value)
+        if value is None:
+            return None
+        raise ValueError(f'Expected list for {self._schema.__name__} collection, got {type(value)}')
 
-        return self.encoder(value)
-
-    def __init__(self, schema: type[SchemaType], *args, **kwargs):
-        def decoder(x):
-            if x is None:
-                return None
-            instance = JSON_LOADS(x)
-            if isinstance(instance, list):
-                return [schema.model_validate(v) for v in instance]
-            return schema.model_validate(instance)
-
-        def encoder(x):
-            if x is None:
-                return None
-            if isinstance(x, list):
-                data = [v.model_dump(mode='json') for v in x]
-            else:
-                data = x.model_dump(mode='json')
-            return JSON_DUMPS(data)
-
-        kwargs['decoder'] = decoder
-        kwargs['encoder'] = encoder
-        super().__init__(*args, **kwargs)
+    def encode(self, value: list[TModel] | None) -> str | None:
+        if value is None:
+            return None
+        data = self._get_list_adapter().dump_python(value, mode='json', exclude_unset=True)
+        return JSON_DUMPS(data)