update paginated get responses

backend/src/core/entities/review/review.py

@@ -2,7 +2,7 @@
 from pydantic import BaseModel, Field
 from typing import Optional
 from src.core.entities.object_id_str import ObjectIdStr
-
+from typing import List
 
 class Review(BaseModel):
     toolId: ObjectIdStr = Field(
@@ -108,3 +108,12 @@ class ReviewPaginated(ReviewSummary):
         ...,
         description="Tool name"
     )
+
+class PaginatedReviewsResponse(BaseModel):
+    reviews: List[ReviewPaginated] = Field(
+        ...
+    )
+    totalNumber: int = Field(
+        ...
+    )
+

backend/src/core/entities/users/worker/worker.py

@@ -80,4 +80,12 @@ class WorkerPaginated(BaseModel):
     date: datetime = Field(
         default=None,
         description="Employee start date",
+    )
+
+class PaginatedWorkersResponse(BaseModel):
+    workers: List[WorkerPaginated] = Field(
+        ...
+    )
+    totalNumber: int = Field(
+        ...
     )

backend/src/core/repositories/review_repos/ireview_repository.py

@@ -27,4 +27,15 @@ async def get_paginated_reviews(
             start_date: Optional[datetime] = None,
             end_date: Optional[datetime] = None
     ) -> List[Review]:
+        pass
+
+    @abstractmethod
+    async def count_reviews(
+            self,
+            tool_ids: Optional[List[str]] = None,
+            reviewer_ids: Optional[List[str]] = None,
+            rating: Optional[int] = None,
+            start_date: Optional[datetime] = None,
+            end_date: Optional[datetime] = None
+    ) -> int:
         pass

backend/src/core/repositories/users_repos/worker_repos/iworker_repository.py

@@ -58,4 +58,15 @@ async def get_paginated_workers(
             phone: Optional[str] = None,
             jobTitle: Optional[str] = None
     ) -> List[WorkerPaginated]:
+        pass
+
+    @abstractmethod
+    async def count_workers(
+            self,
+            email: Optional[str] = None,
+            name: Optional[str] = None,
+            surname: Optional[str] = None,
+            phone: Optional[str] = None,
+            jobTitle: Optional[str] = None
+    ) -> int:
         pass

backend/src/core/services/review_service/review_service.py

@@ -1,4 +1,4 @@
-from src.core.entities.review.review import ReviewCreate, ReviewCreated, ReviewSummary, Review, ReviewPaginated
+from src.core.entities.review.review import ReviewCreate, ReviewCreated, ReviewSummary, Review, ReviewPaginated, PaginatedReviewsResponse
 from typing import List, Optional
 from src.core.exceptions.client_error import ResourceNotFoundError, ResourceAlreadyExistsError, PaymentStateError
 from src.core.repositories.order_repos.iorder_repository import IOrderRepository
@@ -75,7 +75,7 @@ async def get_paginated_reviews(
             rating: Optional[int] = None,
             start_date: Optional[datetime] = None,
             end_date: Optional[datetime] = None
-    ) -> List[ReviewPaginated]:
+    ) -> PaginatedReviewsResponse:
         tool_ids = None
         if tool_name:
             tool_ids = await self.tool_repo.get_ids_by_name(tool_name)
@@ -97,6 +97,14 @@ async def get_paginated_reviews(
             end_date=end_date
         )
 
+        total_count = await self.review_repo.count_reviews(
+            tool_ids=tool_ids,
+            reviewer_ids=reviewer_ids,
+            rating=rating,
+            start_date=start_date,
+            end_date=end_date
+        )
+
         result = []
         for review in reviews:
             tool_name = await self.tool_repo.get_name_by_id(objectId_to_str(review.toolId))
@@ -110,5 +118,8 @@ async def get_paginated_reviews(
                 tool_name=tool_name
             ))
 
-        return result
+        return PaginatedReviewsResponse(
+            reviews=result,
+            totalNumber=total_count
+        )
 

backend/src/core/services/worker_service/worker_service.py

@@ -1,5 +1,5 @@
 from src.core.entities.users.base_user import UpdateUser, UpdatedUser, UpdateUserPassword, UpdatedUserPassword
-from src.core.entities.users.worker.worker import WorkerInDB, WorkerPrivateSummary, WorkerPaginated
+from src.core.entities.users.worker.worker import WorkerInDB, WorkerPrivateSummary, WorkerPaginated, PaginatedWorkersResponse
 from src.core.exceptions.client_error import ResourceNotFoundError, InvalidPasswordProvided
 from src.core.repositories.users_repos.worker_repos.iworker_repository import IWorkerRepository
 from typing import List, Optional
@@ -52,13 +52,26 @@ async def get_paginated_workers(
             surname: Optional[str] = None,
             phone: Optional[str] = None,
             jobTitle: Optional[str] = None,
-    ) -> List[WorkerPaginated]:
-        return await self.worker_repo.get_paginated_workers(
+    ) -> PaginatedWorkersResponse:
+        total_count = await self.worker_repo.count_workers(
+            email=email,
+            name=name,
+            surname=surname,
+            phone=phone,
+            jobTitle=jobTitle
+        )
+
+        workers = await self.worker_repo.get_paginated_workers(
             page=page,
             page_size=page_size,
             email=email,
             name=name,
             surname=surname,
             phone=phone,
             jobTitle=jobTitle
+        )
+
+        return PaginatedWorkersResponse(
+            workers=workers,
+            totalNumber=total_count
         )

