feat: TT-403 merge resolved

Author: mandres2015

V2/tests/api/azure/time_entry_azure_endpoints_test.py

@@ -10,6 +10,10 @@
 from time_tracker._infrastructure import DB
 from time_tracker.time_entries import _domain
 
+from time_tracker.time_entries._application import _time_entries as time_entries
+
+import azure.functions as func
+import json
 
 
 TIME_ENTRY_URL = "/api/time-entries/"
@@ -19,8 +23,9 @@
 def _insert_time_entry() -> dict:
     def _new_time_entry(time_entry: _domain.TimeEntry, database: DB):
         dao = infrastructure.TimeEntriesSQLDao(database)
-        new_time_entry = dao.create(time_entry)
-        return new_time_entry.__dict__
+        query = dao.time_entry.insert(time_entry.__dict__)
+        new_time_entry = dao.db.get_session().execute(query)
+        return new_time_entry
     return _new_time_entry
 
 
@@ -81,6 +86,9 @@ def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_de
 
 
 
+def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_deleted__when_its_id_is_found(
+    create_temp_time_entries,
+):
     time_entries_json, tmp_directory = create_temp_time_entries
     time_entries.delete_time_entry.JSON_PATH = tmp_directory
     req = func.HttpRequest(
@@ -90,7 +98,6 @@ def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_de
         route_params={"id": time_entries_json[0]["id"]},
     )
 
-
     response = time_entries.delete_time_entry(req)
     time_entry_json_data = json.loads(response.get_body().decode("utf-8"))
 

V2/tests/fixtures.py

@@ -1,6 +1,5 @@
 import pytest
 import json
-import pytest
 import shutil
 from faker import Faker
 

V2/tests/integration/daos/time_entries_dao.test.py

@@ -0,0 +1,45 @@
+import json
+import pytest
+import typing
+
+from faker import Faker
+
+from time_tracker.time_entries._infrastructure import TimeEntriesJsonDao
+from time_tracker.time_entries._domain import TimeEntry
+
+
+@pytest.fixture(name="create_fake_time_entries")
+def _create_fake_time_entries(mocker) -> typing.List[TimeEntry]:
+    def _creator(time_entries):
+        read_data = json.dumps(time_entries)
+        mocker.patch("builtins.open", mocker.mock_open(read_data=read_data))
+        return [TimeEntry(**time_entry) for time_entry in time_entries]
+
+    return _creator
+
+
+def test_delete__returns_an_time_entry_with_true_deleted__when_an_time_entry_matching_its_id_is_found(
+    create_fake_time_entries, time_entry_factory
+):
+    time_entries_json_dao = TimeEntriesJsonDao(Faker().file_path())
+    time_entries = create_fake_time_entries(
+        [
+            time_entry_factory().__dict__
+        ]
+    )
+
+    time_entry_dto = time_entries[0]
+    result = time_entries_json_dao.delete(time_entry_dto.id)
+
+    assert result.deleted is True
+
+
+def test_delete__returns_none__when_no_time_entry_matching_its_id_is_found(
+    create_fake_time_entries,
+):
+    time_entries_json_dao = TimeEntriesJsonDao(Faker().file_path())
+    create_fake_time_entries([])
+
+    result = time_entries_json_dao.delete(Faker().pyint())
+
+    assert result is None

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

@@ -36,17 +36,13 @@ def __create_time_entry_dto(self, time_entry: dict) -> TimeEntry:
         time_entry = {key: time_entry.get(key) for key in self.time_entry_keys}
         return TimeEntry(**time_entry)
 
-    def get_by_id(self, time_entry_id: int) -> domain.TimeEntry:
-        query = sql.select(self.time_entry).where(self.time_entry.c.id == time_entry_id)
-        time_entry = self.db.get_session().execute(query).one_or_none()
-        return self.__create_time_entry_dto(dict(time_entry)) if time_entry else None
-
     def delete(self, time_entry_id: int) -> TimeEntry:
-
         query = (
             self.time_entry.update()
             .where(self.time_entry.c.id == time_entry_id)
             .values({"deleted": True})
         )
         self.db.get_session().execute(query)
-        return self.get_by_id(time_entry_id)
+        query_deleted_time_entry = 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

V2/time_tracker/time_entries/_infrastructure/_data_persistence/time_entries_data.json

@@ -1 +1 @@
-[{"id": 1, "start_date": "12/07/2021", "owner_id": 2, "description": "Review system of Time Tracker", "activity_id": 2, "uri": "http://time_tracker.com", "technologies": ["git", "jira", "python"], "end_date": "12/07/2021", "deleted": false, "timezone_offset": "300", "project_id": 1}, {"id": 2, "start_date": "12/07/2021", "owner_id": 2, "description": "Review system of doors in the ioet office Loja, change the current raspberry pi ", "activity_id": 2, "uri": null, "technologies": ["git", "jira", "python"], "end_date": "12/07/2021", "deleted": true, "timezone_offset": "300", "project_id": 1}]
+[{"id": 1, "start_date": "12/07/2021", "owner_id": 2, "description": "Review system of Time Tracker", "activity_id": 2, "uri": "http://time_tracker.com", "technologies": ["git", "jira", "python"], "end_date": "12/07/2021", "deleted": true, "timezone_offset": "300", "project_id": 1}, {"id": 2, "start_date": "12/07/2021", "owner_id": 2, "description": "Review system of doors in the ioet office Loja, change the current raspberry pi ", "activity_id": 2, "uri": null, "technologies": ["git", "jira", "python"], "end_date": "12/07/2021", "deleted": false, "timezone_offset": "300", "project_id": 1}]