Compare commits

...

13 Commits

Author SHA1 Message Date
cb45728e42 Merge pull request 'rollback models' (#70) from hotfix/rollback-events into master
Reviewed-on: #70
2025-09-04 20:24:24 +00:00
3ada43de72 rollback models 2025-09-04 22:23:49 +02:00
e9fd923144 Merge pull request 'fix reponse model' (#69) from hotfix/fix-endpoint-events-get into master
Reviewed-on: #69
2025-09-04 20:06:59 +00:00
745783ffc3 fix reponse model 2025-09-04 22:05:54 +02:00
7527a3c8c6 Merge pull request 'fix response model' (#67) from feature/interested-events into master
Reviewed-on: #67
2025-08-20 20:44:47 +00:00
ac54e163c7 fix response model 2025-08-20 22:44:03 +02:00
45d4ac30bd Merge pull request 'add interested event' (#66) from feature/interested-events into master
Reviewed-on: #66
2025-08-20 20:33:34 +00:00
5f24657956 add interested event 2025-08-20 22:27:30 +02:00
46b1f80b53 Merge pull request 'feature/interested-events' (#65) from feature/interested-events into master
Reviewed-on: #65
2025-08-18 21:59:48 +00:00
e5510cc390 add list interested 2025-08-18 23:59:05 +02:00
1470d8976e fix save event interested 2025-08-18 23:57:05 +02:00
5e462861e2 Merge pull request 'fix event interested' (#64) from feature/interested-events into master
Reviewed-on: #64
2025-08-18 21:48:32 +00:00
bf47256519 fix event interested 2025-08-18 23:46:56 +02:00

View File

@@ -63,7 +63,7 @@ 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 lutilisateur courant
@@ -128,7 +128,7 @@ 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)]):
interested_users = getattr(event_index, "interested_users", [])
interested_users = event_index.interested_users
is_interested = ObjectId(user.id) in interested_users
event = events.EventOutWithInterested(
id=event_index.id,
@@ -150,7 +150,7 @@ async def read_events(
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 lutilisateur courant
@@ -209,7 +209,7 @@ 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)]):
interested_users = getattr(event_index, "interested_users", [])
interested_users = event_index.interested_users
is_interested = ObjectId(user.id) in interested_users
event = events.EventOutWithInterested(
id=event_index.id,
@@ -253,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))
@@ -457,12 +457,12 @@ async def patch_events_id(item_id : str, authorize: Annotated[bool, Depends(perm
@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))
event = event_repository.find_one_by_id(ObjectId(event_id))
if not event:
raise HTTPException(status_code=404, detail="Event not found")
interested_users = getattr(event, "interested_users", [])
interested_users = event.interested_users
user_obj_id = ObjectId(user.id)
if user_obj_id in interested_users:
@@ -471,7 +471,8 @@ async def toggle_interest(event_id: str, user: users.User = Depends(users_token.
else:
# Ajouter lutilisateur
interested_users.append(user_obj_id)
event.interested_users = interested_users
event_repository.update({"_id": ObjectId(event_id)}, {"$set": {"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)}