change delete method events

app/models/events.py

@@ -7,9 +7,9 @@ class Event(BaseModel):
     name: str
     place: str
     status: int = 0
-    participants: list[str] | None = None
-    organizers: list[str] | None = None
-    interested: list[str] | None = None
+    participants: list[str] = []
+    organizers: list[str] = []
+    interested: list[str] = []
     start_date: datetime | None = None
     end_date: datetime | None = None
     created_at: datetime = datetime.today()
@@ -22,20 +22,24 @@ class EventOut(BaseModel):
     name: str
     place: str
     status: int = 0
-    participants: list[str] | None = None
-    organizers: list[str] | None = None
-    interested: list[str] | None = None
+    participants: list[str] = []
+    organizers: list[str] = []
+    interested: list[str] = []
     start_date: datetime | None = None
+    end_date: datetime | None = None
 
 class EventIn(BaseModel):
     name: str
     place: str
     status: int = 0
-    participants: list[str] | None = None
-    organizers: list[str] | None = None
-    interested: list[str] | None = None
+    participants: list[str] = []
+    organizers: list[str] = []
+    interested: list[str] = []
     start_date: datetime | None = None
+    end_date: datetime | None = None
 
+class EventIDS(BaseModel):
+    ids: list[str]
 
 
 class EventRepository(AbstractRepository[Event]):

app/routers/events.py

@@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, HTTPException, status, Response
 from fastapi.responses import JSONResponse
 from datetime import datetime
 from ..dependencies import users_token, permissions_checker, database
-from ..models import events
+from ..models import events, users
 from pydantic import EmailStr
 from typing import Annotated
 from bson import ObjectId
@@ -35,88 +35,107 @@ 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 = users.UserOut(id=event_index.id, name=event_index.name, 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, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
         listEvents.append(event)
     return listEvents
 
 
-@router.get("/users/me",tags=["users"], response_model=users.User, response_model_exclude=["id", "password", "roles", "status"])
+@router.get("/events/me",tags=["events"])
 async def read_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))]):
-        return current_user
+    event_repository = events.EventRepository(database=database.database)
+    listOrganizers = []
+    listParticipants = []
+    listInterested = []
 
-@router.get("/users/count", tags=["users"])
-async def read_users_count(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))]):
-    count = database.database.get_collection("users").estimated_document_count()
+    for event_index in event_repository.find_by({"organizers":{"$eq": current_user.id}}, limit=limit, skip=skip):
+        event = events.EventOut(id=event_index.id, name=event_index.name, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
+        listOrganizers.append(event)
+    
+    for event_index in event_repository.find_by({"participants":{"$eq": current_user.id}}, limit=limit, skip=skip):
+        event = events.EventOut(id=event_index.id, name=event_index.name, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
+        listParticipants.append(event)
+
+    for event_index in event_repository.find_by({"interested":{"$eq": current_user.id}}, limit=limit, skip=skip):
+        event = events.EventOut(id=event_index.id, name=event_index.name, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
+        listInterested.append(event)
+
+    content = {"participants":listParticipants, "organizers":listOrganizers, "interested":listInterested}
+    response = JSONResponse(content=content)
+    return response
+
+@router.get("/events/count", tags=["events"])
+async def read_events_count(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))]):
+    count = database.database.get_collection("events").estimated_document_count()
     content = {"count":count}
     response = JSONResponse(content=content)
     return response
 
 
-@router.get("/users/{item_id}", tags=["users"], response_model=users.User)
-async def read_users_id(item_id : str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))]):
-    user_repository = users.UserRepository(database=database.database)
-    user = user_repository.find_one_by_id(ObjectId(item_id))
-    return user
+@router.get("/events/{item_id}", tags=["events"], response_model=events.Event)
+async def read_events_id(item_id : str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))]):
+    event_repository = event.EventRepository(database=database.database)
+    event = event_repository.find_one_by_id(ObjectId(item_id))
+    return event
 
 
-@router.delete("/users/me",tags=["users"])
-async def delete_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], remove: bool = False):
-    user_repository = users.UserRepository(database=database.database)
-    
+@router.delete("/events/me/{item_id}", tags=["events"])
+async def delete_event_me(item_id: str, current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], remove: bool = False):
+    event_repository = event.EventRepository(database=database.database)
+    event = event_repository.find_one_by_id(ObjectId(item_id))
     if remove is True:
