agrojas · agrojas · Aug 29, 2021 · Aug 29, 2021 · Aug 29, 2021
diff --git a/app/adapters/database/users/sql_user_repository.py b/app/adapters/database/users/sql_user_repository.py
@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
 
 from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import Session
@@ -69,8 +69,13 @@ def find_by_email_or_username(self, email: str, username: str) -> User:
             raise
         return user_dto.to_entity()
 
-    def all(self) -> List[User]:
-        return [u.to_entity() for u in self.session.query(UserDTO).all()]
+    def all(
+        self, q: Optional[str] = None, offset: int = 0, limit: int = 100
+    ) -> List[User]:
+        query = self.session.query(UserDTO)
+        if q:
+            query = query.filter((UserDTO.email == q) | (UserDTO.username == q))
+        return [u.to_entity() for u in query.limit(limit).offset(offset)]
 
     def total(self) -> int:
         return self.session.query(UserDTO).count()
diff --git a/app/adapters/http/users/users_controller.py b/app/adapters/http/users/users_controller.py
@@ -1,5 +1,5 @@
 import logging
-from typing import List
+from typing import List, Optional
 
 from fastapi import Depends, APIRouter, status
 
@@ -9,33 +9,28 @@
 from app.domain.users.command.user_update_status_command import UpdateUserStatusCommand
 from app.domain.users.usecases.user_usecases import UserUseCases
 from app.dependencies.dependencies import user_token_validation
+from app.domain.users.query.user_query import UserQuery
 
 router = APIRouter(tags=["users"])
 logger = logging.getLogger(__name__)
 
 
-@router.get(
-    '/users/{user_id}', response_model=UserResponse, status_code=status.HTTP_200_OK,
-)
-async def get_user(
-    user_id: str,
-    user_usecases: UserUseCases = Depends(user_usecases_dependency),
-    user_from_token=Depends(user_token_validation),
-):
-    logger.info("Get user by id called")
-    user = user_usecases.find_by_id(user_id)
-    return user
+async def user_query(
+    q: Optional[str] = None, offset: int = 0, limit: int = 100
+) -> UserQuery:
+    return UserQuery(q=q, offset=offset, limit=limit)
 
 
 @router.get(
     '/users', response_model=List[UserResponse], status_code=status.HTTP_200_OK,
 )
 async def get_users(
     user_from_token=Depends(user_token_validation),
+    user_query: Optional[UserQuery] = Depends(user_query),
     user_usecases: UserUseCases = Depends(user_usecases_dependency),
 ):
     logger.info("Get all users called")
