brilliance-admin 0.44.6__tar.gz → 0.44.7__tar.gz

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.44.6
+Version: 0.44.7
 Summary: Simple and lightweight data managment framework powered by FastAPI and Vue3 Vuetify all-in-one. Some call it heavenly in its brilliance.
 License-Expression: MIT
 Requires-Python: >=3.10

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/api/views/autocomplete.py

@@ -23,7 +23,7 @@ async def autocomplete(request: Request, group: str, category: str, data: Autoco
     context = {'language_context': language_context}
 
     try:
-        result: AutocompleteResult = await schema_category.autocomplete(data, user, language_context)
+        result: AutocompleteResult = await schema_category.autocomplete(data, user, language_context, schema)
     except AdminAPIException as e:
         return JSONResponse(e.get_error().model_dump(mode='json', context=context), status_code=e.status_code)
     except Exception as e:

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/api/views/table.py

@@ -30,7 +30,7 @@ async def table_list(request: Request, group: str, category: str, list_data: Lis
     context = {'language_context': language_context}
 
     try:
-        result: TableListResult = await schema_category.get_list(list_data, user, language_context)
+        result: TableListResult = await schema_category.get_list(list_data, user, language_context, schema)
     except AdminAPIException as e:
         return JSONResponse(e.get_error().model_dump(mode='json', context=context), status_code=e.status_code)
 
@@ -54,7 +54,7 @@ async def table_retrieve(request: Request, group: str, category: str, pk: Any) -
     context = {'language_context': language_context}
 
     try:
-        result: RetrieveResult = await schema_category.retrieve(pk, user, language_context)
+        result: RetrieveResult = await schema_category.retrieve(pk, user, language_context, schema)
     except AdminAPIException as e:
         return JSONResponse(e.get_error().model_dump(mode='json', context=context), status_code=e.status_code)
 
@@ -77,7 +77,7 @@ async def table_create(request: Request, group: str, category: str) -> CreateRes
     context = {'language_context': language_context}
 
     try:
-        result: CreateResult = await schema_category.create(await request.json(), user, language_context)
+        result: CreateResult = await schema_category.create(await request.json(), user, language_context, schema)
     except AdminAPIException as e:
         return JSONResponse(e.get_error().model_dump(mode='json', context=context), status_code=e.status_code)
 
@@ -100,7 +100,7 @@ async def table_update(request: Request, group: str, category: str, pk: Any) ->
     context = {'language_context': language_context}
 
     try:
-        result: UpdateResult = await schema_category.update(pk, await request.json(), user, language_context)
+        result: UpdateResult = await schema_category.update(pk, await request.json(), user, language_context, schema)
     except AdminAPIException as e:
         return JSONResponse(e.get_error().model_dump(mode='json', context=context), status_code=e.status_code)
 
@@ -129,7 +129,7 @@ async def table_action(
     try:
         # pylint: disable=protected-access
         result: ActionResult = await schema_category._perform_action(
-            request, action, action_data, language_context, user,
+            request, action, action_data, language_context, user, schema,
         )
     except AdminAPIException as e:
         return JSONResponse(e.get_error().model_dump(mode='json', context=context), status_code=e.status_code)

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/integrations/sqlalchemy/autocomplete.py

@@ -1,11 +1,16 @@
 from brilliance_admin.auth import UserABC
+from brilliance_admin.schema.admin_schema import AdminSchema
 from brilliance_admin.schema.table.table_models import AutocompleteData, AutocompleteResult
 from brilliance_admin.translations import LanguageContext
 
 
 class SQLAlchemyAdminAutocompleteMixin:
     async def autocomplete(
-            self, data: AutocompleteData, user: UserABC, language_context: LanguageContext,
+            self,
+            data: AutocompleteData,
+            user: UserABC,
+            language_context: LanguageContext,
+            admin_schema: AdminSchema,
     ) -> AutocompleteResult:
         form_schema = None
 

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/integrations/sqlalchemy/table/create.py

@@ -1,6 +1,7 @@
 from brilliance_admin import schema
 from brilliance_admin.auth import UserABC
 from brilliance_admin.exceptions import AdminAPIException, APIError
+from brilliance_admin.schema.admin_schema import AdminSchema
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.translations import TranslateText as _
 from brilliance_admin.utils import get_logger
@@ -16,6 +17,7 @@ class SQLAlchemyAdminCreate:
             data: dict,
             user: UserABC,
             language_context: LanguageContext,
+            admin_schema: AdminSchema,
     ) -> schema.CreateResult:
         if not self.has_create:
             raise AdminAPIException(APIError(message=_('errors.method_not_allowed')), status_code=500)

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/integrations/sqlalchemy/table/delete.py

@@ -12,7 +12,7 @@ class SQLAlchemyDeleteAction:
         base_color='red-lighten-2',
         variant='outlined',
     )
-    async def delete(self, action_data: ActionData):
+    async def delete(self, *args, action_data: ActionData, **kwargs):
         if not self.has_delete:
             raise AdminAPIException(APIError(message=_('errors.method_not_allowed')), status_code=500)
         return ActionResult(message=ActionMessage(_('deleted_successfully')))

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/integrations/sqlalchemy/table/list.py

@@ -1,6 +1,7 @@
 from brilliance_admin import auth, schema
 from brilliance_admin.exceptions import AdminAPIException, APIError, FieldError
 from brilliance_admin.integrations.sqlalchemy.fields_schema import SQLAlchemyFieldsSchema
+from brilliance_admin.schema.admin_schema import AdminSchema
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.translations import TranslateText as _
 from brilliance_admin.utils import get_logger
@@ -88,6 +89,7 @@ class SQLAlchemyAdminListMixin:
         list_data: schema.ListData,
         user: auth.UserABC,
         language_context: LanguageContext,
+        admin_schema: AdminSchema,
     ) -> schema.TableListResult:
         # pylint: disable=import-outside-toplevel
         from sqlalchemy import exc, func, select
