Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: TT-402 Andres's resolve comments
  • Loading branch information
Jobzi committed Nov 24, 2021
commit 972cdaa4e2dfd9e165522ed6524c777046168ed0
6 changes: 3 additions & 3 deletions V2/tests/api/azure/time_entry_azure_endpoints_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_
test_db, time_entry_factory, activity_factory, insert_activity
):
inserted_activity = insert_activity(activity_factory(), test_db)
time_entry_body = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]").__dict__
time_entry_body = time_entry_factory(activity_id=inserted_activity.id).__dict__

body = json.dumps(time_entry_body).encode("utf-8")
req = func.HttpRequest(
Expand All @@ -47,7 +47,7 @@ def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_de
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]")
time_entry_body = time_entry_factory(activity_id=inserted_activity["id"])
inserted_time_entry = insert_time_entry(time_entry_body, test_db)

req = func.HttpRequest(
Expand Down Expand Up @@ -83,7 +83,7 @@ def test__update_time_entry_azure_endpoint__returns_an_time_entry__when_found_an
test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity
):
inserted_activity = insert_activity(activity_factory(), test_db)
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id)
inserted_time_entries = insert_time_entry(existent_time_entries, test_db).__dict__

time_entry_body = {"description": Faker().sentence()}
Expand Down
2 changes: 1 addition & 1 deletion V2/tests/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def _make_time_entry(
description=Faker().sentence(),
activity_id=Faker().random_int(),
uri=Faker().domain_name(),
technologies=["jira", "git"],
technologies=str(Faker().pylist()),
end_date=str(Faker().date_time()),
deleted=False,
timezone_offset="300",
Expand Down
12 changes: 6 additions & 6 deletions V2/tests/integration/daos/time_entries_dao_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def test__time_entry__returns_a_time_entry_dto__when_saves_correctly_with_sql_da
dao = create_fake_dao(test_db)
inserted_activity = insert_activity(activity_factory(), dao.db)

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

inserted_time_entry = dao.create(time_entry_to_insert)

Expand All @@ -41,7 +41,7 @@ def test__time_entry__returns_None__when_not_saves_correctly(
time_entry_factory, create_fake_dao, test_db
):
dao = create_fake_dao(test_db)
time_entry_to_insert = time_entry_factory(activity_id=1203, technologies="[jira,sql]")
time_entry_to_insert = time_entry_factory(activity_id=1203)

inserted_time_entry = dao.create(time_entry_to_insert)

Expand All @@ -53,7 +53,7 @@ def test_delete__returns_an_time_entry_with_true_deleted__when_an_time_entry_mat
):
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]")
existent_time_entry = time_entry_factory(activity_id=inserted_activity.id)
inserted_time_entry = dao.create(existent_time_entry)

result = dao.delete(inserted_time_entry.id)
Expand All @@ -76,23 +76,23 @@ def test_update__returns_an_time_entry_dto__when_found_one_time_entry_to_update(
):
dao = create_fake_dao(test_db)
inserted_activity = insert_activity(activity_factory(), dao.db)
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id)
inserted_time_entries = dao.create(existent_time_entries).__dict__
time_entry_id = inserted_time_entries["id"]
inserted_time_entries.update({"description": "description updated"})

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

assert time_entry.id == time_entry_id
assert time_entry.description == "description updated"
assert time_entry.description == inserted_time_entries.get("description")


def test_update__returns_none__when_doesnt_found_one_time_entry_to_update(
test_db, create_fake_dao, time_entry_factory, insert_activity, activity_factory
):
dao = create_fake_dao(test_db)
inserted_activity = insert_activity(activity_factory(), dao.db)
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]")
existent_time_entries = time_entry_factory(activity_id=inserted_activity.id)
inserted_time_entries = dao.create(existent_time_entries).__dict__

time_entry = dao.update(0, inserted_time_entries)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ def _update(time_entry_id: int, time_entry_data: dict) -> str:


def _create_time_entry_service(db: DB):
time_entry_sql = TimeEntriesSQLDao(db)
return TimeEntryService(time_entry_sql)
time_entry_dao = TimeEntriesSQLDao(db)
return TimeEntryService(time_entry_dao)
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def update(self, time_entry_id: int, time_entry_data: dict) -> domain.TimeEntry:

query = self.time_entry.update().where(self.time_entry.c.id == time_entry_id).values(time_entry_data)
self.db.get_session().execute(query)
query_deleted_time_entry = sqlalchemy.sql.select(self.time_entry).where(self.time_entry.c.id == time_entry_id)
time_entry = self.db.get_session().execute(query_deleted_time_entry).one_or_none()
query_updated_time_entry = sqlalchemy.sql.select(self.time_entry).where(self.time_entry.c.id == time_entry_id)
time_entry = self.db.get_session().execute(query_updated_time_entry).one_or_none()

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

Expand Down