refactor: TT-401 rename of functions and imports

V2/tests/api/azure/activity_azure_endpoints_test.py

@@ -9,9 +9,9 @@
 
 
 def test__activity_azure_endpoint__returns_all_activities(
-    create_fake_database, activity_factory, insert_activity
+    test_db, activity_factory, insert_activity
 ):
-    fake_database = create_fake_database
+    fake_database = test_db
     existent_activities = [activity_factory(), activity_factory()]
     inserted_activities = [
         insert_activity(existent_activities[0], fake_database).__dict__,
@@ -28,9 +28,9 @@ def test__activity_azure_endpoint__returns_all_activities(
 
 
 def test__activity_azure_endpoint__returns_an_activity__when_activity_matches_its_id(
-    create_fake_database, activity_factory, insert_activity
+    test_db, activity_factory, insert_activity
 ):
-    fake_database = create_fake_database
+    fake_database = test_db
     existent_activity = activity_factory()
     inserted_activity = insert_activity(existent_activity, fake_database).__dict__
 
@@ -50,9 +50,9 @@ def test__activity_azure_endpoint__returns_an_activity__when_activity_matches_it
 
 
 def test__activity_azure_endpoint__returns_an_activity_with_inactive_status__when_an_activity_matching_its_id_is_found(
-    create_fake_database, activity_factory, insert_activity
+    test_db, activity_factory, insert_activity
 ):
-    fake_database = create_fake_database
+    fake_database = test_db
     existent_activity = activity_factory()
     inserted_activity = insert_activity(existent_activity, fake_database).__dict__
 
@@ -73,9 +73,9 @@ def test__activity_azure_endpoint__returns_an_activity_with_inactive_status__whe
 
 
 def test__update_activity_azure_endpoint__returns_an_activity__when_found_an_activity_to_update(
-    create_fake_database, activity_factory, insert_activity
+    test_db, activity_factory, insert_activity
 ):
-    fake_database = create_fake_database
+    fake_database = test_db
     existent_activity = activity_factory()
     inserted_activity = insert_activity(existent_activity, fake_database).__dict__
 
@@ -97,9 +97,9 @@ def test__update_activity_azure_endpoint__returns_an_activity__when_found_an_act
 
 
 def test__activity_azure_endpoint__creates_an_activity__when_activity_has_all_attributes(
-     create_fake_database,
+     test_db,
  ):
-    azure_activities._create_activity.DATABASE = create_fake_database
+    azure_activities._create_activity.DATABASE = test_db
     activity_body = {
         'id': None,
         'name': Faker().user_name(),

V2/tests/api/azure/time_entry_azure_endpoints_test.py

@@ -8,9 +8,9 @@
 
 
 def test__time_entry_azure_endpoint__creates_an_time_entry__when_time_entry_has_all_attributes(
-    create_fake_database, time_entry_factory, activity_factory, insert_activity
+    test_db, time_entry_factory, activity_factory, insert_activity
 ):
-    db = create_fake_database
+    db = test_db
     inserted_activity = insert_activity(activity_factory(), db)
     time_entry_body = time_entry_factory(activity_id=inserted_activity.id, technologies="[jira,sql]").__dict__
 

V2/tests/conftest.py

@@ -1,3 +1,3 @@
 # flake8: noqa
-from fixtures import _activity_factory, _create_fake_database, _insert_activity
+from fixtures import _activity_factory, _test_db, _insert_activity
 from fixtures import _time_entry_factory

V2/tests/fixtures.py

@@ -1,18 +1,18 @@
 import pytest
 from faker import Faker
 
-import time_tracker.activities._domain as domain_activities
-import time_tracker.activities._infrastructure as infrastructure_activities
-import time_tracker.time_entries._domain as domain_time_entries
+import time_tracker.activities._domain as activities_domain
+import time_tracker.activities._infrastructure as activities_infrastructure
+import time_tracker.time_entries._domain as time_entries_domain
 from time_tracker._infrastructure import DB
 
 
 @pytest.fixture(name='activity_factory')
-def _activity_factory() -> domain_activities.Activity:
+def _activity_factory() -> activities_domain.Activity:
     def _make_activity(
         name: str = Faker().name(), description: str = Faker().sentence(), deleted: bool = False, status: int = 1
     ):
-        activity = domain_activities.Activity(
+        activity = activities_domain.Activity(
             id=None,
             name=name,
             description=description,
@@ -23,15 +23,15 @@ def _make_activity(
     return _make_activity
 
 
-@pytest.fixture(name='create_fake_database')
-def _create_fake_database() -> DB:
+@pytest.fixture(name='test_db')
+def _test_db() -> DB:
     db_fake = DB()
     db_fake.get_session().execute("pragma foreign_keys=ON")
     return db_fake
 
 
 @pytest.fixture(name='time_entry_factory')
-def _time_entry_factory() -> domain_time_entries.TimeEntry:
+def _time_entry_factory() -> time_entries_domain.TimeEntry:
     def _make_time_entry(
         id=Faker().random_int(),
         start_date=str(Faker().date_time()),
@@ -45,7 +45,7 @@ def _make_time_entry(
         timezone_offset="300",
         project_id=Faker().random_int(),
     ):
-        time_entry = domain_time_entries.TimeEntry(
+        time_entry = time_entries_domain.TimeEntry(
             id=id,
             start_date=start_date,
             owner_id=owner_id,
@@ -64,8 +64,8 @@ def _make_time_entry(
 
 @pytest.fixture(name='insert_activity')
 def _insert_activity() -> dict:
-    def _new_activity(activity: domain_activities.Activity, database: DB):
-        dao = infrastructure_activities.ActivitiesSQLDao(database)
+    def _new_activity(activity: activities_domain.Activity, database: DB):
+        dao = activities_infrastructure.ActivitiesSQLDao(database)
         new_activity = dao.create(activity)
         return new_activity
     return _new_activity

V2/tests/integration/daos/time_entries_dao_test.py

@@ -24,9 +24,9 @@ def _clean_database():
 
 
 def test__time_entry__returns_a_time_entry_dto__when_saves_correctly_with_sql_database(
-    create_fake_database, time_entry_factory, create_fake_dao, insert_activity, activity_factory
+    test_db, time_entry_factory, create_fake_dao, insert_activity, activity_factory
 ):
-    dao = create_fake_dao(create_fake_database)
+    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]")
@@ -38,9 +38,9 @@ def test__time_entry__returns_a_time_entry_dto__when_saves_correctly_with_sql_da
 
 
 def test__time_entry__returns_None__when_not_saves_correctly(
-    time_entry_factory, create_fake_dao, create_fake_database
+    time_entry_factory, create_fake_dao, test_db
 ):
-    dao = create_fake_dao(create_fake_database)
+    dao = create_fake_dao(test_db)
     time_entry_to_insert = time_entry_factory(activity_id=1203, technologies="[jira,sql]")
 
     inserted_time_entry = dao.create(time_entry_to_insert)

V2/time_tracker/_infrastructure/_config.py

@@ -1,8 +1,6 @@
 import typing
 import os
 
-CONNECTION_STRING = 'postgresql://root:root@localhost:5433/timetracker'
-
 
 class Config(typing.NamedTuple):
     DB_CONNECTION_STRING: str
@@ -15,5 +13,5 @@ def load_config():
         connection: str = os.environ.get("TEST_DB_CONNECTION")
 
     return Config(
-         CONNECTION_STRING if connection is None else connection
+      connection
     )