feat: TT-403 delete v2 time entries (#346)

* feat: TT-401 Implemented service, end-point, dao, test- time entries

* feat: TT-401 validated request create time entry

* fix: TT-401 implemented faker url

* feat: TT-403 created end-point to DELETE of time_entries

* fix: TT-403 validation of id as integer

* fix: TT-403 remove method POST

* feat: TT-403 rebase with master

* feat: TT-403 tests added

* refactor: TT-403 correct flake8 lint syntax

* fix: TT-403 comments solved

* fix: TT-403 correction of rebase

* refactor: TT-403 renamed of delete test

Co-authored-by: mandres2015 <[email protected]>

Author: ararcos

V2/serverless.yml

@@ -86,3 +86,13 @@ functions:
             - POST
           route: time-entries/
           authLevel: anonymous
+
+  delete_time_entry:
+    handler: time_tracker/time_entries/interface.delete_time_entry
+    events:
+      - http: true
+        x-azure-settings:
+          methods:
+            - DELETE
+          route: time-entries/{id}
+          authLevel: anonymous

V2/tests/api/azure/time_entry_azure_endpoints_test.py

@@ -1,12 +1,26 @@
+import pytest
 import json
 
 import azure.functions as func
 
 import time_tracker.time_entries._application._time_entries as azure_time_entries
+from time_tracker._infrastructure import DB
+from time_tracker.time_entries import _domain as domain_time_entries
+from time_tracker.time_entries import _infrastructure as infrastructure_time_entries
+
 
 TIME_ENTRY_URL = "/api/time-entries/"
 
 
+@pytest.fixture(name='insert_time_entry')
+def _insert_time_entry() -> domain_time_entries.TimeEntry:
+    def _new_time_entry(time_entry: domain_time_entries.TimeEntry, database: DB):
+        dao = infrastructure_time_entries.TimeEntriesSQLDao(database)
+        new_time_entry = dao.create(time_entry)
+        return new_time_entry
+    return _new_time_entry
+
+
 def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_all_attributes(
     test_db, time_entry_factory, activity_factory, insert_activity
 ):
@@ -26,3 +40,39 @@ def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_
 
     assert response.status_code == 201
     assert time_entry_json_data == time_entry_body
+
+
+def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_deleted__when_its_id_is_found(
+    test_db, time_entry_factory, insert_time_entry, insert_activity, activity_factory,
+):
+    inserted_activity = insert_activity(activity_factory(), test_db).__dict__
+    time_entry_body = time_entry_factory(activity_id=inserted_activity["id"], technologies="[jira,sql]")
+    inserted_time_entry = insert_time_entry(time_entry_body, test_db)
+
+    req = func.HttpRequest(
+        method='DELETE',
+        body=None,
+        url=TIME_ENTRY_URL,
+        route_params={"id": inserted_time_entry.id},
+    )
+
+    response = azure_time_entries._delete_time_entry.delete_time_entry(req)
+    time_entry_json_data = json.loads(response.get_body().decode("utf-8"))
+
+    assert response.status_code == 200
+    assert time_entry_json_data['deleted'] is True
+
+
+def test__delete_time_entries_azure_endpoint__returns_a_status_code_400__when_time_entry_recive_invalid_id(
+):
+    req = func.HttpRequest(
+        method="DELETE",
+        body=None,
+        url=TIME_ENTRY_URL,
+        route_params={"id": "invalid id"},
+    )
+
+    response = azure_time_entries._delete_time_entry.delete_time_entry(req)
+
+    assert response.status_code == 400
+    assert response.get_body() == b'Invalid Format ID'

V2/tests/fixtures.py

@@ -10,7 +10,10 @@
 @pytest.fixture(name='activity_factory')
 def _activity_factory() -> activities_domain.Activity:
     def _make_activity(
-        name: str = Faker().name(), description: str = Faker().sentence(), deleted: bool = False, status: int = 1
+        name: str = Faker().name(),
+        description: str = Faker().sentence(),
+        deleted: bool = False,
+        status: int = 1,
     ):
         activity = activities_domain.Activity(
             id=None,
@@ -20,6 +23,7 @@ def _make_activity(
             status=status
             )
         return activity
+
     return _make_activity
 
 

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
@@ -46,3 +46,26 @@ def test__time_entry__returns_None__when_not_saves_correctly(
     inserted_time_entry = dao.create(time_entry_to_insert)
 
     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, test_db, time_entry_factory, insert_activity, activity_factory
+):
+    dao = create_fake_dao(test_db)
+    inserted_activity = insert_activity(activity_factory(), dao.db)
+    existent_time_entry = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
+    inserted_time_entry = dao.create(existent_time_entry)
+
+    result = dao.delete(inserted_time_entry.id)
+
+    assert result.deleted is True
+
+
+def test_delete__returns_none__when_no_time_entry_matching_its_id_is_found(
+    create_fake_dao, test_db
+):
+    dao = create_fake_dao(test_db)
+
+    result = dao.delete(Faker().pyint())
+
+    assert result is None

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
 
 
@@ -12,3 +14,18 @@ def test__create_time_entries__uses_the_time_entry_dao__to_create_an_time_entry(
 
     assert time_entry_dao.create.called
     assert expected_time_entry == actual_time_entry
+
+
+def test__delete_time_entry__uses_the_time_entry_dao__to_delete_time_entry_selected(
+    mocker,
+):
+    expected_time_entry = mocker.Mock()
+    time_entry_dao = mocker.Mock(
+        delete=mocker.Mock(return_value=expected_time_entry)
+    )
+
+    time_entry_service = TimeEntryService(time_entry_dao)
+    deleted_time_entry = time_entry_service.delete(Faker().pyint())
+
+    assert time_entry_dao.delete.called
+    assert expected_time_entry == deleted_time_entry

V2/tests/unit/use_cases/time_entries_use_case_test.py

@@ -1,4 +1,5 @@
 from pytest_mock import MockFixture
+from faker import Faker
 
 from time_tracker.time_entries._domain import _use_cases
 
@@ -16,3 +17,16 @@ def test__create_time_entry_function__uses_the_time_entries_service__to_create_t
 
     assert time_entry_service.create.called
     assert expected_time_entry == actual_time_entry
+
+
+def test__delete_time_entry_function__uses_the_time_entry_service__to_delete_time_entry_selected(
+    mocker: MockFixture,
+):
+    expected_time_entry = mocker.Mock()
+    time_entry_service = mocker.Mock(delete=mocker.Mock(return_value=expected_time_entry))
+
+    time_entry_use_case = _use_cases.DeleteTimeEntryUseCase(time_entry_service)
+    deleted_time_entry = time_entry_use_case.delete_time_entry(Faker().pyint())
+
+    assert time_entry_service.delete.called
+    assert expected_time_entry == deleted_time_entry

V2/time_tracker/time_entries/_application/__init__.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-from ._time_entries import create_time_entry
+from ._time_entries import create_time_entry, delete_time_entry

V2/time_tracker/time_entries/_application/_time_entries/__init__.py

@@ -1,2 +1,3 @@
 # flake8: noqa
-from ._create_time_entry import create_time_entry
+from ._create_time_entry import create_time_entry
+from ._delete_time_entry import delete_time_entry

V2/time_tracker/time_entries/_application/_time_entries/_delete_time_entry.py

@@ -0,0 +1,36 @@
+import json
+
+import azure.functions as func
+
+from ... import _domain
+from ... import _infrastructure
+from time_tracker._infrastructure import DB
+
+
+def delete_time_entry(req: func.HttpRequest) -> func.HttpResponse:
+    time_entry_dao = _infrastructure.TimeEntriesSQLDao(DB())
+    time_entry_service = _domain.TimeEntryService(time_entry_dao)
+    use_case = _domain._use_cases.DeleteTimeEntryUseCase(time_entry_service)
+
+    try:
+        time_entry_id = int(req.route_params.get("id"))
+        deleted_time_entry = use_case.delete_time_entry(time_entry_id)
+        if not deleted_time_entry:
+            return func.HttpResponse(
+                body="Not found",
+                status_code=404,
+                mimetype="application/json"
+            )
+
+        return func.HttpResponse(
+            body=json.dumps(deleted_time_entry.__dict__, default=str),
+            status_code=200,
+            mimetype="application/json",
+        )
+
+    except ValueError:
+        return func.HttpResponse(
+            body=b"Invalid Format ID",
+            status_code=400,
+            mimetype="application/json"
+        )

V2/time_tracker/time_entries/_domain/__init__.py

@@ -4,4 +4,5 @@
 from ._services import TimeEntryService
 from ._use_cases import (
     CreateTimeEntryUseCase,
+    DeleteTimeEntryUseCase
 )