Merge pull request 'feature/search' (#24) from feature/search into master

Reviewed-on: #24

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}}
+        object_search = {"$and":[{"id":{"$regex": eventid}}, {"status":{"$eq":status}}]}
-        if status is not None:
-           object_search = {"$and":[{"id":{"$regex": eventid}}, {"status":{"$eq":status}}]}
     if name is not None:
-        object_search = {"name": {"$regex": name}}
+        object_search = {"$and":[{"name":{"$regex": name}}, {"status":{"$eq":status}}]}
-        if status is not None:
-           object_search = {"$and":[{"name":{"$regex": name}}, {"status":{"$eq":status}}]}
 
 
     for event_index in event_repository.find_by(object_search, limit=limit, skip=skip):
@@ -46,6 +41,80 @@ async def read_events(authorize: Annotated[bool, Depends(permissions_checker.Per
     return listEvents
 
 
+@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"]))], skip: int = 0, limit: int = 20, item: str | None = None, status: int = 1, min_lat: float | None = None, max_lat: float | None = None, min_lon: float | None = None, max_lon: float | None = None):
+    if limit < 1 or skip < 0 or limit < skip:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="skip should be greater than 0 and limit should be greater than 1. Limit should be greater than skip"
+        )
+    limit = limit + skip
+    listEvents = []
+    event_repository = events.EventRepository(database=database.database)
+    object_search = {}
+    if min_lat is not None and max_lat is not None and min_lon is not None and max_lon is not None:
+        object_search = {
+                "$and": [
+                    {"status": {"$eq": status}},
+                    {
+                        "latitude": {"$gte": min_lat},  # Minimum latitude
+                    },
+                    {
+                        "latitude": {"$lte": max_lat},  # Maximum latitude
+                    },
+                    {
+                        "longitude": {"$gte": min_lon},  # Minimum longitude
+                    },
+                    {
+                        "longitude": {"$lte": max_lon},  # Maximum longitude
+                    }
+                ]
+            }
+    if item is not None:
+        object_search = {
+        "$and": [
+            {
+                "$or": [
+                    {"name": {"$regex": item}},
+                    {"tags": {"$regex": item}},
+                    {"organizers": {"$regex": item}}
+                ]
+            },
+            {"status": {"$eq": status}}
+        ]
+        }
+        if min_lat is not None and max_lat is not None and min_lon is not None and max_lon is not None:
+            object_search = {
+                "$and": [
+                    {
+                        "$or": [
+                            {"name": {"$regex": item}},
+                            {"tags": {"$regex": item}},
+                            {"organizers": {"$regex": item}}
+                        ]
+                    },
+                    {"status": {"$eq": status}},
+                    {
+                        "latitude": {"$gte": min_lat},  # Minimum latitude
+                    },
+                    {
+                        "latitude": {"$lte": max_lat},  # Maximum latitude
+                    },
+                    {
+                        "longitude": {"$gte": min_lon},  # Minimum longitude
+                    },
+                    {
+                        "longitude": {"$lte": max_lon},  # Maximum longitude
+                    }
+                ]
+            }
+
+    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)
+    return listEvents
+
+
 @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"]))]):
     event_repository = events.EventRepository(database=database.database)
@@ -177,6 +246,7 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P
     event.longitude = eventSingle.longitude
     event.imgUrl = eventSingle.imgUrl
     event.tags = eventSingle.tags
+    event.status = 1
     event.created_at = datetime.today()
     event_repository.save(event)
     content = {"message": "event is created"}