Enhance account and event filtering capabilities

- Updated `filter_accounts_objs` to include additional filters for `statuses` and `opportunities`.
- Modified `AccountFilter` schema to support new filter fields.
- Introduced `filter_events_objs` function to enable event filtering based on date range and search term.
- Added `EventFilter` schema for event filtering parameters.
- Implemented new endpoint for filtering events in the events router.

cbh/api/account/db_requests.py

@@ -43,12 +43,12 @@ async def update_account_picture_obj(
 
 
 async def filter_accounts_objs(
-    account: AccountModel, request: FilterRequest[AccountFilter]
+    request: FilterRequest[AccountFilter],
 ) -> tuple[list[AccountModel], int]:
     """
     Filter accounts.
     """
-    filters = prepare_additional_filter(account)
+    filters = {}
     if request.filter.accountTypes:
         filters["accountType"] = {"$in": request.filter.accountTypes}
     if request.filter.searchTerm:
@@ -57,6 +57,10 @@ async def filter_accounts_objs(
             {"name": {"$regex": content, "$options": "i"}},
             {"email": {"$regex": content, "$options": "i"}},
         ]
+    if request.filter.statuses:
+        filters["status"] = {"$in": request.filter.statuses}
+    if request.filter.opportunities:
+        filters["opportunity"] = {"$in": request.filter.opportunities}
     if request.sortBy:
         sort = (request.sortBy.name, request.sortBy.order.value)
     else:

cbh/api/account/schemas.py

@@ -17,3 +17,5 @@ class AccountFilter(BaseModel):
 
     accountTypes: list[int] | None = None
     searchTerm: str | None = None
+    statuses: list[int] | None = None
+    opportunities: list[int] | None = None

cbh/api/account/views.py

@@ -2,12 +2,11 @@
 Account views module.
 """
 
-from fastapi import Depends, File, UploadFile
+from fastapi import Depends
 
 from cbh.api.account import account_router
 from cbh.api.account.db_requests import (
     filter_accounts_objs,
-    update_account_picture_obj,
     update_own_account_obj,
 )
 from cbh.api.account.dto import AccountType
@@ -16,14 +15,12 @@ from cbh.api.account.schemas import (
     AccountFilter,
     UpdateAccountRequest,
 )
-from cbh.api.account.utils import compress_image
 from cbh.api.common.db_requests import (
     get_obj_by_id,
     delete_obj,
 )
 from cbh.api.common.dto import Paging
 from cbh.api.common.schemas import AllObjectsResponse, FilterRequest
-from cbh.core.config import settings
 from cbh.core.security import PermissionDependency
 from cbh.core.wrappers import CbhResponseWrapper
 
@@ -33,12 +30,12 @@ from cbh.core.wrappers import CbhResponseWrapper
 )
 async def filter_accounts(
     request: FilterRequest[AccountFilter],
-    account: AccountModel = Depends(PermissionDependency()),
+    _: AccountModel = Depends(PermissionDependency([AccountType.ADMIN])),
 ) -> CbhResponseWrapper[AllObjectsResponse[AccountModel]]:
     """
     Filter accounts.
     """
-    accounts, total_count = await filter_accounts_objs(account, request)
+    accounts, total_count = await filter_accounts_objs(request)
     return CbhResponseWrapper(
         data=AllObjectsResponse(
             data=accounts,
@@ -54,9 +51,7 @@ async def filter_accounts(
 @account_router.get("/{accountId}")
 async def get_account(
     accountId: str,  # pylint: disable=C0103
-    account: AccountModel = Depends(
-        PermissionDependency()
-    ),
+    _: AccountModel = Depends(PermissionDependency(AccountType.ADMIN)),
 ) -> CbhResponseWrapper[AccountModel]:
     """
     Get an account by ID.
@@ -73,21 +68,13 @@ async def delete_account(
     """
     Delete an account.
     """
-    await delete_obj(
-        AccountModel,
-        accountId,
-        additional_filter={
-            "accountType": AccountType.USER.value,
-        },
-    )
+    await delete_obj(AccountModel, accountId)
     return CbhResponseWrapper()
 
 
 @account_router.get("")
 async def get_own_account(
-    account: AccountModel = Depends(
-        PermissionDependency()
-    ),
+    account: AccountModel = Depends(PermissionDependency()),
 ) -> CbhResponseWrapper[AccountModel]:
     """
     Get own account.
@@ -98,9 +85,7 @@ async def get_own_account(
 @account_router.put("")
 async def update_own_account(
     request: UpdateAccountRequest,
-    account: AccountModel = Depends(
-        PermissionDependency()
-    ),
+    account: AccountModel = Depends(PermissionDependency()),
 ) -> CbhResponseWrapper[AccountModel]:
     """
     Update own account.

cbh/api/calls/services/daily.py

@@ -5,7 +5,7 @@ from cbh.core.config import settings
 
 
 async def create_meeting_room(event: EventModel | EventShorten) -> str:
-    return ''
+    # return ''
     payload = {
         "properties": {
             "exp": int(event.endDate.timestamp()) + 3600,

cbh/api/events/db_requests.py

@@ -1,7 +1,10 @@
+from datetime import datetime
 from cbh.api.account.models import AccountModel, AccountShorten
+from cbh.api.common.db_requests import get_all_objs
+from cbh.api.common.schemas import FilterRequest
 from cbh.api.events.dto import EventType
 from cbh.api.events.models import EventModel
-from cbh.api.events.schemas import CreateEventRequest
+from cbh.api.events.schemas import CreateEventRequest, EventFilter
 from cbh.core.config import settings
 
 
@@ -20,3 +23,28 @@ async def create_event_obj(
     )
     await settings.DB_CLIENT.events.insert_one(event.to_mongo())
     return event
+
+
+async def filter_events_objs(
+    request: FilterRequest[EventFilter],
+    account: AccountModel,
+) -> tuple[list[EventModel], int]:
+    filters = {"isActive": True, "coach.id": account.id, "type": EventType.CUSTOM.value}
+    if request.filter.startDate:
+        start_dt = datetime.combine(
+            request.filter.startDate, datetime.min.time()
+        ).isoformat()
+        filters["startDate"] = {"$gte": start_dt}
+    if request.filter.endDate:
+        end_dt = datetime.combine(
+            request.filter.endDate, datetime.max.time()
+        ).isoformat()
+        filters["endDate"] = {"$lte": end_dt}
+    if request.filter.searchTerm:
+        filters["$or"] = [
+            {"reason": {"$regex": request.filter.searchTerm, "$options": "i"}},
+        ]
+    events, total_count = await get_all_objs(
+        EventModel, request.pageSize, request.pageIndex, additional_filter=filters
+    )
+    return events, total_count

cbh/api/events/schemas.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import date, datetime
 from pydantic import BaseModel
 
 
@@ -10,3 +10,13 @@ class CreateEventRequest(BaseModel):
     reason: str | None = None
     startDate: datetime
     endDate: datetime
+
+
+class EventFilter(BaseModel):
+    """
+    Event filter.
+    """
+
+    startDate: date | None = None
+    endDate: date | None = None
+    searchTerm: str | None = None

cbh/api/events/views.py

@@ -1,13 +1,37 @@
 from fastapi import Depends
 
+from cbh.api.common.db_requests import delete_obj
+from cbh.api.common.dto import Paging
+from cbh.api.common.schemas import AllObjectsResponse, FilterRequest
 from cbh.api.events import events_router
 from cbh.api.events.models import EventModel
 from cbh.api.account.models import AccountModel
 from cbh.core.security import PermissionDependency
 from cbh.api.account.dto import AccountType
 from cbh.core.wrappers import CbhResponseWrapper
-from cbh.api.events.schemas import CreateEventRequest
-from cbh.api.events.db_requests import create_event_obj
+from cbh.api.events.schemas import CreateEventRequest, EventFilter
+from cbh.api.events.db_requests import create_event_obj, filter_events_objs
+
+
+@events_router.post("/filter")
+async def filter_events(
+    request: FilterRequest[EventFilter],
+    account: AccountModel = Depends(PermissionDependency([AccountType.COACH])),
+) -> CbhResponseWrapper[AllObjectsResponse[EventModel]]:
+    """
+    Filter events.
+    """
+    events, total_count = await filter_events_objs(request, account)
+    return CbhResponseWrapper(
+        data=AllObjectsResponse(
+            data=events,
+            paging=Paging(
+                pageSize=request.pageSize,
+                pageIndex=request.pageIndex,
+                totalCount=total_count,
+            ),
+        )
+    )
 
 
 @events_router.post("")
@@ -20,3 +44,15 @@ async def create_event(
     """
     event = await create_event_obj(event, account)
     return CbhResponseWrapper(data=event)
+
+
+@events_router.delete("/{eventId}")
+async def delete_event(
+    eventId: str,
+    account: AccountModel = Depends(PermissionDependency([AccountType.COACH])),
+) -> CbhResponseWrapper:
+    """
+    Delete an event.
+    """
+    await delete_obj(EventModel, eventId, {"coach.id": account.id})
+    return CbhResponseWrapper()