From 7c81069e964144b380439614c90ec92c90687636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal.kvacek@performax.cz>
Date: Thu, 7 Mar 2024 07:07:33 +0100
Subject: [PATCH] Fix nacitani eventu

---
 src/database/query_builder.py                  | 1 -
 src/graphql_schema/entities/event.py           | 8 ++++----
 src/graphql_schema/entities/resolvers/event.py | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/database/query_builder.py b/src/database/query_builder.py
index 07da7df..84002c8 100644
--- a/src/database/query_builder.py
+++ b/src/database/query_builder.py
@@ -39,7 +39,6 @@ class QueryBuilder:
 
         others_filters = []
         if include_others_public:
-            # TODO: Toto jeste neni implementovane nikde v resolverech!
             if hasattr(self.model, "is_public"):
                 others_filters.append(self.model.is_public.is_(True))
 
diff --git a/src/graphql_schema/entities/event.py b/src/graphql_schema/entities/event.py
index 180c029..c26da60 100644
--- a/src/graphql_schema/entities/event.py
+++ b/src/graphql_schema/entities/event.py
@@ -25,10 +25,10 @@ class EventQueries:
         public: Optional[bool] = False,
     ) -> PaginationWindow[Event]:
         query = EventQueryResolver().get_query(
-            info.context.user_id,
+            user_id=info.context.user_id,
             username=username,
-            order_by=[models.Event.date_from.desc(), models.Event.id.desc()],
-            public=public
+            order_by=[models.Event.date_from.desc(), models.Event.name.desc()],
+            only_public=public,
         )
 
         return await get_pagination_window(
@@ -53,7 +53,7 @@ class EventQueries:
             filter_params['username'] = username
 
         return await EventQueryResolver().get_one(
-            public=public,
+            only_public=public,
             user_id=info.context.user_id,
             **filter_params
         )
diff --git a/src/graphql_schema/entities/resolvers/event.py b/src/graphql_schema/entities/resolvers/event.py
index 6b8a482..7485732 100644
--- a/src/graphql_schema/entities/resolvers/event.py
+++ b/src/graphql_schema/entities/resolvers/event.py
@@ -19,7 +19,7 @@ class EventQueryResolver(BaseQueryResolver):
     ):
         query = super().get_query(
             user_id, object_id,
-            order_by=[models.Event.date_from.desc()],
+            order_by=order_by,
             url_slug=kwargs.get("url_slug"),
             only_public=only_public,
             only_my=True