fix: remove static method from TimeEntriesDao #227

Author: Guido Quezada

time_tracker_api/time_entries/time_entries_model.py

@@ -42,10 +42,6 @@
 
 
 class TimeEntriesDao(CRUDDao):
-    @staticmethod
-    def current_user_id():
-        return current_user_id()
-
     @abc.abstractmethod
     def find_running(self):
         pass
@@ -374,11 +370,9 @@ class TimeEntriesCosmosDBDao(APICosmosDBDao, TimeEntriesDao):
     def __init__(self, repository):
         CosmosDBDao.__init__(self, repository)
 
-    def check_whether_current_user_owns_item(self, data):
-        if (
-            data.owner_id is not None
-            and data.owner_id != self.current_user_id()
-        ):
+    @staticmethod
+    def check_whether_current_user_owns_item(data):
+        if data.owner_id is not None and data.owner_id != current_user_id():
             raise CustomError(
                 HTTPStatus.FORBIDDEN,
                 "The current user is not the owner of this time entry",
@@ -424,7 +418,8 @@ def get_all(self, conditions: dict = None, **kwargs) -> list:
         conditions.update({"owner_id": event_ctx.user_id})
 
         custom_query = self.build_custom_query(
-            is_admin=event_ctx.is_admin, conditions=conditions,
+            is_admin=event_ctx.is_admin,
+            conditions=conditions,
         )
         date_range = self.handle_date_filter_args(args=conditions)
         limit = conditions.get("limit", None)
@@ -444,7 +439,8 @@ def get_all_paginated(self, conditions: dict = None, **kwargs) -> list:
         event_ctx = self.create_event_context("read-many")
         get_all_conditions.update({"owner_id": event_ctx.user_id})
         custom_query = self.build_custom_query(
-            is_admin=event_ctx.is_admin, conditions=get_all_conditions,
+            is_admin=event_ctx.is_admin,
+            conditions=get_all_conditions,
         )
         date_range = self.handle_date_filter_args(args=get_all_conditions)
         records_total = self.repository.count(
@@ -455,7 +451,8 @@ def get_all_paginated(self, conditions: dict = None, **kwargs) -> list:
         )
         conditions.update({"owner_id": event_ctx.user_id})
         custom_query = self.build_custom_query(
-            is_admin=event_ctx.is_admin, conditions=conditions,
+            is_admin=event_ctx.is_admin,
+            conditions=conditions,
         )
         date_range = self.handle_date_filter_args(args=conditions)
         length = conditions.get("length", None)
@@ -499,7 +496,11 @@ def update(self, id, data: dict, description=None):
         time_entry = self.repository.find(id, event_ctx)
         self.check_whether_current_user_owns_item(time_entry)
 
-        return self.repository.partial_update(id, data, event_ctx,)
+        return self.repository.partial_update(
+            id,
+            data,
+            event_ctx,
+        )
 
     def stop(self, id):
         event_ctx = self.create_event_context("update", "Stop time entry")
@@ -509,7 +510,9 @@ def stop(self, id):
         self.check_time_entry_is_not_stopped(time_entry)
 
         return self.repository.partial_update(
-            id, {'end_date': current_datetime_str()}, event_ctx,
+            id,
+            {'end_date': current_datetime_str()},
+            event_ctx,
         )
 
     def restart(self, id):
@@ -520,15 +523,18 @@ def restart(self, id):
         self.check_time_entry_is_not_started(time_entry)
 
         return self.repository.partial_update(
-            id, {'end_date': None}, event_ctx,
+            id,
+            {'end_date': None},
+            event_ctx,
         )
 
     def delete(self, id):
         event_ctx = self.create_event_context("delete")
         time_entry = self.repository.find(id, event_ctx)
         self.check_whether_current_user_owns_item(time_entry)
         self.repository.delete(
-            id, event_ctx,
+            id,
+            event_ctx,
         )
 
     def find_running(self):