From 4a4be39ad360978e01b4371104fef0898bd39535 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sun, 17 Aug 2025 14:47:17 +0200 Subject: [PATCH] add endpoint toogle interested + add data interested for events --- app/models/events.py | 32 ++++++++++++++++++++++---------- app/routers/events.py | 42 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/app/models/events.py b/app/models/events.py index 1b44ef2..be3183b 100644 --- a/app/models/events.py +++ b/app/models/events.py @@ -1,26 +1,34 @@ from pydantic import BaseModel, EmailStr from pydantic_mongo import AbstractRepository, ObjectIdField from datetime import datetime, date +from bson import ObjectId +from typing import List, Optional class Event(BaseModel): id: ObjectIdField = None name: str place: str description: str - imgUrl: str | None = None + imgUrl: Optional[str] = None 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 - end_date: datetime | None = None + link: Optional[str] = None + ticket: Optional[str] = None + organizers: List[str] = [] + tags: List[str] = [] + start_date: Optional[datetime] = None + end_date: Optional[datetime] = None created_at: datetime = datetime.today() - updated_at: datetime | None = None - deleted_at: datetime | None = None - disabled_at: datetime | None = None + updated_at: Optional[datetime] = None + deleted_at: Optional[datetime] = None + disabled_at: Optional[datetime] = None + interested_users: List[ObjectId] = [] + + model_config = { + "arbitrary_types_allowed": True + } + class EventOut(BaseModel): id: ObjectIdField = None @@ -35,6 +43,10 @@ class EventOut(BaseModel): end_date: datetime | None = None tags: list[str] = [] +class EventOutWithInterested(EventOut): + interested: bool = False + interested_count: int = 0 + class EventIn(BaseModel): name: str place: str diff --git a/app/routers/events.py b/app/routers/events.py index 6f94e7d..a6c14c0 100644 --- a/app/routers/events.py +++ b/app/routers/events.py @@ -66,6 +66,7 @@ def build_text_filter(item): @router.get("/events", tags=["events"], response_model=list[events.EventOut]) async def read_events( authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], + user: users.User = Depends(users_token.get_current_user), # 👈 récupère l’utilisateur courant skip: int = 0, limit: int = 20, id_event: str | None = None, @@ -127,7 +128,9 @@ async def read_events( event_repository = events.EventRepository(database=database.database) list_events = [] for event_index in event_repository.find_by(object_search, limit=limit, skip=skip, sort=[("start_date", 1)]): - event = events.EventOut( + interested_users = getattr(event_index, "interested_users", []) + is_interested = ObjectId(user.id) in interested_users + event = events.EventOutWithInterested( id=event_index.id, tags=event_index.tags, imgUrl=event_index.imgUrl, @@ -138,7 +141,9 @@ async def read_events( start_date=event_index.start_date, end_date=event_index.end_date, ticket=event_index.ticket, - link=event_index.link + link=event_index.link, + interested=is_interested, + interested_count=len(interested_users) ) list_events.append(event) @@ -148,6 +153,7 @@ async def read_events( @router.get("/events/search", tags=["events"], response_model=list[events.EventOut]) async def search_events( authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], + user: users.User = Depends(users_token.get_current_user), # 👈 récupère l’utilisateur courant skip: int = 0, limit: int = 20, item: Union[str, None] = None, @@ -203,7 +209,9 @@ async def search_events( event_repository = events.EventRepository(database=database.database) list_events = [] for event_index in event_repository.find_by(object_search, limit=limit, skip=skip, sort=[("start_date", 1)]): - event = events.EventOut( + interested_users = getattr(event_index, "interested_users", []) + is_interested = ObjectId(user.id) in interested_users + event = events.EventOutWithInterested( id=event_index.id, tags=event_index.tags, imgUrl=event_index.imgUrl, @@ -214,7 +222,9 @@ async def search_events( start_date=event_index.start_date, end_date=event_index.end_date, link=event_index.link, - ticket=event_index.ticket + ticket=event_index.ticket, + interested=is_interested, + interested_count=len(interested_users) ) list_events.append(event) @@ -442,4 +452,26 @@ async def patch_events_id(item_id : str, authorize: Annotated[bool, Depends(perm event_repository.save(event) content = {"message": "event is enabled"} response = JSONResponse(content=content) - return response \ No newline at end of file + return response + +@router.post("/events/{event_id}/interest", tags=["events"]) +async def toggle_interest(event_id: str, user: users.User = Depends(users_token.get_current_user)): + event_repository = events.EventRepository(database=database.database) + event = event_repository.get(ObjectId(event_id)) + + if not event: + raise HTTPException(status_code=404, detail="Event not found") + + interested_users = getattr(event, "interested_users", []) + user_obj_id = ObjectId(user.id) + + if user_obj_id in interested_users: + # Retirer l’utilisateur + interested_users.remove(user_obj_id) + else: + # Ajouter l’utilisateur + interested_users.append(user_obj_id) + + event_repository.update({"_id": ObjectId(event_id)}, {"$set": {"interested_users": interested_users}}) + + return {"event_id": event_id, "interested": user_obj_id in interested_users, "interested_count": len(interested_users)} -- 2.49.1