-    return user_usecases.list()
+    return user_usecases.list(user_query)
 
 
 @router.post(
@@ -49,6 +44,19 @@ async def create_users(
     return user_usecases.register(user_request.to_create_user_command())
 
 
+@router.get(
+    '/users/{user_id}', response_model=UserResponse, status_code=status.HTTP_200_OK,
+)
+async def get_user(
+    user_id: str,
+    user_usecases: UserUseCases = Depends(user_usecases_dependency),
+    user_from_token=Depends(user_token_validation),
+):
+    logger.info("Get user by id called")
+    user = user_usecases.find_by_id(user_id)
+    return user
+
+
 @router.patch(
     '/users/{user_id}/status',
     response_model=UserResponse,

diff --git a/app/domain/users/query/__init__.py b/app/domain/users/query/__init__.py
diff --git a/app/domain/users/query/user_query.py b/app/domain/users/query/user_query.py
@@ -0,0 +1,9 @@
+from typing import Optional
+
+from pydantic.main import BaseModel
+
+
+class UserQuery(BaseModel):
+    q: Optional[str] = None
+    offset: int = 0
+    limit: int = 100
diff --git a/app/domain/users/repository/user_repository.py b/app/domain/users/repository/user_repository.py
@@ -1,5 +1,5 @@
 import abc
-from typing import List
+from typing import List, Optional
 
 from app.domain.users.model.user import User
 from app.domain.users.model.user_id import UserId
@@ -27,7 +27,7 @@ def find_by_email(self, email: str) -> User:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def all(self) -> List[User]:
+    def all(self, q: Optional[str], offset: int, limit: int) -> List[User]:
         raise NotImplementedError
 
     @abc.abstractmethod

diff --git a/app/domain/users/usecases/user_usecases.py b/app/domain/users/usecases/user_usecases.py
@@ -12,15 +12,18 @@
 )
 from app.domain.users.model.user_id import UserId
 from app.domain.users.repository.unit_of_work import AbstractUserUnitOfWork
+from app.domain.users.query.user_query import UserQuery
 
 
 class UserUseCases:
     def __init__(self, user_uow: AbstractUserUnitOfWork, pwd_encoder: PasswordEncoder):
         self.user_uow: AbstractUserUnitOfWork = user_uow
         self.pwd_encoder = pwd_encoder
 
-    def list(self) -> List[User]:
-        return self.user_uow.repository.all()
+    def list(self, user_query: UserQuery) -> List[User]:
+        return self.user_uow.repository.all(
+            user_query.q, user_query.offset, user_query.limit
+        )
 
     def register(self, user_command: UserCreateCommand) -> User:
         try:

diff --git a/tests/adapters/database/users/test_sql_user_repository.py b/tests/adapters/database/users/test_sql_user_repository.py
@@ -42,6 +42,28 @@ def test_user_repository_all(self):
         user_repository.save(user1)
         assert user_repository.all() == [user1]
 
+    def test_user_repository_all_filtered(self):
+        user_repository = SQLUserRepository(self.session)
+        user1 = User(
+            id=UserId(id=str(uuid.uuid4())),
+            username="tesst22",
+            email="[email protected]",
+            password='aaaa',
+        )
+        user_repository.save(user1)
+        assert user_repository.all(q='tesst22') == [user1]
+
+    def test_user_repository_all_filtered_empty(self):
+        user_repository = SQLUserRepository(self.session)
+        user1 = User(
+            id=UserId(id=str(uuid.uuid4())),
+            username="tesst2",
+            email="[email protected]",
+            password='aaaa',
+        )
+        user_repository.save(user1)
+        assert user_repository.all(q='InvalidMock') == []
+
     def test_user_repository_total(self):
         user_repository = SQLUserRepository(self.session)
         user = User(

diff --git a/tests/domain/users/usecases/test_user_usecases.py b/tests/domain/users/usecases/test_user_usecases.py
@@ -9,6 +9,7 @@
 from app.domain.users.model.user_status import UserStatus
 from app.domain.users.usecases.user_usecases import UserUseCases
 from app.domain.users.model.user_exceptions import UserAlreadyExistException
+from app.domain.users.query.user_query import UserQuery
 
 
 class TestUserUseCases(unittest.TestCase):
@@ -18,7 +19,8 @@ class TestUserUseCases(unittest.TestCase):
     def test_list_empty(self):
         user_usecases = UserUseCases(self.uow, self.pwd_encoder)
         self.uow.repository.all = MagicMock(return_value=[])
-        self.assertEqual([], user_usecases.list())
+        user_query = UserQuery()
+        self.assertEqual([], user_usecases.list(user_query))
 
     def test_list_with_results(self):
         user_id = UserId(id=str(uuid.uuid4()))
@@ -27,7 +29,18 @@ def test_list_with_results(self):
         )
         self.uow.repository.all = MagicMock(return_value=[user_mock])
         user_usecases = UserUseCases(self.uow, self.pwd_encoder)
-        self.assertEqual(user_usecases.list(), [user_mock])
+        user_query = UserQuery()
+        self.assertEqual(user_usecases.list(user_query), [user_mock])
+
+    def test_list_with_filtered_results(self):
+        user_id = UserId(id=str(uuid.uuid4()))
+        user_mock = User(
+            id=user_id, username='mock', email='[email protected]', password='aaaa'
+        )
+        self.uow.repository.all = MagicMock(return_value=[user_mock])
+        user_usecases = UserUseCases(self.uow, self.pwd_encoder)
+        user_query = UserQuery(q='mock')
+        self.assertEqual(user_usecases.list(user_query), [user_mock])
 
     def test_register(self):
         user_id = UserId(id=str(uuid.uuid4()))