diff --git a/Dockerfile b/Dockerfile index 99567b2..67166bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apk update && \ apk add --no-cache tzdata mariadb-client mariadb-dev && \ pip install --upgrade pip - # protoze xfs uzivatel ma id=33 +# protoze xfs uzivatel ma id=33 RUN deluser xfs # uzivatel www-data v alpine neexistuje @@ -34,4 +34,4 @@ COPY . /app WORKDIR /app -CMD ["uvicorn", "src.asgi:app", "--reload", "--reload-dir=/app", "--port=8000", "--host=0.0.0.0", "--log-level=debug"] \ No newline at end of file +CMD ["uvicorn", "src.asgi:app", "--reload", "--reload-dir=/app", "--port=8000", "--host=0.0.0.0", "--log-level=debug"] diff --git a/src/endpoints/graphql.py b/src/endpoints/graphql.py index 6922050..2f71e87 100644 --- a/src/endpoints/graphql.py +++ b/src/endpoints/graphql.py @@ -17,7 +17,7 @@ def setup_graphql_endpoint(app: FastAPI, access_security: JwtAccessBearerCookie) @debug_router.get("/graphql/autologin") async def autologin(): - access_token = access_security.create_access_token(subject={"id": 7, "name": "Franta Vomacka"}) + access_token = access_security.create_access_token(subject={"id": 6, "name": "Franta Vomacka"}) response = RedirectResponse(url="/graphql") access_security.set_access_cookie(response, access_token, expires_delta=timedelta(days=14)) diff --git a/src/external/gpx_parser.py b/src/external/gpx_parser.py index 7bbc06e..328014b 100644 --- a/src/external/gpx_parser.py +++ b/src/external/gpx_parser.py @@ -29,7 +29,6 @@ class GPXParser: sampled_data = defaultdict(list) for time, item in indexed_data.items(): key = self.get_timestamp_key(time) - print("item", time, key, item) sampled_data[key].append(item) return sampled_data diff --git a/src/graphql_schema/entities/event.py b/src/graphql_schema/entities/event.py index 71000d8..180c029 100644 --- a/src/graphql_schema/entities/event.py +++ b/src/graphql_schema/entities/event.py @@ -52,8 +52,6 @@ class EventQueries: if username: filter_params['username'] = username - print("FILTR", filter_params) - return await EventQueryResolver().get_one( public=public, user_id=info.context.user_id, diff --git a/src/graphql_schema/entities/types/types.py b/src/graphql_schema/entities/types/types.py index 43f19d1..8e1ed7c 100644 --- a/src/graphql_schema/entities/types/types.py +++ b/src/graphql_schema/entities/types/types.py @@ -204,9 +204,13 @@ class User: @strawberry_sqlalchemy_type(models.Event) class Event: - async def load_flights(root, info): + async def load_flights(root, info, only_public: Optional[bool] = False): is_user_logged_in = bool(info.context.user_id) - dataloader = flights_by_event_dataloader if is_user_logged_in else public_flights_by_event_dataloader + if not is_user_logged_in or only_public: + dataloader = public_flights_by_event_dataloader + else: + dataloader = flights_by_event_dataloader + # dataloader = flights_by_event_dataloader if is_user_logged_in else public_flights_by_event_dataloader return await dataloader.load(root.id) flights: List[Flight] = strawberry.field(resolver=load_flights)