From 3f4173863cdeb9382ab5ab18a79c2b5bd5b906e6 Mon Sep 17 00:00:00 2001
From: Valentin CZERYBA <valcze80@gmail.com>
Date: Wed, 23 Oct 2024 22:58:17 +0200
Subject: [PATCH] list events only enabled

---
 app/routers/events.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/routers/events.py b/app/routers/events.py
index 0d462f3..cd850d4 100644
--- a/app/routers/events.py
+++ b/app/routers/events.py
@@ -11,7 +11,7 @@ router = APIRouter()
 
 
 @router.get("/events", tags=["events"], response_model=list[events.EventOut])
-async def read_events(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], skip: int = 0, limit: int = 20, id_event: str | None = None, name: str | None = None, status: int | None = None, tags: str | None = None, organizers: str | None = None):
+async def read_events(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], skip: int = 0, limit: int = 20, id_event: str | None = None, name: str | None = None, status: int = 1, tags: str | None = None, organizers: str | None = None):
     if limit < 1 or skip < 0 or limit < skip:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
@@ -21,23 +21,18 @@ async def read_events(authorize: Annotated[bool, Depends(permissions_checker.Per
     listEvents = []
     event_repository = events.EventRepository(database=database.database)
     object_search = {}
-    if status is not None:
+    if status is not 1:
         object_search = {"status":{"$eq": status}}
 
     if tags is not None:
-        object_search = {"tags":{"$eq": tags}}
-
+        object_search = {"$and":[{"tags":{"$eq": tags}}, {"status":{"$eq":status}}]}
     if organizers is not None:
-        object_search = {"organizers":{"$eq": organizers}}
+        object_search = {"$and":[{"organizers":{"$eq": organizers}}, {"status":{"$eq":status}}]}
     if id_event is not None:
         eventid = ObjectId(id_event)
-        object_search = {"id": {"$regex": userid}}
-        if status is not None:
-           object_search = {"$and":[{"id":{"$regex": eventid}}, {"status":{"$eq":status}}]}
+        object_search = {"$and":[{"id":{"$regex": eventid}}, {"status":{"$eq":status}}]}
     if name is not None:
-        object_search = {"name": {"$regex": name}}
-        if status is not None:
-           object_search = {"$and":[{"name":{"$regex": name}}, {"status":{"$eq":status}}]}
+        object_search = {"$and":[{"name":{"$regex": name}}, {"status":{"$eq":status}}]}
 
 
     for event_index in event_repository.find_by(object_search, limit=limit, skip=skip):
@@ -58,7 +53,8 @@ async def search_events(authorize: Annotated[bool, Depends(permissions_checker.P
     event_repository = events.EventRepository(database=database.database)
     object_search = {}
     if item is not None:
-        object_search = {"$or":[{"name":{"$regex": item}}, {"tags":{"$regex":item}},{"organizers":{"$regex": item}}]}
+        object_search = { "$and": [{"$or":[{"name":{"$regex": item}}, {"tags":{"$regex":item}},{"organizers":{"$regex": item}}]},{"status":{"$eq":status}}]}
+
     for event_index in event_repository.find_by(object_search, limit=limit, skip=skip):
         event = events.EventOut(id=event_index.id, tags=event_index.tags, imgUrl=event_index.imgUrl, name=event_index.name, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country,  status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
         listEvents.append(event)
-- 
2.47.1