fix: #91 adding filter by attributes

Author: enriquezrene

commons/data_access_layer/cosmos_db.py

@@ -216,8 +216,8 @@ class CosmosDBDao(CRUDDao):
     def __init__(self, repository: CosmosDBRepository):
         self.repository = repository
 
-    def get_all(self) -> list:
-        return self.repository.find_all(partition_key_value=self.partition_key_value)
+    def get_all(self, conditions: []) -> list:
+        return self.repository.find_all(partition_key_value=self.partition_key_value, conditions= conditions)
 
     def get(self, id):
         return self.repository.find(id, partition_key_value=self.partition_key_value)

tests/time_tracker_api/activities/activities_namespace_test.py

@@ -3,6 +3,7 @@
 from flask.testing import FlaskClient
 from flask_restplus._http import HTTPStatus
 from pytest_mock import MockFixture
+from werkzeug.datastructures import ImmutableMultiDict
 
 from time_tracker_api.security import current_user_tenant_id
 
@@ -57,6 +58,21 @@ def test_list_all_activities(client: FlaskClient, mocker: MockFixture):
     repository_find_all_mock.assert_called_once()
 
 
+def test_list_all_activities_with_conditions(client: FlaskClient, mocker: MockFixture):
+    from time_tracker_api.activities.activities_namespace import activity_dao
+    repository_find_all_mock = mocker.patch.object(activity_dao.repository,
+                                                   'find_all',
+                                                   return_value=[])
+
+    response = client.get("/activities?a=b", follow_redirects=True)
+
+    assert HTTPStatus.OK == response.status_code
+    json_data = json.loads(response.data)
+    assert [] == json_data
+    repository_find_all_mock.assert_called_once_with(conditions=ImmutableMultiDict({'a': 'b'}),
+                                                     partition_key_value='ioet')
+
+
 def test_get_activity_should_succeed_with_valid_id(client: FlaskClient, mocker: MockFixture):
     from time_tracker_api.activities.activities_namespace import activity_dao
 

tests/time_tracker_api/customers/customers_namespace_test.py

@@ -3,6 +3,7 @@
 from flask.testing import FlaskClient
 from flask_restplus._http import HTTPStatus
 from pytest_mock import MockFixture
+from werkzeug.datastructures import ImmutableMultiDict
 
 from time_tracker_api.security import current_user_tenant_id
 
@@ -56,6 +57,20 @@ def test_list_all_customers(client: FlaskClient, mocker: MockFixture):
     assert [] == json_data
     repository_find_all_mock.assert_called_once()
 
+def test_list_all_customers_with_conditions(client: FlaskClient, mocker: MockFixture):
+    from time_tracker_api.customers.customers_namespace import customer_dao
+    repository_find_all_mock = mocker.patch.object(customer_dao.repository,
+                                                   'find_all',
+                                                   return_value=[])
+
+    response = client.get("/customers?a=b", follow_redirects=True)
+
+    assert HTTPStatus.OK == response.status_code
+    json_data = json.loads(response.data)
+    assert [] == json_data
+    repository_find_all_mock.assert_called_once_with(conditions=ImmutableMultiDict({'a': 'b'}),
+                                                     partition_key_value='ioet')
+
 
 def test_get_customer_should_succeed_with_valid_id(client: FlaskClient, mocker: MockFixture):
     from time_tracker_api.customers.customers_namespace import customer_dao

tests/time_tracker_api/project_types/project_types_namespace_test.py

@@ -3,6 +3,7 @@
 from flask.testing import FlaskClient
 from flask_restplus._http import HTTPStatus
 from pytest_mock import MockFixture
+from werkzeug.datastructures import ImmutableMultiDict
 
 from time_tracker_api.security import current_user_tenant_id
 
@@ -62,6 +63,20 @@ def test_list_all_project_types(client: FlaskClient, mocker: MockFixture):
     repository_find_all_mock.assert_called_once()
 
 
+def test_list_all_project_types_with_conditions(client: FlaskClient, mocker: MockFixture):
+    from time_tracker_api.project_types.project_types_namespace import project_type_dao
+    repository_find_all_mock = mocker.patch.object(project_type_dao.repository,
+                                                   'find_all',
+                                                   return_value=[])
+
+    response = client.get("/project-types?a=b", follow_redirects=True)
+
+    assert HTTPStatus.OK == response.status_code
+    assert [] == json.loads(response.data)
+    repository_find_all_mock.assert_called_once_with(conditions=ImmutableMultiDict({'a': 'b'}),
+                                                     partition_key_value='ioet')
+
+
 def test_get_project_should_succeed_with_valid_id(client: FlaskClient, mocker: MockFixture):
     from time_tracker_api.project_types.project_types_namespace import project_type_dao
     valid_id = fake.random_int(1, 9999)

