fix: TT-401 change in activity database instance and refactor test

Author: ararcos

V2/Makefile

@@ -17,7 +17,7 @@ install:
 
 .PHONY: test
 test: export ENVIRONMENT = test
-test: export TEST_DB_CONNECTION = sqlite:///:memory:
+test: export TEST_DB_CONNECTION = sqlite:///file:memory?mode=memory&cache=shared&uri=true
 test:
 		@echo "=========================================Lint with flake8========================================="
 		flake8 . --show-source --statistics

V2/tests/api/azure/activity_azure_endpoints_test.py

@@ -17,8 +17,6 @@ def test__activity_azure_endpoint__returns_all_activities(
         insert_activity(existent_activities[1], test_db).__dict__
     ]
 
-    azure_activities._get_activities.DATABASE = test_db
-
     req = func.HttpRequest(method='GET', body=None, url=ACTIVITY_URL)
     response = azure_activities._get_activities.get_activities(req)
     activities_json_data = response.get_body().decode("utf-8")
@@ -33,7 +31,6 @@ def test__activity_azure_endpoint__returns_an_activity__when_activity_matches_it
     existent_activity = activity_factory()
     inserted_activity = insert_activity(existent_activity, test_db).__dict__
 
-    azure_activities._get_activities.DATABASE = test_db
     req = func.HttpRequest(
         method='GET',
         body=None,
@@ -54,7 +51,6 @@ def test__activity_azure_endpoint__returns_an_activity_with_inactive_status__whe
     existent_activity = activity_factory()
     inserted_activity = insert_activity(existent_activity, test_db).__dict__
 
-    azure_activities._delete_activity.DATABASE = test_db
     req = func.HttpRequest(
         method='DELETE',
         body=None,
@@ -76,7 +72,6 @@ def test__update_activity_azure_endpoint__returns_an_activity__when_found_an_act
     existent_activity = activity_factory()
     inserted_activity = insert_activity(existent_activity, test_db).__dict__
 
-    azure_activities._update_activity.DATABASE = test_db
     activity_body = {"description": Faker().sentence()}
     req = func.HttpRequest(
         method='PUT',

V2/tests/integration/daos/activities_sql_dao_test.py renamed to V2/tests/integration/daos/activities_dao_test.py

@@ -9,15 +9,15 @@
 
 @pytest.fixture(name='create_fake_dao')
 def _create_fake_dao() -> domain.ActivitiesDao:
-    db_fake = DB('sqlite:///:memory:')
+    db_fake = DB()
     dao = infrastructure.ActivitiesSQLDao(db_fake)
     return dao
 
 
 @pytest.fixture(name='clean_database', autouse=True)
 def _clean_database():
     yield
-    db_fake = DB('sqlite:///:memory:')
+    db_fake = DB()
     dao = infrastructure.ActivitiesSQLDao(db_fake)
     query = dao.activity.delete()
     dao.db.get_session().execute(query)

V2/time_tracker/activities/_application/_activities/_create_activity.py

@@ -8,11 +8,10 @@
 from ... import _infrastructure
 from time_tracker._infrastructure import DB
 
-DATABASE = DB()
-
 
 def create_activity(req: func.HttpRequest) -> func.HttpResponse:
-    activity_dao = _infrastructure.ActivitiesSQLDao(DATABASE)
+    database = DB()
+    activity_dao = _infrastructure.ActivitiesSQLDao(database)
     activity_service = _domain.ActivityService(activity_dao)
     use_case = _domain._use_cases.CreateActivityUseCase(activity_service)
 

V2/time_tracker/activities/_application/_activities/_delete_activity.py

@@ -7,8 +7,6 @@
 from ... import _infrastructure
 from time_tracker._infrastructure import DB
 
-DATABASE = DB()
-
 
 def delete_activity(req: func.HttpRequest) -> func.HttpResponse:
     logging.info(
@@ -29,8 +27,9 @@ def delete_activity(req: func.HttpRequest) -> func.HttpResponse:
 
 
 def _delete(activity_id: int) -> str:
+    database = DB()
     activity_use_case = _domain._use_cases.DeleteActivityUseCase(
-        _create_activity_service(DATABASE)
+        _create_activity_service(database)
     )
     activity = activity_use_case.delete_activity(activity_id)
     return json.dumps(activity.__dict__) if activity else b'Not found'

V2/time_tracker/activities/_application/_activities/_get_activities.py

@@ -7,10 +7,9 @@
 from ... import _infrastructure
 from time_tracker._infrastructure import DB
 
-DATABASE = DB()
-
 
 def get_activities(req: func.HttpRequest) -> func.HttpResponse:
+    database = DB()
     logging.info(
         'Python HTTP trigger function processed a request to get an activity.'
     )
@@ -19,11 +18,11 @@ def get_activities(req: func.HttpRequest) -> func.HttpResponse:
 
     try:
         if activity_id:
-            response = _get_by_id(int(activity_id))
+            response = _get_by_id(int(activity_id), database)
             if response == b'Not Found':
                 status_code = 404
         else:
-            response = _get_all()
+            response = _get_all(database)
 
         return func.HttpResponse(
             body=response, status_code=status_code, mimetype="application/json"
@@ -34,18 +33,18 @@ def get_activities(req: func.HttpRequest) -> func.HttpResponse:
         )
 
 
-def _get_by_id(activity_id: int) -> str:
+def _get_by_id(activity_id: int, database: DB) -> str:
     activity_use_case = _domain._use_cases.GetActivityUseCase(
-        _create_activity_service(DATABASE)
+        _create_activity_service(database)
     )
     activity = activity_use_case.get_activity_by_id(activity_id)
 
     return json.dumps(activity.__dict__) if activity else b'Not Found'
 
 
-def _get_all() -> str:
+def _get_all(database: DB) -> str:
     activities_use_case = _domain._use_cases.GetActivitiesUseCase(
-        _create_activity_service(DATABASE)
+        _create_activity_service(database)
     )
     return json.dumps(
         [

V2/time_tracker/activities/_application/_activities/_update_activity.py

@@ -8,8 +8,6 @@
 from ... import _infrastructure
 from time_tracker._infrastructure import DB
 
-DATABASE = DB()
-
 
 def update_activity(req: func.HttpRequest) -> func.HttpResponse:
     logging.info(
@@ -37,8 +35,9 @@ def update_activity(req: func.HttpRequest) -> func.HttpResponse:
 
 
 def _update(activity_id: int, activity_data: dict) -> str:
+    database = DB()
     activity_use_case = _domain._use_cases.UpdateActivityUseCase(
-        _create_activity_service(DATABASE)
+        _create_activity_service(database)
     )
     activity = activity_use_case.update_activity(
         activity_id, activity_data.get("name"),

V2/time_tracker/activities/_infrastructure/_data_persistence/__init__.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-from ._activities_sql_dao import ActivitiesSQLDao
+from ._activities_dao import ActivitiesSQLDao