Skip to content

Commit 0e1413c

Browse files
committed
fix: TT-403 comments solved
1 parent b79d442 commit 0e1413c

File tree

11 files changed

+22
-28
lines changed

11 files changed

+22
-28
lines changed

V2/tests/api/azure/time_entry_azure_endpoints_test.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,11 @@ def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_
4343

4444

4545
def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_deleted__when_its_id_is_found(
46-
create_fake_database, time_entry_factory, insert_time_entry, insert_activity, activity_factory,
46+
test_db, time_entry_factory, insert_time_entry, insert_activity, activity_factory,
4747
):
48-
db = create_fake_database
49-
azure_time_entries._delete_time_entry.DATABASE = db
50-
inserted_activity = insert_activity(activity_factory(), db).__dict__
48+
inserted_activity = insert_activity(activity_factory(), test_db).__dict__
5149
time_entry_body = time_entry_factory(activity_id=inserted_activity["id"], technologies="[jira,sql]")
52-
inserted_time_entry = insert_time_entry(time_entry_body, db)
50+
inserted_time_entry = insert_time_entry(time_entry_body, test_db)
5351

5452
req = func.HttpRequest(
5553
method='DELETE',
@@ -66,11 +64,8 @@ def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_de
6664

6765

6866
def test__delete_time_entries_azure_endpoint__returns_a_status_code_400__when_time_entry_recive_invalid_id(
69-
create_fake_database,
67+
test_db,
7068
):
71-
db = create_fake_database
72-
azure_time_entries._delete_time_entry.DATABASE = db
73-
7469
req = func.HttpRequest(
7570
method="DELETE",
7671
body=None,

V2/tests/integration/daos/time_entries_dao_test.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pytest
2-
2+
from faker import Faker
33

44
import time_tracker.time_entries._domain as domain
55
import time_tracker.time_entries._infrastructure as infrastructure
@@ -48,11 +48,10 @@ def test__time_entry__returns_None__when_not_saves_correctly(
4848
assert inserted_time_entry is None
4949

5050

51-
5251
def test_delete__returns_an_time_entry_with_true_deleted__when_an_time_entry_matching_its_id_is_found(
53-
create_fake_dao, time_entry_factory, insert_activity, activity_factory
52+
create_fake_dao, test_db, time_entry_factory, insert_activity, activity_factory
5453
):
55-
dao = create_fake_dao
54+
dao = create_fake_dao(test_db)
5655
inserted_activity = insert_activity(activity_factory(), dao.db)
5756
existent_time_entry = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
5857
inserted_time_entry = dao.create(existent_time_entry)
@@ -63,9 +62,9 @@ def test_delete__returns_an_time_entry_with_true_deleted__when_an_time_entry_mat
6362

6463

6564
def test_delete__returns_none__when_no_time_entry_matching_its_id_is_found(
66-
create_fake_dao,
65+
create_fake_dao, test_db
6766
):
68-
dao = create_fake_dao
67+
dao = create_fake_dao(test_db)
6968

7069
result = dao.delete(Faker().pyint())
7170

V2/tests/unit/services/time_entry_service_test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from faker import Faker
2+
13
from time_tracker.time_entries._domain import TimeEntryService
24

35

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# flake8: noqa
2-
from ._time_entries import delete_time_entry
2+
from ._time_entries import create_time_entry, delete_time_entry
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# flake8: noqa
2+
from ._create_time_entry import create_time_entry
23
from ._delete_time_entry import delete_time_entry

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66

77
from ... import _domain
88
from ... import _infrastructure
9-
10-
_JSON_PATH = (
11-
'time_tracker/time_entries/_infrastructure/_data_persistence/time_entries_data.json'
12-
)
9+
from time_tracker._infrastructure import DB
1310

1411

1512
def create_time_entry(req: func.HttpRequest) -> func.HttpResponse:
16-
17-
time_entry_dao = _infrastructure.TimeEntriesJsonDao(_JSON_PATH)
13+
database = DB()
14+
time_entry_dao = _infrastructure.TimeEntriesSQLDao(database)
1815
time_entry_service = _domain.TimeEntryService(time_entry_dao)
1916
use_case = _domain._use_cases.CreateTimeEntryUseCase(time_entry_service)
2017

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
from ... import _infrastructure
77
from time_tracker._infrastructure import DB
88

9-
DATABASE = DB()
10-
119

1210
def delete_time_entry(req: func.HttpRequest) -> func.HttpResponse:
13-
time_entry_dao = _infrastructure.TimeEntriesSQLDao(DATABASE)
11+
time_entry_dao = _infrastructure.TimeEntriesSQLDao(DB())
1412
time_entry_service = _domain.TimeEntryService(time_entry_dao)
1513
use_case = _domain._use_cases.DeleteTimeEntryUseCase(time_entry_service)
1614

V2/time_tracker/time_entries/_domain/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
from ._persistence_contracts import TimeEntriesDao
44
from ._services import TimeEntryService
55
from ._use_cases import (
6+
CreateTimeEntryUseCase,
67
DeleteTimeEntryUseCase
78
)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# flake8: noqa
2+
from ._create_time_entry_use_case import CreateTimeEntryUseCase
23
from ._delete_time_entry_use_case import DeleteTimeEntryUseCase

V2/time_tracker/time_entries/_domain/_use_cases/_create_time_entry_use_case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ def __init__(self, time_entry_service: TimeEntryService):
77
self.time_entry_service = time_entry_service
88

99
def create_time_entry(self, time_entry_data: TimeEntry) -> TimeEntry:
10-
return self.time_entry_service.create(time_entry_data.__dict__)
10+
return self.time_entry_service.create(time_entry_data)

0 commit comments

Comments
 (0)