Merge pull request 'add event set status to 1' (#23) from feature/search into master

Reviewed-on: #23

app/models/events.py

@@ -6,6 +6,9 @@ class Event(BaseModel):
     id: ObjectIdField = None
     name: str
     place: str
+    zip_code: str
+    city: str
+    country: str
     description: str
     imgUrl: str | None = None
     status: int = 0
@@ -24,6 +27,9 @@ class EventOut(BaseModel):
     id: ObjectIdField = None
     name: str
     place: str
+    zip_code: str
+    city: str
+    country: str
     description: str
     imgUrl: str | None = None
     status: int = 0
@@ -34,6 +40,9 @@ class EventOut(BaseModel):
 class EventIn(BaseModel):
     name: str
     place: str
+    zip_code: str
+    city: str
+    country: str
     description: str
     imgUrl: str | None = None
     status: int = 0

app/routers/events.py

@@ -36,13 +36,13 @@ 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 = 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,  status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
+        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/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):
+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):
     if limit < 1 or skip < 0 or limit < skip:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
@@ -52,24 +52,6 @@ async def search_events(authorize: Annotated[bool, Depends(permissions_checker.P
     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": [
@@ -83,34 +65,8 @@ async def search_events(authorize: Annotated[bool, Depends(permissions_checker.P
             {"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,  status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
+        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
 
@@ -121,7 +77,7 @@ async def read_users_me(current_user: Annotated[users.User, Depends(users_token.
     listOrganizers = []
 
     for event_index in event_repository.find_by({"organizers":{"$eq": current_user.username}}, limit=limit, skip=skip):
-        event = events.EventOut(id=event_index.id, name=event_index.name, tags=event_index.tags, imgUrl=event_index.imgUrl, description=event_index.description, 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, tags=event_index.tags, imgUrl=event_index.imgUrl, 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)
         listOrganizers.append(event)
 
     content = {"organizers":listOrganizers}
@@ -206,6 +162,9 @@ async def update_events_me(item_id: str, current_user: Annotated[users.User, Dep
     event.name = eventSingle.name
     event.description = eventSingle.description
     event.place = eventSingle.place
+    event.zip_code = eventSingle.zip_code
+    event.city = eventSingle.city
+    event.country = eventSingle.country
     event.start_date = eventSingle.start_date
     event.tags = eventSingle.tags
     event.end_date = eventSingle.end_date
@@ -235,7 +194,7 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P
         )
         
 
-    event = events.Event(name=eventSingle.name, description=eventSingle.description, place=eventSingle.place)
+    event = events.Event(name=eventSingle.name, description=eventSingle.description, place=eventSingle.place, zip_code=eventSingle.zip_code, city=eventSingle.city, country=eventSingle.country)
     event.start_date = eventSingle.start_date
     event.end_date = eventSingle.end_date
     event.organizers = eventSingle.organizers
@@ -270,6 +229,9 @@ async def update_events_id(item_id: str, authorize: Annotated[bool, Depends(perm
     event.name = eventSingle.name
     event.place = eventSingle.place
     event.description = eventSingle.description
+    event.zip_code = eventSingle.zip_code
+    event.city = eventSingle.city
+    event.country = eventSingle.country
     event.start_date = eventSingle.start_date
     event.end_date = eventSingle.end_date
     event.organizers = eventSingle.organizers