-        current_user.deleted_at = datetime.today()
-        current_user.status = -1
-        content = {"message": "users are deleted"}
+        event.deleted_at = datetime.today()
+        event.status = -1
+        content = {"message": "event is deleted"}
     else:
-        current_user.status = 0
-        current_user.deleted_at = datetime.today()
-        content = {"message": "users are disabled"}
-    user_repository.save(current_user)
+        event.status = 0
+        event.deleted_at = datetime.today()
+        content = {"message": "event is disabled"}
+    event_repository.save(event)
     response = JSONResponse(content=content)
     return response
 
-@router.delete("/users/groups",tags=["users"])
-async def delete_users_groups(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], remove: bool = False, userids: users.UserIDS | None = None):
-    if len(userids.ids) == 0:
+@router.delete("/events/groups",tags=["events"])
+async def delete_events_groups(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], remove: bool = False, eventids: events.EventIDS | None = None):
+    if len(eventids.ids) == 0:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="userids should be greater than 0"
+            detail="eventids should be greater than 0"
         )
     
-    user_repository = users.UserRepository(database=database.database)
-    for i in userids.ids:
-        user = user_repository.find_one_by_id(ObjectId(i))
+    event_repository = event.EventRepository(database=database.database)
+    for i in eventids.ids:
+        event = event_repository.find_one_by_id(ObjectId(i))
         if remove is True:
-            user.status = -1
-            user.deleted_at = datetime.today()
-            content = {"message": "users are deleted "}
+            event.status = -1
+            event.deleted_at = datetime.today()
+            content = {"message": "events are deleted "}
         else:
-            user.status = 0
-            user.disabled_at = datetime.today()
-            content = {"message": "users are disabled"}
-        user_repository.save(user)
+            event.status = 0
+            event.disabled_at = datetime.today()
+            content = {"message": "events are disabled"}
+        event_repository.save(event)
     
     response = JSONResponse(content=content)
     return response
 
-@router.delete("/users/{item_id}", tags=["users"])
-async def delete_users_id(item_id : str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], remove : bool = False):
-    user_repository = users.UserRepository(database=database.database)
-    user = user_repository.find_one_by_id(ObjectId(item_id))
+@router.delete("/events/{item_id}", tags=["events"])
+async def delete_events_id(item_id : str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], remove : bool = False):
+    event_repository = event.EventRepository(database=database.database)
+    event = event_repository.find_one_by_id(ObjectId(item_id))
     if remove is True:
-        user.status = -1
-        user.deleted_at = datetime.today()
-        content = {"message": "users are deleted"}
+        event.status = -1
+        event.deleted_at = datetime.today()
+        content = {"message": "events are deleted"}
     else:
-        user.status = 0
-        user.disabled_at = datetime.today()
-        content = {"message": "users are disabled"}
-    user_repository.save(user)
+        event.status = 0
+        event.disabled_at = datetime.today()
+        content = {"message": "events are disabled"}
+    event.save(user)
     response = JSONResponse(content=content)  
     return response
 
-@router.put("/users/me",tags=["users"])
-async def update_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], userSingle: users.UserIn | None = None):
+@router.put("/events/me/{item_id}",tags=["users"])
+async def update_users_me(item_id: str, current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], userSingle: users.UserIn | None = None):
     user_repository = users.UserRepository(database=database.database)
     current_user.username = userSingle.username
     current_user.password = user_token.get_password_hash(userSingle.password)