diff --git a/V2/tests/api/azure/time_entry_azure_endpoints_test.py b/V2/tests/api/azure/time_entry_azure_endpoints_test.py index 4b4ff902..0558b7c8 100644 --- a/V2/tests/api/azure/time_entry_azure_endpoints_test.py +++ b/V2/tests/api/azure/time_entry_azure_endpoints_test.py @@ -19,6 +19,7 @@ def _new_time_entry(time_entry: _domain.TimeEntry, database: DB): return new_time_entry.__dict__ return _new_time_entry + def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_all_attributes( test_db, time_entry_factory, activity_factory, insert_activity ): @@ -39,33 +40,30 @@ 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_all_time_entries( - create_fake_database, time_entry_factory, insert_time_entry, activity_factory, insert_activity + test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity ): - fake_database = create_fake_database - inserted_activity = insert_activity(activity_factory(), fake_database) + inserted_activity = insert_activity(activity_factory(), test_db) existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]") - inserted_time_entries = [insert_time_entry(existent_time_entries, fake_database)] + inserted_time_entries = insert_time_entry(existent_time_entries, test_db) - azure_time_entries._get_time_entries.DATABASE = fake_database req = func.HttpRequest(method="GET", body=None, url=TIME_ENTRY_URL) response = azure_time_entries.get_time_entries(req) time_entries_json_data = response.get_body().decode("utf-8") + time_entry_list = json.loads(time_entries_json_data) assert response.status_code == 200 - assert time_entries_json_data == json.dumps(inserted_time_entries) + assert time_entry_list.pop() == inserted_time_entries def test__time_entry_azure_endpoint__returns_an_time_entry__when_time_entry_matches_its_id( - create_fake_database, time_entry_factory, insert_time_entry, activity_factory, insert_activity + test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity ): - fake_database = create_fake_database - inserted_activity = insert_activity(activity_factory(), fake_database) + inserted_activity = insert_activity(activity_factory(), test_db) existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]") - inserted_time_entries = insert_time_entry(existent_time_entries, fake_database) - - azure_time_entries._get_time_entries.DATABASE = fake_database + inserted_time_entries = insert_time_entry(existent_time_entries, test_db) req = func.HttpRequest( method="GET", @@ -82,14 +80,12 @@ def test__time_entry_azure_endpoint__returns_an_time_entry__when_time_entry_matc def test__get_time_entries_azure_endpoint__returns_a_status_code_400__when_time_entry_recive_invalid_id( - create_fake_database, time_entry_factory, insert_time_entry, activity_factory, insert_activity + test_db, time_entry_factory, insert_time_entry, activity_factory, insert_activity ): - fake_database = create_fake_database - inserted_activity = insert_activity(activity_factory(), fake_database) + inserted_activity = insert_activity(activity_factory(), test_db) existent_time_entries = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]") - insert_time_entry(existent_time_entries, fake_database) + insert_time_entry(existent_time_entries, test_db) - azure_time_entries._get_time_entries.DATABASE = fake_database req = func.HttpRequest( method="GET", body=None, diff --git a/V2/tests/conftest.py b/V2/tests/conftest.py index e812e4d9..902357e6 100644 --- a/V2/tests/conftest.py +++ b/V2/tests/conftest.py @@ -1,2 +1,2 @@ # flake8: noqa -from fixtures import _activity_factory, _test_db, _create_fake_database, _create_fake_dao, _time_entry_factory,_insert_activity +from fixtures import _activity_factory, _test_db, _create_fake_dao, _time_entry_factory,_insert_activity diff --git a/V2/tests/fixtures.py b/V2/tests/fixtures.py index 4fdf490e..9c66ece6 100644 --- a/V2/tests/fixtures.py +++ b/V2/tests/fixtures.py @@ -29,6 +29,7 @@ def _test_db() -> DB: db_fake.get_session().execute("pragma foreign_keys=ON") return db_fake + @pytest.fixture(name='create_fake_dao') def _create_fake_dao() -> domain_activities.ActivitiesDao: db_fake = DB('sqlite:///:memory:') @@ -36,12 +37,6 @@ def _create_fake_dao() -> domain_activities.ActivitiesDao: return dao -@pytest.fixture(name='create_fake_database') -def _create_fake_database() -> DB: - db_fake = DB('sqlite:///:memory:') - return db_fake - - @pytest.fixture(name='time_entry_factory') def _time_entry_factory() -> domain_time_entries.TimeEntry: def _make_time_entry( diff --git a/V2/time_tracker/time_entries/_application/_time_entries/_get_time_entries.py b/V2/time_tracker/time_entries/_application/_time_entries/_get_time_entries.py index 1ce05900..954dc368 100644 --- a/V2/time_tracker/time_entries/_application/_time_entries/_get_time_entries.py +++ b/V2/time_tracker/time_entries/_application/_time_entries/_get_time_entries.py @@ -5,8 +5,6 @@ import azure.functions as func import json -DATABASE = DB() - def get_time_entries(req: func.HttpRequest) -> func.HttpResponse: @@ -30,8 +28,9 @@ def get_time_entries(req: func.HttpRequest) -> func.HttpResponse: def _get_by_id(id: int) -> str: + database = DB() time_entry_use_case = _use_cases.GetTimeEntryUseCase( - _create_time_entry_service(DATABASE) + _create_time_entry_service(database) ) time_entry = time_entry_use_case.get_time_entry_by_id(id) @@ -39,8 +38,9 @@ def _get_by_id(id: int) -> str: def _get_all() -> str: + database = DB() time_entries_use_case = _use_cases.GetTimeEntriesUseCase( - _create_time_entry_service(DATABASE) + _create_time_entry_service(database) ) return json.dumps( [ diff --git a/V2/time_tracker/time_entries/_domain/_services/_time_entry.py b/V2/time_tracker/time_entries/_domain/_services/_time_entry.py index 68f39a30..4878900c 100644 --- a/V2/time_tracker/time_entries/_domain/_services/_time_entry.py +++ b/V2/time_tracker/time_entries/_domain/_services/_time_entry.py @@ -6,7 +6,7 @@ class TimeEntryService: def __init__(self, time_entry_dao: TimeEntriesDao): self.time_entry_dao = time_entry_dao - + def create(self, time_entry_data: TimeEntry) -> TimeEntry: return self.time_entry_dao.create(time_entry_data)