From e7e4326a316d4ae12fffaa0beaa87dc097542b20 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Tue, 14 Nov 2023 00:21:15 +0100 Subject: [PATCH] remove participants and interested --- app/models/events.py | 2 -- app/routers/events.py | 14 ++------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/models/events.py b/app/models/events.py index f788e08..d8b14cd 100644 --- a/app/models/events.py +++ b/app/models/events.py @@ -7,9 +7,7 @@ class Event(BaseModel): name: str place: str status: int = 0 - participants: list[str] = [] organizers: list[str] = [] - interested: list[str] = [] start_date: datetime | None = None end_date: datetime | None = None created_at: datetime = datetime.today() diff --git a/app/routers/events.py b/app/routers/events.py index 60f5be2..451467c 100644 --- a/app/routers/events.py +++ b/app/routers/events.py @@ -44,22 +44,12 @@ async def read_events(authorize: Annotated[bool, Depends(permissions_checker.Per async def read_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))]): event_repository = events.EventRepository(database=database.database) listOrganizers = [] - listParticipants = [] - listInterested = [] - for event_index in event_repository.find_by({"organizers":{"$eq": current_user.id}}, limit=limit, skip=skip): + for event_index in event_repository.find_by({"organizers":{"$eq": current_user.username}}, limit=limit, skip=skip): event = events.EventOut(id=event_index.id, name=event_index.name, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date) listOrganizers.append(event) - - for event_index in event_repository.find_by({"participants":{"$eq": current_user.id}}, limit=limit, skip=skip): - event = events.EventOut(id=event_index.id, name=event_index.name, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date) - listParticipants.append(event) - for event_index in event_repository.find_by({"interested":{"$eq": current_user.id}}, limit=limit, skip=skip): - event = events.EventOut(id=event_index.id, name=event_index.name, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date) - listInterested.append(event) - - content = {"participants":listParticipants, "organizers":listOrganizers, "interested":listInterested} + content = {"organizers":listOrganizers} response = JSONResponse(content=content) return response