From 2493cd0d9fcf02b6a066043d5ac2a44bd6a60135 Mon Sep 17 00:00:00 2001 From: Vladislav Syrochkin Date: Wed, 2 Jul 2025 14:14:03 +0500 Subject: [PATCH] fix(api): fix shadows an attribute in parent in ListEvents for field schema --- api/api/db/logic/listevents.py | 4 ++-- api/api/schemas/endpoints/list_events.py | 4 ++-- api/api/schemas/events/list_events.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/api/db/logic/listevents.py b/api/api/db/logic/listevents.py index bdd03b2..3d9c245 100644 --- a/api/api/db/logic/listevents.py +++ b/api/api/db/logic/listevents.py @@ -29,7 +29,7 @@ async def get_listevents_page_by_creator_id(connection: AsyncConnection, creator list_events_table.c.title, list_events_table.c.creator_id, list_events_table.c.created_at, - list_events_table.c.schema, + list_events_table.c.schema_, list_events_table.c.state, list_events_table.c.status, ) @@ -162,7 +162,7 @@ async def create_listevents(connection: AsyncConnection, listevents: ListEvent, title=listevents.title, # добавлено поле title creator_id=creator_id, created_at=datetime.now(timezone.utc), - schema=listevents.schema, # добавлено поле schema + schema=listevents.schema_, # добавлено поле schema state=listevents.state.value, # добавлено поле state status=listevents.status.value # добавлено поле status ) diff --git a/api/api/schemas/endpoints/list_events.py b/api/api/schemas/endpoints/list_events.py index 0b85199..e0fd96a 100644 --- a/api/api/schemas/endpoints/list_events.py +++ b/api/api/schemas/endpoints/list_events.py @@ -13,7 +13,7 @@ class ListEventUpdate(Base): title: Optional[str] = Field(None, max_length=64) # creator_id: Optional[int] = None # created_at: Optional[datetime]= None - schema: Optional[Dict[str, Any]]= None + schema_: Optional[Dict[str, Any]]= Field(None, alias="schema") state: Optional[EventState]= None status: Optional[EventStatus]= None @@ -23,7 +23,7 @@ class AllListEvent(Base): title: str creator_id: int created_at: datetime - schema: Dict[str, Any] = Field(default={}) + schema_: Dict[str, Any] = Field(default={}, alias="schema") state: EventState status: EventStatus diff --git a/api/api/schemas/events/list_events.py b/api/api/schemas/events/list_events.py index d4d70d2..d5d79e4 100644 --- a/api/api/schemas/events/list_events.py +++ b/api/api/schemas/events/list_events.py @@ -12,6 +12,6 @@ class ListEvent(Base): title: str = Field(..., max_length=64) creator_id: int created_at: datetime - schema: Dict[str, Any] + schema_: Dict[str, Any] = Field(..., alias="schema") state: EventState status: EventStatus