Skip to content

Commit 55e6de1

Browse files
committed
test: TT-404 fix get all time entries test
1 parent 400c008 commit 55e6de1

File tree

2 files changed

+15
-21
lines changed

2 files changed

+15
-21
lines changed

V2/tests/api/azure/time_entry_azure_endpoints_test.py

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,28 @@ def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_
4242

4343

4444
def test__time_entry_azure_endpoint__returns_all_time_entries(
45-
create_fake_database, time_entry_factory, insert_time_entry, activity_factory, insert_activity
45+
test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity
4646
):
47-
fake_database = create_fake_database
48-
inserted_activity = insert_activity(activity_factory(), fake_database)
47+
inserted_activity = insert_activity(activity_factory(), test_db)
4948
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
50-
inserted_time_entries = [insert_time_entry(existent_time_entries, fake_database)]
49+
inserted_time_entries = insert_time_entry(existent_time_entries, test_db)
5150

52-
azure_time_entries._get_time_entries.DATABASE = fake_database
5351
req = func.HttpRequest(method="GET", body=None, url=TIME_ENTRY_URL)
5452

5553
response = azure_time_entries.get_time_entries(req)
5654
time_entries_json_data = response.get_body().decode("utf-8")
55+
time_entry_list = json.loads(time_entries_json_data)
5756

5857
assert response.status_code == 200
59-
assert time_entries_json_data == json.dumps(inserted_time_entries)
58+
assert time_entry_list.pop() == inserted_time_entries
6059

6160

6261
def test__time_entry_azure_endpoint__returns_an_time_entry__when_time_entry_matches_its_id(
63-
create_fake_database, time_entry_factory, insert_time_entry, activity_factory, insert_activity
62+
test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity
6463
):
65-
fake_database = create_fake_database
66-
inserted_activity = insert_activity(activity_factory(), fake_database)
64+
inserted_activity = insert_activity(activity_factory(), test_db)
6765
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
68-
inserted_time_entries = insert_time_entry(existent_time_entries, fake_database)
69-
70-
azure_time_entries._get_time_entries.DATABASE = fake_database
66+
inserted_time_entries = insert_time_entry(existent_time_entries, test_db)
7167

7268
req = func.HttpRequest(
7369
method="GET",
@@ -84,14 +80,12 @@ def test__time_entry_azure_endpoint__returns_an_time_entry__when_time_entry_matc
8480

8581

8682
def test__get_time_entries_azure_endpoint__returns_a_status_code_400__when_time_entry_recive_invalid_id(
87-
create_fake_database, time_entry_factory, insert_time_entry, activity_factory, insert_activity
83+
test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity
8884
):
89-
fake_database = create_fake_database
90-
inserted_activity = insert_activity(activity_factory(), fake_database)
85+
inserted_activity = insert_activity(activity_factory(), test_db)
9186
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
92-
insert_time_entry(existent_time_entries, fake_database)
87+
insert_time_entry(existent_time_entries, test_db)
9388

94-
azure_time_entries._get_time_entries.DATABASE = fake_database
9589
req = func.HttpRequest(
9690
method="GET",
9791
body=None,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import azure.functions as func
66
import json
77

8-
DATABASE = DB()
9-
108

119
def get_time_entries(req: func.HttpRequest) -> func.HttpResponse:
1210

@@ -30,17 +28,19 @@ def get_time_entries(req: func.HttpRequest) -> func.HttpResponse:
3028

3129

3230
def _get_by_id(id: int) -> str:
31+
database = DB()
3332
time_entry_use_case = _use_cases.GetTimeEntryUseCase(
34-
_create_time_entry_service(DATABASE)
33+
_create_time_entry_service(database)
3534
)
3635
time_entry = time_entry_use_case.get_time_entry_by_id(id)
3736

3837
return json.dumps(time_entry.__dict__) if time_entry else b'Not Found'
3938

4039

4140
def _get_all() -> str:
41+
database = DB()
4242
time_entries_use_case = _use_cases.GetTimeEntriesUseCase(
43-
_create_time_entry_service(DATABASE)
43+
_create_time_entry_service(database)
4444
)
4545
return json.dumps(
4646
[

0 commit comments

Comments
 (0)