From 028adb6160dbdfd5ad33838d5526b70b89914879 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 4 Sep 2025 21:38:50 +0200 Subject: [PATCH 1/2] fix repsponse eventOut --- app/models/events.py | 19 ++++++++++++++++- app/routers/events.py | 49 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/app/models/events.py b/app/models/events.py index 1b44ef2..1d49575 100644 --- a/app/models/events.py +++ b/app/models/events.py @@ -23,7 +23,7 @@ class Event(BaseModel): disabled_at: datetime | None = None class EventOut(BaseModel): - id: ObjectIdField = None + id: str | None = None name: str place: str description: str @@ -35,6 +35,23 @@ class EventOut(BaseModel): end_date: datetime | None = None tags: list[str] = [] + @classmethod + def from_mongo(cls, event: Event) -> "EventOut": + return cls( + id=str(event.id) if event.id else None, + name=event.name, + place=event.place, + description=event.description, + imgUrl=event.imgUrl, + link=event.link, + ticket=event.ticket, + status=event.status, + start_date=event.start_date, + end_date=event.end_date, + tags=event.tags, + ) + + class EventIn(BaseModel): name: str place: str diff --git a/app/routers/events.py b/app/routers/events.py index 6f94e7d..2833e3c 100644 --- a/app/routers/events.py +++ b/app/routers/events.py @@ -63,9 +63,10 @@ def build_text_filter(item): -@router.get("/events", tags=["events"], response_model=list[events.EventOut]) +@router.get("/events", tags=["events"], response_model=list[events.EventOutWithInterested]) 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 = 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,16 +141,19 @@ 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) return list_events -@router.get("/events/search", tags=["events"], response_model=list[events.EventOut]) +@router.get("/events/search", tags=["events"], response_model=list[events.EventOutWithInterested]) 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 = 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) @@ -243,7 +253,7 @@ async def read_events_count(authorize: Annotated[bool, Depends(permissions_check return response -@router.get("/events/{item_id}", tags=["events"], response_model=events.Event) +@router.get("/events/{item_id}", tags=["events"], response_model=events.EventOut) async def read_events_id(item_id : str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))]): event_repository = events.EventRepository(database=database.database) event = event_repository.find_one_by_id(ObjectId(item_id)) @@ -442,4 +452,27 @@ 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.find_one_by_id(ObjectId(event_id)) + + if not event: + raise HTTPException(status_code=404, detail="Event not found") + + interested_users = 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.interested_users = interested_users + + event_repository.save(event) + + return {"event_id": event_id, "interested": user_obj_id in interested_users, "interested_count": len(interested_users)} -- 2.49.1 From d57268f2cec4d858a8b4a8a9f5da18cb982f5a84 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 4 Sep 2025 21:53:31 +0200 Subject: [PATCH 2/2] fix model eventout with str --- app/models/events.py | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/app/models/events.py b/app/models/events.py index 1d49575..b097cf2 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: str | None = None @@ -52,6 +60,10 @@ class EventOut(BaseModel): ) +class EventOutWithInterested(EventOut): + interested: bool = False + interested_count: int = 0 + class EventIn(BaseModel): name: str place: str -- 2.49.1