From 66d98775520d952a4391c12b81944cdc9786739e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Mon, 25 Mar 2024 19:14:03 +0100 Subject: [PATCH 1/3] Fix nacitani detailu letadla --- src/graphql_schema/entities/resolvers/aircraft.py | 3 +-- src/graphql_schema/entities/resolvers/base.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/graphql_schema/entities/resolvers/aircraft.py b/src/graphql_schema/entities/resolvers/aircraft.py index d3fcbe7..80fb56e 100644 --- a/src/graphql_schema/entities/resolvers/aircraft.py +++ b/src/graphql_schema/entities/resolvers/aircraft.py @@ -26,8 +26,6 @@ class AircraftQueryResolver(BaseQueryResolver): ): filters = [] search = {} - if object_id: - filters.append(models.Aircraft.id == object_id) if not organization_ids: filters.append(models.Aircraft.created_by_id == user_id) if kwargs.get("call_sign"): @@ -37,6 +35,7 @@ class AircraftQueryResolver(BaseQueryResolver): search['search'] = kwargs.pop("search", None) query = super().get_query( + object_id=object_id, only_my=False, only_public=kwargs.get("only_public", False), order_by=order_by, diff --git a/src/graphql_schema/entities/resolvers/base.py b/src/graphql_schema/entities/resolvers/base.py index 3b045d6..bcece7b 100644 --- a/src/graphql_schema/entities/resolvers/base.py +++ b/src/graphql_schema/entities/resolvers/base.py @@ -58,7 +58,7 @@ class BaseQueryResolver(BaseResolver): query = self._handle_search(query, kwargs.pop("search", None)) if filters: - query = query.filter(**kwargs) + query = query.filter(*kwargs) return query From fd0aef83b1388730b82ac947201f92003d47675b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Mon, 25 Mar 2024 22:35:11 +0100 Subject: [PATCH 2/3] fix nacitani fotek na verejne casti --- src/graphql_schema/entities/resolvers/base.py | 2 +- src/graphql_schema/entities/resolvers/photo.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/graphql_schema/entities/resolvers/base.py b/src/graphql_schema/entities/resolvers/base.py index bcece7b..2a98b91 100644 --- a/src/graphql_schema/entities/resolvers/base.py +++ b/src/graphql_schema/entities/resolvers/base.py @@ -58,7 +58,7 @@ class BaseQueryResolver(BaseResolver): query = self._handle_search(query, kwargs.pop("search", None)) if filters: - query = query.filter(*kwargs) + query = query.filter(*filters) return query diff --git a/src/graphql_schema/entities/resolvers/photo.py b/src/graphql_schema/entities/resolvers/photo.py index 536c122..e9f097f 100644 --- a/src/graphql_schema/entities/resolvers/photo.py +++ b/src/graphql_schema/entities/resolvers/photo.py @@ -32,14 +32,13 @@ class PhotoQueryResolver(BaseQueryResolver): only_public: Optional[bool] = False, *args, **kwargs ): - query = super().get_query( user_id, object_id, order_by, - **{ - field: kwargs[field] + filters=[ + getattr(self.model, field) == kwargs[field] for field in ("aircraft_id", "point_of_interest_id", "flight_id") if kwargs.get(field) - } + ] ) if kwargs.get("public"): From ffb8d07ebe493bc1ca07c983f236c4a572174294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Fri, 29 Mar 2024 10:40:52 +0100 Subject: [PATCH 3/3] fix nacitani letadla podle volacky --- src/graphql_schema/entities/resolvers/aircraft.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graphql_schema/entities/resolvers/aircraft.py b/src/graphql_schema/entities/resolvers/aircraft.py index 80fb56e..0192c86 100644 --- a/src/graphql_schema/entities/resolvers/aircraft.py +++ b/src/graphql_schema/entities/resolvers/aircraft.py @@ -26,8 +26,6 @@ class AircraftQueryResolver(BaseQueryResolver): ): filters = [] search = {} - if not organization_ids: - filters.append(models.Aircraft.created_by_id == user_id) if kwargs.get("call_sign"): filters.append(models.Aircraft.call_sign == kwargs['call_sign']) @@ -54,6 +52,8 @@ class AircraftQueryResolver(BaseQueryResolver): ) ) ) + elif user_id: + filters.append(models.Aircraft.created_by_id == user_id) return query