@@ -120,7 +122,10 @@ class SQLAlchemyAdminListMixin:
                     'list_data': list_data,
                 }
             )
-            raise AdminAPIException(APIError(message=_('errors.filters_exception'), code='filters_exception'), status_code=500) from e
+            msg = _('errors.filters_exception') % {
+                'error': str(e) if admin_schema.debug else type(e).__name__,
+            }
+            raise AdminAPIException(APIError(message=msg, code='filters_exception'), status_code=500) from e
 
         try:
             async with self.db_async_session() as session:
@@ -163,7 +168,9 @@ class SQLAlchemyAdminListMixin:
                     'list_data': list_data,
                 }
             )
-            msg = _('errors.db_error_list') % {'error_type': type(e).__name__}
+            msg = _('errors.db_error_list') % {
+                'error_type': str(e) if admin_schema.debug else type(e).__name__,
+            }
             raise AdminAPIException(
                 APIError(message=msg, code='db_error_list'), status_code=500,
             ) from e
@@ -182,15 +189,20 @@ class SQLAlchemyAdminListMixin:
                 'SQLAlchemy %s list %s serialize field error: %s',
                 type(self).__name__, self.model.__name__, e,
             )
-            msg = _('serialize_error.field_error') % {'error': e.message, 'field_slug': e.field_slug}
-            raise AdminAPIException(APIError(message=msg, code='filters_exception'), status_code=500) from e
+            msg = _('serialize_error.field_error') % {
+                'error': e.message,
+                'field_slug': e.field_slug,
+            }
+            raise AdminAPIException(APIError(message=msg, code='field_error'), status_code=500) from e
 
         except Exception as e:
             logger.exception(
                 'SQLAlchemy %s list %s serialize error: %s',
                 type(self).__name__, self.model.__name__, e,
             )
-            msg = _('serialize_error.unexpected_error') % {'error': str(e)}
-            raise AdminAPIException(APIError(message=msg, code='filters_exception'), status_code=500) from e
+            msg = _('serialize_error.unexpected_error') % {
+                'error': str(e) if admin_schema.debug else type(e).__name__,
+            }
+            raise AdminAPIException(APIError(message=msg, code='unexpected_error'), status_code=500) from e
 
         return schema.TableListResult(data=data, total_count=int(total_count or 0))

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/integrations/sqlalchemy/table/retrieve.py

