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