fix: TT-357 Remove and update files related to activity_json_dao

Author: ararcos

V2/tests/api/api_fixtures.py

@@ -36,7 +36,7 @@ def _create_fake_database() -> domain.ActivitiesDao:
     ]
 
     query = db_fake.activity.insert()
-    db_fake.connection.execute(query, demo_data)
+    db_fake.get_session().execute(query, demo_data)
     return db_fake, demo_data
 
 def test__activity_azure_endpoint__returns_all_activities(
@@ -122,7 +122,7 @@ def test__activity_azure_endpoint__creates_an_activity__when_activity_has_all_at
      create_fake_database,
  ):
      database, activity_data = create_fake_database
-     azure_activities._update_activity.DATABASE = database
+     azure_activities._create_activity.DATABASE = database
 
      activity_body = {'id': None, 'name': Faker().user_name(), 'description': Faker().sentence(),'deleted': Faker().uuid4() ,'status': 'active', 'tenant_id': Faker().uuid4()}
      body = json.dumps(activity_body).encode("utf-8")

V2/tests/api/azure/activity_azure_endpoints_test.py

@@ -28,7 +28,7 @@ def _create_fake_database(with_data: bool) -> domain.ActivitiesDao:
     ]
     if with_data:
       query = db_fake.activity.insert()
-      db_fake.connection.execute(query, demo_data)
+      db_fake.get_session().execute(query, demo_data)
     return db_fake
 
 

V2/tests/conftest.py

@@ -1,5 +1,4 @@
 import json
-import logging
 import dataclasses
 import typing
 
@@ -8,10 +7,6 @@
 from ... import _domain
 from ... import _infrastructure
 
-_JSON_PATH = (
-    'time_entries/_infrastructure/_data_persistence/activities_data.json'
-)
-
 DATABASE = _infrastructure.DB()
 
 

V2/tests/integration/daos/activities_json_dao_test.py

@@ -1,13 +1,11 @@
-from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, DB
+import json
+import logging
+
+from time_entries._infrastructure import ActivitiesSQLDao, DB
 from time_entries._domain import ActivityService, _use_cases
 
 import azure.functions as func
-import json
-import logging
 
-JSON_PATH = (
-    'time_entries/_infrastructure/_data_persistence/activities_data.json'
-)
 DATABASE = DB()
 
 
@@ -26,13 +24,12 @@ def delete_activity(req: func.HttpRequest) -> func.HttpResponse:
 
 def _delete(activity_id: str) -> str:
     activity_use_case = _use_cases.DeleteActivityUseCase(
-        _create_activity_service(JSON_PATH)
+        _create_activity_service(DATABASE)
     )
     activity = activity_use_case.delete_activity(activity_id)
     return json.dumps(activity.__dict__) if activity else b'Not found'
 
 
-def _create_activity_service(path: str):
-    activity_json = ActivitiesJsonDao(path)
-    activity_sql = ActivitiesSQLDao(DATABASE)
+def _create_activity_service(db: DB):
+    activity_sql = ActivitiesSQLDao(db)
     return ActivityService(activity_sql)

V2/tests/integration/daos/activities_sql_dao_test.py

@@ -1,13 +1,11 @@
-from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, DB
+import json
+import logging
+
+from time_entries._infrastructure import ActivitiesSQLDao, DB
 from time_entries._domain import ActivityService, _use_cases
 
 import azure.functions as func
-import json
-import logging
 
-JSON_PATH = (
-    'time_entries/_infrastructure/_data_persistence/activities_data.json'
-)
 DATABASE = DB()
 
 
@@ -32,7 +30,7 @@ def get_activities(req: func.HttpRequest) -> func.HttpResponse:
 
 def _get_by_id(activity_id: str) -> str:
     activity_use_case = _use_cases.GetActivityUseCase(
-        _create_activity_service(JSON_PATH)
+        _create_activity_service(DATABASE)
     )
     activity = activity_use_case.get_activity_by_id(activity_id)
 
@@ -41,7 +39,7 @@ def _get_by_id(activity_id: str) -> str:
 
 def _get_all() -> str:
     activities_use_case = _use_cases.GetActivitiesUseCase(
-        _create_activity_service(JSON_PATH)
+        _create_activity_service(DATABASE)
     )
     return json.dumps(
         [
@@ -51,7 +49,6 @@ def _get_all() -> str:
     )
 
 
-def _create_activity_service(path: str):
-    activity_json = ActivitiesJsonDao(path)
-    activity_sql = ActivitiesSQLDao(DATABASE)
+def _create_activity_service(db: DB):
+    activity_sql = ActivitiesSQLDao(db)
     return ActivityService(activity_sql)

V2/time_entries/_application/_activities/_create_activity.py

@@ -1,15 +1,11 @@
-from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, DB
+from time_entries._infrastructure import ActivitiesSQLDao, DB
 from time_entries._domain import ActivityService, Activity, _use_cases
 
 import azure.functions as func
 import dataclasses
 import json
 import logging
 
-JSON_PATH = (
-    'time_entries/_infrastructure/_data_persistence/activities_data.json'
-)
-
 DATABASE = DB()
 
 
@@ -35,13 +31,12 @@ def update_activity(req: func.HttpRequest) -> func.HttpResponse:
 
 def _update(activity_id: str, activity_data: dict) -> str:
     activity_use_case = _use_cases.UpdateActivityUseCase(
-        _create_activity_service(JSON_PATH)
+        _create_activity_service(DATABASE)
     )
     activity = activity_use_case.update_activity(activity_id, activity_data)
     return json.dumps(activity.__dict__) if activity else b'Not Found'
 
 
-def _create_activity_service(path: str):
-    activity_json = ActivitiesJsonDao(path)
-    activity_sql = ActivitiesSQLDao(DATABASE)
+def _create_activity_service(db: DB):
+    activity_sql = ActivitiesSQLDao(db)
     return ActivityService(activity_sql)

V2/time_entries/_application/_activities/_delete_activity.py

@@ -1,4 +1,3 @@
-from ._data_persistence import ActivitiesJsonDao
 from ._data_persistence import ActivitiesSQLDao
 from ._data_persistence import DB
 from ._data_persistence import Config