@@ -3,6 +3,7 @@ from typing import Any
 from brilliance_admin import auth, schema
 from brilliance_admin.exceptions import AdminAPIException, APIError, FieldError
 from brilliance_admin.integrations.sqlalchemy.fields_schema import SQLAlchemyFieldsSchema
+from brilliance_admin.schema.admin_schema import AdminSchema
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.translations import TranslateText as _
 from brilliance_admin.utils import get_logger
@@ -20,6 +21,7 @@ class SQLAlchemyAdminRetrieveMixin:
             pk: Any,
             user: auth.UserABC,
             language_context: LanguageContext,
+            admin_schema: AdminSchema,
     ) -> schema.RetrieveResult:
         if not self.has_delete:
             raise AdminAPIException(APIError(message=_('errors.method_not_allowed')), status_code=500)
@@ -42,7 +44,9 @@ class SQLAlchemyAdminRetrieveMixin:
                 'SQLAlchemy %s retrieve %s #%s db error: %s',
                 type(self).__name__, self.model.__name__, pk, e,
             )
-            msg = _('errors.db_error_retrieve') % {'error_type': type(e).__name__}
+            msg = _('errors.db_error_retrieve') % {
+                'error_type': str(e) if admin_schema.debug else type(e).__name__,
+            }
             raise AdminAPIException(
                 APIError(message=msg, code='db_error_retrieve'), status_code=500,
             ) from e
@@ -64,16 +68,21 @@ class SQLAlchemyAdminRetrieveMixin:
                 'SQLAlchemy %s retrieve %s #%s serialize field error: %s',
                 type(self).__name__, self.model.__name__, pk, e,
             )
-            msg = _('serialize_error.field_error') % {'error': e.message, 'field_slug': e.field_slug}
-            raise AdminAPIException(APIError(message=msg, code='filters_exception'), status_code=500) from e
+            msg = _('serialize_error.field_error') % {
+                'error': e.message,
+                'field_slug': e.field_slug,
+            }
+            raise AdminAPIException(APIError(message=msg, code='field_error'), status_code=500) from e
 
         except Exception as e:
             logger.exception(
                 'SQLAlchemy %s list %s #%s serialize error: %s',
                 type(self).__name__, self.model.__name__, pk, e,
             )
-            msg = _('serialize_error.unexpected_error') % {'error': str(e)}
-            raise AdminAPIException(APIError(message=msg, code='filters_exception'), status_code=500) from e
+            msg = _('serialize_error.unexpected_error') % {
+                'error': str(e) if admin_schema.debug else type(e).__name__,
+            }
+            raise AdminAPIException(APIError(message=msg, code='unexpected_error'), status_code=500) from e
 
         logger.debug(
             '%s model %s #%s retrieved by %s',

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/integrations/sqlalchemy/table/update.py

@@ -2,6 +2,7 @@ from typing import Any
 
 from brilliance_admin import auth, schema
 from brilliance_admin.exceptions import AdminAPIException, APIError
+from brilliance_admin.schema.admin_schema import AdminSchema
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.translations import TranslateText as _
 from brilliance_admin.utils import get_logger
@@ -19,6 +20,7 @@ class SQLAlchemyAdminUpdate:
             data: dict,
             user: auth.UserABC,
             language_context: LanguageContext,
+            admin_schema: AdminSchema,
     ) -> schema.UpdateResult:
         if not self.has_update:
             raise AdminAPIException(APIError(message=_('errors.method_not_allowed')), status_code=500)

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/locales/en.yml

@@ -12,7 +12,7 @@ errors:
   db_error_list: 'Failed to retrieve table data from the database: %(error_type)s'
 
   connection_refused_error: 'Database connection error: %(error)s'
-  filters_exception: 'An unknown technical error occurred while filtering data.'
+  filters_exception: 'An unknown technical error occurred while filtering data: %(error_type)s'
   method_not_allowed: 'Error, method not allowed. This action is not permitted.'
   filter_error: 'An error occurred during filtering: {error}'
   bad_type_error: 'Invalid data type: %(type)s but %(expected)s expected'

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/locales/ru.yml

