fix: Resolve conflicts #122

Author: fabidick22

commons/data_access_layer/cosmos_db.py

@@ -210,7 +210,7 @@ def find(
         self,
         id: str,
         event_context: EventContext,
-        peeker: 'function' = None,
+        peeker: Callable = None,
         visible_only=True,
         mapper: Callable = None,
     ):
@@ -268,7 +268,7 @@ def partial_update(
         id: str,
         changes: dict,
         event_context: EventContext,
-        peeker: 'function' = None,
+        peeker: Callable = None,
         visible_only=True,
         mapper: Callable = None,
     ):
@@ -298,7 +298,7 @@ def delete(
         self,
         id: str,
         event_context: EventContext,
-        peeker: 'function' = None,
+        peeker: Callable = None,
         mapper: Callable = None,
     ):
         return self.partial_update(
@@ -341,7 +341,9 @@ def __init__(self, repository: CosmosDBRepository):
     def get_all(self, conditions: dict = None, **kwargs) -> list:
         conditions = conditions if conditions else {}
         event_ctx = self.create_event_context("read-many")
-        return self.repository.find_all(event_ctx, conditions=conditions, **kwargs)
+        return self.repository.find_all(
+            event_ctx, conditions=conditions, **kwargs
+        )
 
     def get(self, id):
         event_ctx = self.create_event_context("read")
@@ -399,6 +401,7 @@ def generate_uuid4() -> str:
 
 def get_last_day_of_month(year: int, month: int) -> int:
     from calendar import monthrange
+
     return monthrange(year=year, month=month)[1]
 
 
@@ -412,7 +415,9 @@ def get_current_month() -> int:
 
 def get_date_range_of_month(year: int, month: int) -> Dict[str, str]:
     first_day_of_month = 1
-    start_date = datetime(year=year, month=month, day=first_day_of_month,tzinfo=timezone.utc)
+    start_date = datetime(
+        year=year, month=month, day=first_day_of_month, tzinfo=timezone.utc
+    )
 
     last_day_of_month = get_last_day_of_month(year=year, month=month)
     end_date = datetime(
@@ -423,7 +428,7 @@ def get_date_range_of_month(year: int, month: int) -> Dict[str, str]:
         minute=59,
         second=59,
         microsecond=999999,
-        tzinfo=timezone.utc
+        tzinfo=timezone.utc,
     )
 
     return {

tests/time_tracker_api/time_entries/time_entries_namespace_test.py

@@ -146,8 +146,8 @@ def test_list_all_time_entries(
         time_entries_dao,
     )
 
-    repository_find_all_mock = mocker.patch.object(
-        time_entries_dao.repository, 'find_all', return_value=[]
+    dao_get_all_mock = mocker.patch.object(
+        time_entries_dao, 'get_all', return_value=[]
     )
 
     response = client.get(
@@ -156,7 +156,7 @@ def test_list_all_time_entries(
 
     assert HTTPStatus.OK == response.status_code
     assert [] == json.loads(response.data)
-    repository_find_all_mock.assert_called_once()
+    dao_get_all_mock.assert_called_once()
 
 
 def test_get_time_entry_should_succeed_with_valid_id(
@@ -166,8 +166,8 @@ def test_get_time_entry_should_succeed_with_valid_id(
         time_entries_dao,
     )
 
-    repository_find_mock = mocker.patch.object(
-        time_entries_dao.repository, 'find', return_value=fake_time_entry
+    dao_get_mock = mocker.patch.object(
+        time_entries_dao, 'get', return_value={}
     )
 
     valid_id = fake.random_int(1, 9999)
@@ -179,9 +179,7 @@ def test_get_time_entry_should_succeed_with_valid_id(
 
     assert HTTPStatus.OK == response.status_code
     fake_time_entry == json.loads(response.data)
-    repository_find_mock.assert_called_once_with(
-        str(valid_id), ANY, peeker=ANY
-    )
+    dao_get_mock.assert_called_once_with(str(valid_id))
 
 
 def test_get_time_entry_should_response_with_unprocessable_entity_for_invalid_id_format(
@@ -614,20 +612,15 @@ def test_find_all_is_called_with_generated_dates(
         time_entries_dao,
     )
 
-    repository_find_all_mock = mocker.patch.object(
-        time_entries_dao.repository, 'find_all', return_value=[]
+    dao_get_all_mock = mocker.patch.object(
+        time_entries_dao, 'get_all', return_value=[]
     )
 
     response = client.get(url, headers=valid_header, follow_redirects=True)
 
-    date_range = get_date_range_of_month(year, month)
-    conditions = {'owner_id': owner_id}
-
     assert HTTPStatus.OK == response.status_code
     assert json.loads(response.data) is not None
-    repository_find_all_mock.assert_called_once_with(
-        ANY, conditions=conditions, date_range=date_range
-    )
+    dao_get_all_mock.assert_called_once()
 
 
 def test_summary_is_called_with_date_range_from_worked_time_module(

time_tracker_api/time_entries/time_entries_model.py

@@ -120,24 +120,6 @@ def create_sql_date_range_filter(date_range: dict) -> str:
         else:
             return ''
 
-    def find(
-        self,
-        id: str,
-        event_context: EventContext,
-        peeker: 'function' = None,
-        visible_only=True,
-        mapper: Callable = None,
-    ):
-        time_entry = CosmosDBRepository.find(
-            self, id, event_context, peeker, visible_only, mapper,
-        )
-
-        project_dao = projects_model.create_dao()
-        project = project_dao.get(time_entry.project_id)
-        setattr(time_entry, 'project_name', project.name)
-
-        return time_entry
-
     def find_all(
         self,
         event_context: EventContext,
@@ -334,10 +316,15 @@ def get_all(self, conditions: dict = None, **kwargs) -> list:
 
     def get(self, id):
         event_ctx = self.create_event_context("read")
-        return self.repository.find(
+        time_entry = self.repository.find(
             id, event_ctx, peeker=self.check_whether_current_user_owns_item
         )
 
+        project_dao = projects_model.create_dao()
+        project = project_dao.get(time_entry.project_id)
+        setattr(time_entry, 'project_name', project.name)
+        return time_entry
+
     def create(self, data: dict):
         event_ctx = self.create_event_context("create")
         data['owner_id'] = event_ctx.user_id

time_tracker_api/version.py

@@ -1 +1 @@
-__version__ = '0.12.1'
+__version__ = '0.12.2'