diff --git a/app/models/events.py b/app/models/events.py index 6463a48..1b44ef2 100644 --- a/app/models/events.py +++ b/app/models/events.py @@ -11,6 +11,8 @@ class Event(BaseModel): status: int = 0 latitude: float = 0.0 longitude: float = 0.0 + link: str | None = None + ticket: str | None = None organizers: list[str] = [] tags: list[str] = [] start_date: datetime | None = None @@ -26,6 +28,8 @@ class EventOut(BaseModel): place: str description: str imgUrl: str | None = None + link: str | None = None + ticket: str | None = None status: int = 0 start_date: datetime | None = None end_date: datetime | None = None @@ -39,6 +43,8 @@ class EventIn(BaseModel): status: int = 0 organizers: list[str] = [] tags: list[str] = [] + link: str | None = None + ticket: str | None = None 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 9899f38..6f94e7d 100644 --- a/app/routers/events.py +++ b/app/routers/events.py @@ -137,6 +137,8 @@ async def read_events( status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date, + ticket=event_index.ticket, + link=event_index.link ) list_events.append(event) @@ -211,6 +213,8 @@ async def search_events( status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date, + link=event_index.link, + ticket=event_index.ticket ) list_events.append(event) @@ -224,7 +228,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, tags=event_index.tags, imgUrl=event_index.imgUrl, description=event_index.description, place=event_index.place, 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, ticket=event_index.ticket, link=event_index.link, tags=event_index.tags, imgUrl=event_index.imgUrl, description=event_index.description, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date) listOrganizers.append(event) content = {"organizers":listOrganizers} @@ -314,6 +318,8 @@ async def update_events_me(item_id: str, current_user: Annotated[users.User, Dep event.end_date = eventSingle.end_date event.latitude = eventSingle.latitude event.longitude = eventSingle.longitude + event.link = eventSingle.link + event.ticket = eventSingle.ticket event.updated_at = datetime.today() event.imgUrl = eventSingle.imgUrl event_repository.save(event) @@ -349,6 +355,8 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P event.latitude = eventSingle.latitude event.longitude = eventSingle.longitude event.imgUrl = eventSingle.imgUrl + event.link = eventSingle.link + event.ticket = eventSingle.ticket event.tags = eventSingle.tags for tag_name in eventSingle.tags: tag = tags_repository.find_one_by({"name": {'$eq': tag_name}}) @@ -358,7 +366,7 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P event.status = 1 event.created_at = datetime.today() event_repository.save(event) - content = {"message": "event is created"} + content = {"message": "event created"} response = JSONResponse(content=content, status_code=status.HTTP_201_CREATED) return response @@ -385,6 +393,8 @@ 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.link = eventSingle.link + event.ticket = eventSingle.ticket event.tags = eventSingle.tags for tag_name in eventSingle: tag = tags_repository.find_one_by({"name": {'$eq': tag_name}})