@@ -12,7 +12,7 @@ errors:
   db_error_list: 'Ошибка получения данных таблицы из базы данных: %(error_type)s'
 
   connection_refused_error: 'Ошибка подключения к базе данных: %(error)s'
-  filters_exception: 'Произошла неизвестная техническая ошибка при фильтрации данных.'
+  filters_exception: 'Произошла неизвестная техническая ошибка при фильтрации данных: %(error_type)s'
   method_not_allowed: 'Ошибка, данный метод недоступен.'
   filter_error: 'Проишла ошибка при фильтрации: %(error)s'
   bad_type_error: 'Некорректный тип данных: %(type)s; ожидается %(expected)s'

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/schema/admin_schema.py

@@ -68,6 +68,8 @@ class AdminSchema:
 
     language_manager: LanguageManager | None = None
 
+    debug: bool = False
+
     def __post_init__(self):
         for category in self.categories:
             if not issubclass(category.__class__, BaseCategory):
@@ -122,8 +124,6 @@ class AdminSchema:
             languages=languages,
         )
 
-    # pylint: disable=too-many-arguments
-    # pylint: disable=too-many-positional-arguments
     def generate_app(
             self,
             debug=False,
@@ -133,6 +133,8 @@ class AdminSchema:
             include_docs=False,
             include_redoc=False,
     ) -> FastAPI:
+        self.debug = debug
+
         # pylint: disable=unused-variable
         language_context = self.get_language_context(language_slug=None)
 

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin/schema/table/category_table.py

@@ -8,8 +8,8 @@ from pydantic import Field
 
 from brilliance_admin.auth import UserABC
 from brilliance_admin.exceptions import AdminAPIException, APIError
-from brilliance_admin.schema.category import BaseCategory
-from brilliance_admin.schema.category import TableInfoSchemaData
+from brilliance_admin.schema.admin_schema import AdminSchema
+from brilliance_admin.schema.category import BaseCategory, TableInfoSchemaData
 from brilliance_admin.schema.table.admin_action import ActionData, ActionResult
 from brilliance_admin.schema.table.fields_schema import FieldsSchema
 from brilliance_admin.schema.table.table_models import AutocompleteData, AutocompleteResult, ListData, TableListResult
@@ -130,6 +130,7 @@ class CategoryTable(BaseCategory):
             action_data: ActionData,
             language_context: LanguageContext,
             user: UserABC,
+            admin_schema: AdminSchema,
     ) -> ActionResult:
         action_fn = self._get_action_fn(action)
         if action_fn is None:
@@ -156,7 +157,7 @@ class CategoryTable(BaseCategory):
 
         return result
 
-    async def autocomplete(self, data: AutocompleteData, user: UserABC) -> AutocompleteResult:
+    async def autocomplete(self, data: AutocompleteData, user: UserABC, schema: AdminSchema) -> AutocompleteResult:
         """
         Retrieves list of found options to select.
         """
@@ -164,14 +165,16 @@ class CategoryTable(BaseCategory):
 
     # pylint: disable=too-many-arguments
     @abc.abstractmethod
-    async def get_list(self, list_data: ListData, user: UserABC, language_context: LanguageContext) -> TableListResult:
+    async def get_list(
+            self, list_data: ListData, user: UserABC, language_context: LanguageContext, admin_schema: AdminSchema
+    ) -> TableListResult:
         raise NotImplementedError()
 
-#     async def retrieve(self, pk: Any, user: UserABC) -> RetrieveResult:
+#     async def retrieve(self, pk: Any, user: UserABC, language_context: LanguageContext, admin_schema: AdminSchema) -> RetrieveResult:
 #        raise NotImplementedError()
 
-#    async def create(self, data: dict, user: UserABC) -> CreateResult:
+#    async def create(self, data: dict, user: UserABC, language_context: LanguageContext, admin_schema: AdminSchema) -> CreateResult:
 #        raise NotImplementedError()
 
