From 65f8baa5a450f863ded95426ed5bf24362722fd6 Mon Sep 17 00:00:00 2001 From: vsdudakov Date: Fri, 2 Aug 2024 20:55:19 +0300 Subject: [PATCH] Fix --- fastadmin/models/orms/ponyorm.py | 1 + tests/api/test_add.py | 6 ++++-- tests/api/test_change.py | 6 ++++-- tests/api/test_retrieve.py | 7 +++++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/fastadmin/models/orms/ponyorm.py b/fastadmin/models/orms/ponyorm.py index 507031f..56e6299 100644 --- a/fastadmin/models/orms/ponyorm.py +++ b/fastadmin/models/orms/ponyorm.py @@ -233,6 +233,7 @@ def orm_get_list( :return: A tuple of list of objects and total count. """ + # import pdb; pdb.set_trace() qs = select(m for m in self.model_cls) if filters: for field_with_condition, value in filters.items(): diff --git a/tests/api/test_add.py b/tests/api/test_add.py index 07463fc..6f243d8 100644 --- a/tests/api/test_add.py +++ b/tests/api/test_add.py @@ -1,3 +1,5 @@ +import datetime + from fastadmin.models.base import ModelAdmin from fastadmin.models.helpers import get_admin_model from fastadmin.models.schemas import ModelFieldWidgetSchema @@ -36,8 +38,8 @@ async def test_add(session_id, admin_models, event, client): updated_event = await event_admin_model.get_obj(item["id"]) assert item["name"] == "new name" assert item["tournament"] == tournament["id"] - assert item["created_at"] == updated_event["created_at"].isoformat() - assert item["updated_at"] == updated_event["updated_at"].isoformat() + assert datetime.datetime.fromisoformat(item["created_at"]) == updated_event["created_at"] + assert datetime.datetime.fromisoformat(item["updated_at"]) == updated_event["updated_at"] assert item["participants"] == [participant["id"]] r = await client.delete(f"/api/delete/{event.get_model_name()}/{item['id']}") assert r.status_code == 200, r.text diff --git a/tests/api/test_change.py b/tests/api/test_change.py index 013e577..d4b19c1 100644 --- a/tests/api/test_change.py +++ b/tests/api/test_change.py @@ -1,3 +1,5 @@ +import datetime + from fastadmin.models.base import ModelAdmin from fastadmin.models.helpers import get_admin_model from fastadmin.models.schemas import ModelFieldWidgetSchema @@ -30,8 +32,8 @@ async def test_change(session_id, admin_models, event, client): assert item["id"] == updated_event["id"] assert item["name"] == updated_event["name"] assert item["tournament"] == updated_event["tournament"] - assert item["created_at"] == updated_event["created_at"].isoformat() - assert item["updated_at"] == updated_event["updated_at"].isoformat() + assert datetime.datetime.fromisoformat(item["created_at"]) == updated_event["created_at"] + assert datetime.datetime.fromisoformat(item["updated_at"]) == updated_event["updated_at"] assert item["participants"] == [participant["id"]] r = await client.delete(f"/api/delete/{participants_model}/{participant['id']}") diff --git a/tests/api/test_retrieve.py b/tests/api/test_retrieve.py index 290e71d..511c342 100644 --- a/tests/api/test_retrieve.py +++ b/tests/api/test_retrieve.py @@ -1,3 +1,6 @@ +import datetime + + async def test_retrieve(session_id, admin_models, event, client): assert session_id event_admin_model = admin_models[event.__class__] @@ -11,8 +14,8 @@ async def test_retrieve(session_id, admin_models, event, client): assert item["id"] == updated_event["id"] assert item["name"] == updated_event["name"] assert item["tournament"] == updated_event["tournament"] - assert item["created_at"] == updated_event["created_at"].isoformat() - assert item["updated_at"] == updated_event["updated_at"].isoformat() + assert datetime.datetime.fromisoformat(item["created_at"]) == updated_event["created_at"] + assert datetime.datetime.fromisoformat(item["updated_at"]) == updated_event["updated_at"] assert "participants" in item assert item["participants"] assert item["participants"][0] == updated_event["participants"][0]