From 0df629142803355a6a2ae250ea0f01645b73041e Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Mon, 14 Oct 2024 18:03:51 +0200 Subject: [PATCH] add tags for event models --- app/models/events.py | 3 +++ app/routers/events.py | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/events.py b/app/models/events.py index 6c73337..0c32322 100644 --- a/app/models/events.py +++ b/app/models/events.py @@ -15,6 +15,7 @@ class Event(BaseModel): latitude: float = 0.0 longitude: float = 0.0 organizers: list[str] = [] + tags: list[str] = [] start_date: datetime | None = None end_date: datetime | None = None created_at: datetime = datetime.today() @@ -34,6 +35,7 @@ class EventOut(BaseModel): status: int = 0 start_date: datetime | None = None end_date: datetime | None = None + tags: list[str] = [] class EventIn(BaseModel): name: str @@ -45,6 +47,7 @@ class EventIn(BaseModel): imgUrl: str | None = None status: int = 0 organizers: list[str] = [] + tags: list[str] = [] start_date: datetime | None = None end_date: datetime | None = None latitude: float = 0.0 diff --git a/app/routers/events.py b/app/routers/events.py index 3f83520..1f9f3a9 100644 --- a/app/routers/events.py +++ b/app/routers/events.py @@ -35,7 +35,7 @@ async def read_events(authorize: Annotated[bool, Depends(permissions_checker.Per for event_index in event_repository.find_by(object_search, limit=limit, skip=skip): - event = events.EventOut(id=event_index.id, imgUrl=event_index.imgUrl, name=event_index.name, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date) + event = events.EventOut(id=event_index.id, tags=event_index.tags, imgUrl=event_index.imgUrl, name=event_index.name, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date) listEvents.append(event) return listEvents @@ -46,7 +46,7 @@ async def read_users_me(current_user: Annotated[users.User, Depends(users_token. listOrganizers = [] 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, imgUrl=event_index.imgUrl, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date) + event = events.EventOut(id=event_index.id, name=event_index.name, tags=event_index.tags, imgUrl=event_index.imgUrl, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date) listOrganizers.append(event) content = {"organizers":listOrganizers} @@ -135,6 +135,7 @@ async def update_events_me(item_id: str, current_user: Annotated[users.User, Dep event.city = eventSingle.city event.country = eventSingle.country event.start_date = eventSingle.start_date + event.tags = eventSingle.tags event.end_date = eventSingle.end_date event.latitude = eventSingle.latitude event.longitude = eventSingle.longitude @@ -169,6 +170,7 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P event.latitude = eventSingle.latitude event.longitude = eventSingle.longitude event.imgUrl = eventSingle.imgUrl + event.tags = eventSingle.tags event.created_at = datetime.today() event_repository.save(event) content = {"message": "event is created"} @@ -201,6 +203,7 @@ async def update_events_id(item_id: str, authorize: Annotated[bool, Depends(perm event.start_date = eventSingle.start_date event.end_date = eventSingle.end_date event.organizers = eventSingle.organizers + event.tags = eventSingle.tags event.latitude = eventSingle.latitude event.longitude = eventSingle.longitude event.updated_at = datetime.today()