-#    async def update(self, pk: Any, data: dict, user: UserABC) -> UpdateResult:
+#    async def update(self, pk: Any, data: dict, user: UserABC, language_context: LanguageContext, admin_schema: AdminSchema) -> UpdateResult:
 #        raise NotImplementedError()

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/brilliance_admin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.44.6
+Version: 0.44.7
 Summary: Simple and lightweight data managment framework powered by FastAPI and Vue3 Vuetify all-in-one. Some call it heavenly in its brilliance.
 License-Expression: MIT
 Requires-Python: >=3.10

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brilliance-admin"
-version = "0.44.6"
+version = "0.44.7"
 description = 'Simple and lightweight data managment framework powered by FastAPI and Vue3 Vuetify all-in-one. Some call it heavenly in its brilliance.'
 readme = "README.md"
 requires-python = ">=3.10"

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/tests/test_sqlalcmeny_crud.py

@@ -5,9 +5,11 @@ from sqlalchemy import select
 from sqlalchemy.orm import selectinload
 
 from brilliance_admin import auth, schema, sqlalchemy
+from brilliance_admin.exceptions import AdminAPIException
+from brilliance_admin.schema import admin_schema
 from brilliance_admin.translations import TranslateText
 from example.sections.models import (
-    Currency, CurrencyFactory, MerchantFactory, Terminal, TerminalFactory, TerminalStatuses)
+    Currency, CurrencyFactory, Merchant, MerchantFactory, Terminal, TerminalFactory, TerminalStatuses)
 from tests.test_sqlalcmeny_schema import FIELDS
 
 
@@ -42,11 +44,37 @@ async def test_create(sqlite_sessionmaker, language_context):
         data=create_data,
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
 
     assert create_result.pk == 1
 
 
+@pytest.mark.asyncio
+async def test_create_bad_fk(sqlite_sessionmaker, language_context):
+    category = get_category(sqlite_sessionmaker)
+    user = auth.UserABC(username="test")
+    merchant = await MerchantFactory()
+    currency = await CurrencyFactory()
+
+    create_data = {
+        'manager_id': 1,
+        'merchant_id': 100,
+        'currency_id': currency.id,
+        'status': 'test',
+        'description': 'test',
+        'title': 'test',
+    }
+    with pytest.raises(AdminAPIException) as e:
+        schema.CreateResult = await category.create(
+            data=create_data,
+            user=user,
+            language_context=language_context,
+            admin_schema=admin_schema,
+        )
+    assert e.value.get_error().message == 'NOT NULL constraint failed: terminal.merchant_id'
+
+
 @pytest.mark.asyncio
 async def test_retrieve(sqlite_sessionmaker, language_context):
     category = get_category(sqlite_sessionmaker)