backend/src/infrastructure/api/review_controller.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends, Query
 from typing import List, Optional
 from fastapi.security import OAuth2PasswordBearer
-from src.core.entities.review.review import ReviewCreated, ReviewCreate, ReviewPaginated
+from src.core.entities.review.review import ReviewCreated, ReviewCreate, ReviewPaginated, PaginatedReviewsResponse
 from src.core.services.review_service.review_service import ReviewService
 from src.infrastructure.api.security.role_required import is_self, is_worker
 from src.infrastructure.services_instances import get_review_service
@@ -28,7 +28,7 @@ async def create_review(
 @review_router.get(
     path="/paginated",
     status_code=200,
-    response_model=List[ReviewPaginated]
+    response_model=PaginatedReviewsResponse
 )
 async def get_reviews_paginated(
         page: PositiveInt = Query(1),

backend/src/infrastructure/api/worker_contoller.py

@@ -3,7 +3,7 @@
 from pydantic import PositiveInt
 
 from src.core.entities.users.base_user import UpdatedUser, UpdateUser, UpdatedUserPassword, UpdateUserPassword
-from src.core.entities.users.worker.worker import WorkerPrivateSummary, WorkerPaginated
+from src.core.entities.users.worker.worker import WorkerPrivateSummary, WorkerPaginated, PaginatedWorkersResponse
 from src.core.services.worker_service.worker_service import WorkerService
 from src.infrastructure.api.security.role_required import is_worker, is_self
 from src.infrastructure.services_instances import get_worker_service
@@ -17,7 +17,7 @@
 @worker_router.get(
     path="/paginated",
     status_code=200,
-    response_model=List[WorkerPaginated]
+    response_model=PaginatedWorkersResponse
 )
 async def get_workers_paginated(
         page: PositiveInt = Query(1),
@@ -28,9 +28,9 @@ async def get_workers_paginated(
         phone: Optional[str] = Query(None),
         jobTitle: Optional[str] = Query(None),
         worker_service: WorkerService = Depends(get_worker_service),
-        #token: str = Depends(oauth2_scheme)
+        token: str = Depends(oauth2_scheme)
 ):
-    #is_worker(token)
+    is_worker(token)
     return await worker_service.get_paginated_workers(
         page=page,
         page_size=page_size,

backend/src/infrastructure/repo_implementations/review_repos/mongo_review_repository.py

@@ -89,3 +89,34 @@ async def get_paginated_reviews(
             return [Review(**review) for review in reviews]
         except PyMongoError:
             raise DatabaseError()
+
+
+    async def count_reviews(
+            self,
+            tool_ids: Optional[List[str]] = None,
+            reviewer_ids: Optional[List[str]] = None,
+            rating: Optional[int] = None,
+            start_date: Optional[datetime] = None,
+            end_date: Optional[datetime] = None
+    ) -> int:
+        try:
+            filters = {}
+
+            if tool_ids is not None:
+                filters["toolId"] = {"$in": [str_to_objectId(tool_id) for tool_id in tool_ids]}
+            if reviewer_ids is not None:
+                filters["reviewerId"] = {"$in": [str_to_objectId(reviewer_id) for reviewer_id in reviewer_ids]}
+            if rating is not None:
+                filters["rating"] = rating
+            if start_date or end_date:
+                filters["date"] = {}
+                if start_date:
+                    filters["date"]["$gte"] = start_date
+                if end_date:
+                    filters["date"]["$lte"] = end_date
+
+            count = await self.review_collection.count_documents(filters)
+
+            return count
+        except PyMongoError:
+            raise DatabaseError()

backend/src/infrastructure/repo_implementations/users_repos/worker_repos/mongo_worker_repository.py

@@ -154,5 +154,33 @@ async def get_paginated_workers(
 
             workers = await cursor.to_list(length=page_size)
             return [WorkerPaginated(**worker) for worker in workers]
+        except PyMongoError:
+            raise DatabaseError()
+
+    async def count_workers(
+            self,
+            email: Optional[str] = None,
+            name: Optional[str] = None,
+            surname: Optional[str] = None,
+            phone: Optional[str] = None,
+            jobTitle: Optional[str] = None
+    ) -> int:
+        try:
+            filters = {}
+
+            if email:
+                filters['email'] = {"$regex": email, "$options": "i"}
+            if name:
+                filters['name'] = {"$regex": name, "$options": "i"}
+            if surname:
+                filters['surname'] = {"$regex": surname, "$options": "i"}
+            if phone:
+                filters['phone'] = {"$regex": phone, "$options": "i"}
+            if jobTitle:
+                filters['jobTitle'] = {"$regex": jobTitle, "$options": "i"}
+
+            count = await self.worker_collection.count_documents(filters)
+
+            return count
         except PyMongoError:
             raise DatabaseError()