Merge branch 'master' into 229_make_admin

Author: Juan Gabriel Guzmán

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 <!--next-version-placeholder-->
 
+## v0.24.5 (2020-11-16)
+### Fix
+* Remove static method from TimeEntriesDao #227 ([`b0a3bd5`](https://github.com/ioet/time-tracker-backend/commit/b0a3bd530c3449713ee2eb1793e5fbb238ef0c68))
+
 ## v0.24.4 (2020-11-14)
 ### Fix
 * Delete ui-task template ([`0be1370`](https://github.com/ioet/time-tracker-backend/commit/0be1370d81f4dcec739ed2bf8f3eff25640af36b))

tests/conftest.py

@@ -11,7 +11,7 @@
 from time_tracker_api import create_app
 from time_tracker_api.database import init_sql
 from time_tracker_api.security import get_or_generate_dev_secret_key
-from time_tracker_api.time_entries.time_entries_model import (
+from time_tracker_api.time_entries.time_entries_repository import (
     TimeEntryCosmosDBRepository,
 )
 

tests/time_tracker_api/time_entries/time_entries_model_test.py

@@ -3,9 +3,11 @@
 
 from commons.data_access_layer.database import EventContext
 from time_tracker_api.time_entries.time_entries_model import (
-    TimeEntryCosmosDBRepository,
     TimeEntryCosmosDBModel,
 )
+from time_tracker_api.time_entries.time_entries_repository import (
+    TimeEntryCosmosDBRepository,
+)
 
 
 def create_time_entry(
@@ -174,16 +176,20 @@ def test_find_interception_should_ignore_id_of_existing_item(
     )
 
     try:
-        colliding_result = time_entry_repository.find_interception_with_date_range(
-            start_date, end_date, owner_id, tenant_id
+        colliding_result = (
+            time_entry_repository.find_interception_with_date_range(
+                start_date, end_date, owner_id, tenant_id
+            )
         )
 
-        non_colliding_result = time_entry_repository.find_interception_with_date_range(
-            start_date,
-            end_date,
-            owner_id,
-            tenant_id,
-            ignore_id=existing_item.id,
+        non_colliding_result = (
+            time_entry_repository.find_interception_with_date_range(
+                start_date,
+                end_date,
+                owner_id,
+                tenant_id,
+                ignore_id=existing_item.id,
+            )
         )
 
         assert colliding_result is not None