Skip to content
Merged
Prev Previous commit
Next Next commit
feat: TT-403 created end-point to DELETE of time_entries
  • Loading branch information
ararcos committed Nov 19, 2021
commit 5c6d6697a61de033240fe6b9967a25f7123499ff
10 changes: 10 additions & 0 deletions V2/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
37 changes: 37 additions & 0 deletions V2/tests/api/azure/time_entry_azure_endpoints_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,40 @@ 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__time_entry_azure_endpoint__returns_an_time_entry_with_true_deleted__when_an_time_entry_matching_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(
method="DELETE",
body=None,
url=TIME_ENTRY_URL,
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"))

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(
create_temp_time_entries,
):
tmp_directory = create_temp_time_entries
time_entries.delete_time_entry.JSON_PATH = tmp_directory
req = func.HttpRequest(
method="DELETE",
body=None,
url=TIME_ENTRY_URL,
route_params={"id": "invalid id"},
)

response = time_entries.delete_time_entry(req)

assert response.status_code == 400
assert response.get_body() == b'Invalid Format ID'
27 changes: 27 additions & 0 deletions V2/tests/integration/daos/time_entries_dao.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,30 @@ def test_create_time_entry__returns_an_time_entry_dto__when_create_an_time_entry
time_entry_data = time_entry_factory()
result = time_entries_json_dao.create(time_entry_data.__dict__)
assert result == TimeEntry(**time_entry_data)


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 == 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
15 changes: 15 additions & 0 deletions V2/tests/unit/services/time_entry_service_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,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_change_time_entry_deleted(
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
14 changes: 14 additions & 0 deletions V2/tests/unit/use_cases/time_entries_use_case_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from pytest_mock import MockFixture
from faker import Faker

from time_tracker.time_entries._domain import _use_cases

Expand All @@ -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_change_time_entry_deleted(
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
3 changes: 2 additions & 1 deletion V2/time_tracker/time_entries/_application/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# flake8: noqa
from ._time_entries import create_time_entry
from ._time_entries import create_time_entry
from ._time_entries import delete_time_entry
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import json

import azure.functions as func

from ... import _domain
from ... import _infrastructure

_JSON_PATH = (
'time_tracker/time_entries/_infrastructure/_data_persistence/time_entries_data.json'
)


def delete_time_entry(req: func.HttpRequest) -> func.HttpResponse:
time_entry_dao = _infrastructure.TimeEntriesJsonDao(_JSON_PATH)
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__),
status_code=200,
mimetype="application/json"
)

except ValueError:
return func.HttpResponse(
body=b'Invalid Format ID',
status_code=400,
mimetype="application/json"
)

1 change: 1 addition & 0 deletions V2/time_tracker/time_entries/_domain/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
from ._services import TimeEntryService
from ._use_cases import (
CreateTimeEntryUseCase,
DeleteTimeEntryUseCase
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ class TimeEntriesDao(abc.ABC):
@abc.abstractmethod
def create(self, time_entry_data: TimeEntry) -> TimeEntry:
pass

@abc.abstractmethod
def delete(self, id: int) -> TimeEntry:
pass
3 changes: 3 additions & 0 deletions V2/time_tracker/time_entries/_domain/_services/_time_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ def __init__(self, time_entry_dao: TimeEntriesDao):

def create(self, time_entry_data: TimeEntry) -> TimeEntry:
return self.time_entry_dao.create(time_entry_data)

def delete(self, time_entry_id: int) -> TimeEntry:
return self.time_entry_dao.delete(time_entry_id)
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# flake8: noqa
from ._create_time_entry_use_case import CreateTimeEntryUseCase
from ._delete_time_entry_use_case import DeleteTimeEntryUseCase
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from time_tracker.time_entries._domain import TimeEntry, TimeEntryService


class DeleteTimeEntryUseCase:

def __init__(self, time_entry_service: TimeEntryService):
self.time_entry_service = time_entry_service

def delete_time_entry(self, id: int) -> TimeEntry:
return self.time_entry_service.delete(id)
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,34 @@ def create(self, time_entry_data: domain.TimeEntry) -> domain.TimeEntry:
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:
time_entry = {
time_entry.get('id'): time_entry
for time_entry in self.__get_time_entries_from_file()
}.get(int(time_entry_id))

if time_entry:
time_entry_deleted = {**time_entry, 'deleted': True}

time_entries_updated = list(
map(
lambda time_entry: time_entry
if time_entry.get('id') != time_entry_id
else time_entry_deleted,
self.__get_time_entries_from_file(),
)
)

try:
file = open(self.json_data_file_path, 'w')
json.dump(time_entries_updated, file)
file.close()

return self.__create_time_entry_dto(time_entry_deleted)

except FileNotFoundError:
return None

else:
return None
3 changes: 2 additions & 1 deletion V2/time_tracker/time_entries/interface.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# flake8: noqa
from ._application import create_time_entry
from ._application import create_time_entry
from ._application import delete_time_entry