Merge pull request 'add search' (#18) from feature/category into master

Reviewed-on: #18

app/models/events.py

@@ -15,6 +15,7 @@ class Event(BaseModel):
     latitude: float = 0.0
     longitude: float = 0.0
     organizers: list[str] = []
+    tags: list[str] = []
     start_date: datetime | None = None
     end_date: datetime | None = None
     created_at: datetime = datetime.today()
@@ -34,6 +35,7 @@ class EventOut(BaseModel):
     status: int = 0
     start_date: datetime | None = None
     end_date: datetime | None = None
+    tags: list[str] = []
 
 class EventIn(BaseModel):
     name: str
@@ -45,6 +47,7 @@ class EventIn(BaseModel):
     imgUrl: str | None = None
     status: int = 0
     organizers: list[str] = []
+    tags: list[str] = []
     start_date: datetime | None = None
     end_date: datetime | None = None
     latitude: float = 0.0

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):
+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):
     if limit < 1 or skip < 0 or limit < skip:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
@@ -23,6 +23,12 @@ async def read_events(authorize: Annotated[bool, Depends(permissions_checker.Per
     object_search = {}
     if status is not None:
         object_search = {"status":{"$eq": status}}
+
+    if tags is not None:
+        object_search = {"tags":{"$eq": tags}}
+
+    if organizers is not None:
+        object_search = {"organizers":{"$eq": organizers}}
     if id_event is not None:
         eventid = ObjectId(id_event)
         object_search = {"id": {"$regex": userid}}
@@ -35,7 +41,7 @@ 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, 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)
+        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
 
@@ -46,7 +52,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, 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)
+        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}
@@ -135,6 +141,7 @@ async def update_events_me(item_id: str, current_user: Annotated[users.User, Dep
     event.city = eventSingle.city
     event.country = eventSingle.country
     event.start_date = eventSingle.start_date
+    event.tags = eventSingle.tags
     event.end_date = eventSingle.end_date
     event.latitude = eventSingle.latitude
     event.longitude = eventSingle.longitude
@@ -169,6 +176,7 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P
     event.latitude = eventSingle.latitude
     event.longitude = eventSingle.longitude
     event.imgUrl = eventSingle.imgUrl
+    event.tags = eventSingle.tags
     event.created_at = datetime.today()
     event_repository.save(event)
     content = {"message": "event is created"}
@@ -201,6 +209,7 @@ async def update_events_id(item_id: str, authorize: Annotated[bool, Depends(perm
     event.start_date = eventSingle.start_date
     event.end_date = eventSingle.end_date
     event.organizers = eventSingle.organizers
+    event.tags = eventSingle.tags
     event.latitude = eventSingle.latitude
     event.longitude = eventSingle.longitude
     event.updated_at = datetime.today()