@@ -67,6 +95,7 @@ async def test_retrieve(sqlite_sessionmaker, language_context):
         pk=terminal.id,
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     expected_data = {
         'manager_id': mock.ANY,
@@ -127,6 +156,7 @@ async def test_retrieve_currency(sqlite_sessionmaker, language_context):
         pk=currency.id,
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     expected_data = {
         'id': currency.id,
@@ -138,6 +168,46 @@ async def test_retrieve_currency(sqlite_sessionmaker, language_context):
     assert retrieve_result.data == expected_data, retrieve_result.data
 
 
+@pytest.mark.asyncio
+async def test_create_bad_json(sqlite_sessionmaker, language_context):
+    category = sqlalchemy.SQLAlchemyAdmin(
+        model=Merchant,
+        db_async_session=sqlite_sessionmaker,
+        table_schema=sqlalchemy.SQLAlchemyFieldsSchema(
+            model=Merchant,
+            fields=[
+                'title',
+                'provider_settings',
+            ],
+        ),
+    )
+    user = auth.UserABC(username="test")
+    create_data = {
+        'title': 'test',
+        'provider_settings': 'not json',
+    }
+    with pytest.raises(AdminAPIException) as e:
+        await category.create(
+            data=create_data,
+            user=user,
+            language_context=language_context,
+            admin_schema=admin_schema,
+        )
+    context = {'language_context': language_context}
+    errors = {
+        'code': 'validation_error',
+        'field_errors': {
+            'provider_settings': {
+                'code': None,
+                'field_slug': None,
+                'message': "Некорректный тип данных: <class 'str'>; ожидается JSON",
+            },
+        },
+        'message': 'Validation error',
+    }
+    assert e.value.get_error().model_dump(context=context) == errors
+
+
 @pytest.mark.asyncio
 async def test_list(sqlite_sessionmaker, language_context):
     category = get_category(sqlite_sessionmaker)
@@ -160,6 +230,7 @@ async def test_list(sqlite_sessionmaker, language_context):
         ),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     data = [
         {
@@ -212,6 +283,7 @@ async def test_update_related_one(sqlite_sessionmaker, language_context):
         data=update_data,
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert update_result == schema.UpdateResult(pk=terminal.id)
 
@@ -253,6 +325,7 @@ async def test_update_related_many(sqlite_sessionmaker, language_context):
         data=update_data,
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert update_result == schema.UpdateResult(pk=currency_rub.id)
 
@@ -285,5 +358,6 @@ async def test_autocomplete(sqlite_sessionmaker, language_context):
         ),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert autocomplete_result == schema.AutocompleteResult()

{brilliance_admin-0.44.6 → brilliance_admin-0.44.7}/tests/test_sqlalcmeny_filters.py

@@ -3,6 +3,7 @@ from datetime import datetime
 import pytest
 
 from brilliance_admin import auth, schema, sqlalchemy
+from brilliance_admin.schema import admin_schema
 from example.sections.models import Currency, CurrencyFactory, MerchantFactory, Terminal, TerminalFactory
 
 
@@ -33,6 +34,7 @@ async def test_list_filter(sqlite_sessionmaker, language_context):
         list_data=schema.ListData(filters={'id': terminal_1.id}),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(
         data=[{'id': terminal_1.id}], total_count=1
@@ -42,6 +44,7 @@ async def test_list_filter(sqlite_sessionmaker, language_context):
         list_data=schema.ListData(filters={'title': 'Test terminal second'}),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(
         data=[{'id': terminal_2.id}], total_count=1
@@ -51,6 +54,7 @@ async def test_list_filter(sqlite_sessionmaker, language_context):
         list_data=schema.ListData(filters={'title': 'Test%'}),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(
         data=[{'id': terminal_2.id}, {'id': terminal_1.id}], total_count=2
@@ -66,6 +70,7 @@ async def test_list_filter(sqlite_sessionmaker, language_context):
         list_data=schema.ListData(filters={'created_at': {'from': '2022-12-04T18:55:00', 'to': '2023-12-17T18:55:00'}}),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(
         data=[{'id': terminal_old.id}], total_count=1
@@ -96,6 +101,7 @@ async def test_list_search(sqlite_sessionmaker, language_context):
         list_data=schema.ListData(search='Test%'),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(
         data=[{'id': terminal_2.id}, {'id': terminal_1.id}], total_count=2,
@@ -133,6 +139,7 @@ async def test_filter_related_one(sqlite_sessionmaker, language_context):
         }),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(
         data=[{'id': currency_rub.id}], total_count=1
@@ -169,6 +176,7 @@ async def test_filter_related_many(sqlite_sessionmaker, language_context):
         }),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(data=[{'id': terminal_2.id}], total_count=1), 'Фильтр по related'
 
@@ -208,6 +216,7 @@ async def test_ordering(sqlite_sessionmaker, language_context):
         list_data=schema.ListData(ordering='id'),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(
         data=[{'id': terminal_1.id}, {'id': terminal_2.id, }], total_count=2
@@ -217,6 +226,7 @@ async def test_ordering(sqlite_sessionmaker, language_context):
         list_data=schema.ListData(ordering='-id'),
         user=user,
         language_context=language_context,
+        admin_schema=admin_schema,
     )
     assert list_result == schema.TableListResult(
         data=[{'id': terminal_2.id}, {'id': terminal_1.id, }], total_count=2