From 22a28ae70e855adbe2fd8d1ce1df2537b62318e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Mon, 25 Sep 2023 06:26:16 +0200 Subject: [PATCH] Uprava razeni letu --- src/database/models.py | 4 ++-- src/graphql_schema/dataloaders/flight.py | 1 + src/graphql_schema/entities/event.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/database/models.py b/src/database/models.py index 3e061ec..21dc840 100644 --- a/src/database/models.py +++ b/src/database/models.py @@ -215,8 +215,8 @@ class Event(BaseModel): id: Mapped[int] = mapped_column(primary_key=True) name: Mapped[str] = mapped_column(String(128), nullable=False) description: Mapped[str] = mapped_column(Text, nullable=False) - event_from: Mapped[datetime] = mapped_column(DateTime, nullable=True) - event_to: Mapped[datetime] = mapped_column(DateTime, nullable=True) + date_from: Mapped[datetime] = mapped_column(DateTime, nullable=True) + date_to: Mapped[datetime] = mapped_column(DateTime, nullable=True) organization_id: Mapped[int] = mapped_column(Integer, ForeignKey('organization.id'), nullable=True) is_public: Mapped[bool] = mapped_column(Boolean, server_default='0') created_by_id: Mapped[int] = mapped_column(Integer, ForeignKey('user.id')) diff --git a/src/graphql_schema/dataloaders/flight.py b/src/graphql_schema/dataloaders/flight.py index fe17fe1..76441b2 100644 --- a/src/graphql_schema/dataloaders/flight.py +++ b/src/graphql_schema/dataloaders/flight.py @@ -20,6 +20,7 @@ class FlightsLoader: query = ( select(Flight, rel_column) .filter(rel_column.in_(ids)) + .order_by(Flight.takeoff_datetime.desc()) ) for table in self.extra_join: diff --git a/src/graphql_schema/entities/event.py b/src/graphql_schema/entities/event.py index 13d3cd9..fa80686 100644 --- a/src/graphql_schema/entities/event.py +++ b/src/graphql_schema/entities/event.py @@ -24,7 +24,7 @@ def get_base_query(user_id: int): select(models.Event) .filter(models.Event.created_by_id == user_id) .filter(models.Event.deleted.is_(False)) - .order_by(models.Event.name) + .order_by(models.Event.date_from.desc(), models.Event.id.desc()) )