fix: TT-403 rebase onto master

Author: ararcos

V2/tests/api/azure/time_entry_azure_endpoints_test.py

@@ -43,9 +43,9 @@ def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_
 
 
 def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_deleted__when_its_id_is_found(
-    create_fake_database, time_entry_factory, insert_time_entry, insert_activity, activity_factory,
+    test_db, time_entry_factory, insert_time_entry, insert_activity, activity_factory,
 ):
-    db = create_fake_database
+    db = test_db
     azure_time_entries._delete_time_entry.DATABASE = db
     inserted_activity = insert_activity(activity_factory(), db).__dict__
     time_entry_body = time_entry_factory(activity_id=inserted_activity["id"], technologies="[jira,sql]")
@@ -66,9 +66,9 @@ def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_de
 
 
 def test__delete_time_entries_azure_endpoint__returns_a_status_code_400__when_time_entry_recive_invalid_id(
-    create_fake_database,
+    test_db,
 ):
-    db = create_fake_database
+    db = test_db
     azure_time_entries._delete_time_entry.DATABASE = db
 
     req = func.HttpRequest(

V2/tests/integration/daos/time_entries_dao_test.py

@@ -1,5 +1,5 @@
 import pytest
-
+from faker import Faker
 
 import time_tracker.time_entries._domain as domain
 import time_tracker.time_entries._infrastructure as infrastructure
@@ -48,7 +48,6 @@ def test__time_entry__returns_None__when_not_saves_correctly(
     assert inserted_time_entry is None
 
 
-
 def test_delete__returns_an_time_entry_with_true_deleted__when_an_time_entry_matching_its_id_is_found(
     create_fake_dao, time_entry_factory, insert_activity, activity_factory
 ):

V2/tests/unit/services/time_entry_service_test.py

@@ -1,3 +1,5 @@
+from faker import Faker
+
 from time_tracker.time_entries._domain import TimeEntryService
 
 

V2/time_tracker/time_entries/_infrastructure/_data_persistence/_time_entries_dao.py

@@ -48,13 +48,13 @@ def __create_time_entry_dto(self, time_entry: dict) -> domain.TimeEntry:
         time_entry = {key: time_entry.get(key) for key in self.time_entry_key}
         return domain.TimeEntry(**time_entry)
 
-    def delete(self, time_entry_id: int) -> TimeEntry:
+    def delete(self, time_entry_id: int) -> domain.TimeEntry:
         query = (
             self.time_entry.update()
             .where(self.time_entry.c.id == time_entry_id)
             .values({"deleted": True})
         )
         self.db.get_session().execute(query)
-        query_deleted_time_entry = sql.select(self.time_entry).where(self.time_entry.c.id == time_entry_id)
+        query_deleted_time_entry = sqlalchemy.sql.select(self.time_entry).where(self.time_entry.c.id == time_entry_id)
         time_entry = self.db.get_session().execute(query_deleted_time_entry).one_or_none()
         return self.__create_time_entry_dto(dict(time_entry)) if time_entry else None