tests/time_tracker_api/projects/projects_namespace_test.py

@@ -3,6 +3,7 @@
 from flask.testing import FlaskClient
 from flask_restplus._http import HTTPStatus
 from pytest_mock import MockFixture
+from werkzeug.datastructures import ImmutableMultiDict
 
 from time_tracker_api.security import current_user_tenant_id
 
@@ -61,6 +62,20 @@ def test_list_all_projects(client: FlaskClient, mocker: MockFixture):
     repository_find_all_mock.assert_called_once()
 
 
+def test_list_all_projects_with_conditions(client: FlaskClient, mocker: MockFixture):
+    from time_tracker_api.projects.projects_namespace import project_dao
+    repository_find_all_mock = mocker.patch.object(project_dao.repository,
+                                                   'find_all',
+                                                   return_value=[])
+
+    response = client.get("/projects?a=b", follow_redirects=True)
+
+    assert HTTPStatus.OK == response.status_code
+    assert [] == json.loads(response.data)
+    repository_find_all_mock.assert_called_once_with(conditions=ImmutableMultiDict({'a': 'b'}),
+                                                     partition_key_value='ioet')
+
+
 def test_get_project_should_succeed_with_valid_id(client: FlaskClient, mocker: MockFixture):
     from time_tracker_api.projects.projects_namespace import project_dao
     valid_id = fake.random_int(1, 9999)

time_tracker_api/activities/activities_namespace.py

@@ -1,6 +1,7 @@
 from faker import Faker
 from flask_restplus import fields, Resource, Namespace
 from flask_restplus._http import HTTPStatus
+from flask import request
 
 from time_tracker_api.activities.activities_model import create_dao
 from time_tracker_api.api import common_fields
@@ -44,7 +45,7 @@ class Activities(Resource):
     @ns.marshal_list_with(activity)
     def get(self):
         """List all activities"""
-        return activity_dao.get_all()
+        return activity_dao.get_all(conditions=request.args)
 
     @ns.doc('create_activity')
     @ns.response(HTTPStatus.CONFLICT, 'This activity already exists')

time_tracker_api/customers/customers_namespace.py

@@ -1,6 +1,7 @@
 from faker import Faker
 from flask_restplus import Namespace, Resource, fields
 from flask_restplus._http import HTTPStatus
+from flask import request
 
 from time_tracker_api.api import common_fields
 from time_tracker_api.customers.customers_model import create_dao
@@ -45,7 +46,7 @@ class Customers(Resource):
     @ns.marshal_list_with(customer)
     def get(self):
         """List all customers"""
-        return customer_dao.get_all()
+        return customer_dao.get_all(conditions=request.args)
 
     @ns.doc('create_customer')
     @ns.response(HTTPStatus.CONFLICT, 'This customer already exists')

time_tracker_api/project_types/project_types_namespace.py

@@ -1,6 +1,7 @@
 from faker import Faker
 from flask_restplus import Namespace, Resource, fields
 from flask_restplus._http import HTTPStatus
+from flask import request
 
 from time_tracker_api.api import common_fields, UUID_REGEX
 from time_tracker_api.project_types.project_types_model import create_dao
@@ -60,7 +61,7 @@ class ProjectTypes(Resource):
     @ns.marshal_list_with(project_type)
     def get(self):
         """List all project types"""
-        return project_type_dao.get_all()
+        return project_type_dao.get_all(conditions=request.args)
 
     @ns.doc('create_project_type')
     @ns.response(HTTPStatus.CONFLICT, 'This project type already exists')

time_tracker_api/projects/projects_namespace.py

@@ -1,6 +1,7 @@
 from faker import Faker
 from flask_restplus import Namespace, Resource, fields
 from flask_restplus._http import HTTPStatus
+from flask import request
 
 from time_tracker_api.api import common_fields, UUID_REGEX
 from time_tracker_api.projects.projects_model import create_dao
@@ -61,7 +62,7 @@ class Projects(Resource):
     @ns.marshal_list_with(project)
     def get(self):
         """List all projects"""
-        return project_dao.get_all()
+        return project_dao.get_all(conditions=request.args)
 
     @ns.doc('create_project')
     @ns.response(HTTPStatus.CONFLICT, 'This project already exists')