Skip to content

Commit 972cdaa

Browse files
committed
refactor: TT-402 Andres's resolve comments
1 parent 406e7f4 commit 972cdaa

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

V2/tests/api/azure/time_entry_azure_endpoints_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_
2626
test_db, time_entry_factory, activity_factory, insert_activity
2727
):
2828
inserted_activity = insert_activity(activity_factory(), test_db)
29-
time_entry_body = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]").__dict__
29+
time_entry_body = time_entry_factory(activity_id=inserted_activity.id).__dict__
3030

3131
body = json.dumps(time_entry_body).encode("utf-8")
3232
req = func.HttpRequest(
@@ -47,7 +47,7 @@ def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_de
4747
test_db, time_entry_factory, insert_time_entry, insert_activity, activity_factory,
4848
):
4949
inserted_activity = insert_activity(activity_factory(), test_db).__dict__
50-
time_entry_body = time_entry_factory(activity_id=inserted_activity["id"], technologies="[jira,sql]")
50+
time_entry_body = time_entry_factory(activity_id=inserted_activity["id"])
5151
inserted_time_entry = insert_time_entry(time_entry_body, test_db)
5252

5353
req = func.HttpRequest(
@@ -83,7 +83,7 @@ def test__update_time_entry_azure_endpoint__returns_an_time_entry__when_found_an
8383
test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity
8484
):
8585
inserted_activity = insert_activity(activity_factory(), test_db)
86-
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
86+
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id)
8787
inserted_time_entries = insert_time_entry(existent_time_entries, test_db).__dict__
8888

8989
time_entry_body = {"description": Faker().sentence()}

V2/tests/fixtures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def _make_time_entry(
4444
description=Faker().sentence(),
4545
activity_id=Faker().random_int(),
4646
uri=Faker().domain_name(),
47-
technologies=["jira", "git"],
47+
technologies=str(Faker().pylist()),
4848
end_date=str(Faker().date_time()),
4949
deleted=False,
5050
timezone_offset="300",

V2/tests/integration/daos/time_entries_dao_test.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test__time_entry__returns_a_time_entry_dto__when_saves_correctly_with_sql_da
2929
dao = create_fake_dao(test_db)
3030
inserted_activity = insert_activity(activity_factory(), dao.db)
3131

32-
time_entry_to_insert = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
32+
time_entry_to_insert = time_entry_factory(activity_id=inserted_activity.id)
3333

3434
inserted_time_entry = dao.create(time_entry_to_insert)
3535

@@ -41,7 +41,7 @@ def test__time_entry__returns_None__when_not_saves_correctly(
4141
time_entry_factory, create_fake_dao, test_db
4242
):
4343
dao = create_fake_dao(test_db)
44-
time_entry_to_insert = time_entry_factory(activity_id=1203, technologies="[jira,sql]")
44+
time_entry_to_insert = time_entry_factory(activity_id=1203)
4545

4646
inserted_time_entry = dao.create(time_entry_to_insert)
4747

@@ -53,7 +53,7 @@ def test_delete__returns_an_time_entry_with_true_deleted__when_an_time_entry_mat
5353
):
5454
dao = create_fake_dao(test_db)
5555
inserted_activity = insert_activity(activity_factory(), dao.db)
56-
existent_time_entry = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
56+
existent_time_entry = time_entry_factory(activity_id=inserted_activity.id)
5757
inserted_time_entry = dao.create(existent_time_entry)
5858

5959
result = dao.delete(inserted_time_entry.id)
@@ -76,23 +76,23 @@ def test_update__returns_an_time_entry_dto__when_found_one_time_entry_to_update(
7676
):
7777
dao = create_fake_dao(test_db)
7878
inserted_activity = insert_activity(activity_factory(), dao.db)
79-
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
79+
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id)
8080
inserted_time_entries = dao.create(existent_time_entries).__dict__
8181
time_entry_id = inserted_time_entries["id"]
8282
inserted_time_entries.update({"description": "description updated"})
8383

8484
time_entry = dao.update(time_entry_id=time_entry_id, time_entry_data=inserted_time_entries)
8585

8686
assert time_entry.id == time_entry_id
87-
assert time_entry.description == "description updated"
87+
assert time_entry.description == inserted_time_entries.get("description")
8888

8989

9090
def test_update__returns_none__when_doesnt_found_one_time_entry_to_update(
9191
test_db, create_fake_dao, time_entry_factory, insert_activity, activity_factory
9292
):
9393
dao = create_fake_dao(test_db)
9494
inserted_activity = insert_activity(activity_factory(), dao.db)
95-
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
95+
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id)
9696
inserted_time_entries = dao.create(existent_time_entries).__dict__
9797

9898
time_entry = dao.update(0, inserted_time_entries)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ def _update(time_entry_id: int, time_entry_data: dict) -> str:
4343

4444

4545
def _create_time_entry_service(db: DB):
46-
time_entry_sql = TimeEntriesSQLDao(db)
47-
return TimeEntryService(time_entry_sql)
46+
time_entry_dao = TimeEntriesSQLDao(db)
47+
return TimeEntryService(time_entry_dao)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ def update(self, time_entry_id: int, time_entry_data: dict) -> domain.TimeEntry:
4848

4949
query = self.time_entry.update().where(self.time_entry.c.id == time_entry_id).values(time_entry_data)
5050
self.db.get_session().execute(query)
51-
query_deleted_time_entry = sqlalchemy.sql.select(self.time_entry).where(self.time_entry.c.id == time_entry_id)
52-
time_entry = self.db.get_session().execute(query_deleted_time_entry).one_or_none()
51+
query_updated_time_entry = sqlalchemy.sql.select(self.time_entry).where(self.time_entry.c.id == time_entry_id)
52+
time_entry = self.db.get_session().execute(query_updated_time_entry).one_or_none()
5353

5454
return self.__create_time_entry_dto(dict(time_entry)) if time_entry else None
5555

0 commit comments

Comments
 (0)