refactor: TT-357 change directory from database file

Author: ararcos

V2/tests/integration/daos/activities_sql_dao_test.py

@@ -0,0 +1,52 @@
+from time_entries._domain import Activity, ActivitiesDao
+from time_entries._infrastructure import DataAccessLayerSQL,db, ActivitiesSQLDao
+
+import pytest
+import typing
+
+@pytest.fixture
+def _create_fake_database() -> ActivitiesDao:
+    db.db_init('sqlite:///:memory:')
+    query = db.activity.insert()
+    demo_data = [
+        {
+        'id': 'c61a4a49-3364-49a3-a666-0c5f2d15072b',
+        'name': 'Activity Demo create',
+        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
+        'description': 'test demo create an new activity',
+        'status': 'active',
+        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
+        },
+        {
+        'id': 'c61a4a49-3364-49a3-a666-0c5f2d15072b',
+        'name': 'Activity Demo create',
+        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
+        'description': 'test demo create an new activity',
+        'status': 'active',
+        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
+        },
+    ]
+    db.connection.execute(query, demo_data)
+    return ActivitiesSQLDao(db)
+
+def test__get_all__returns_a_list_of_activity_dto_objects__when_one_or_more_activities_are_found_in_sql_database(activitiesSqlDao: ActivitiesSQLDao):
+    expected_result=[
+      Activity(**{
+        'id': 'c61a4a49-3364-49a3-a666-0c5f2d15072b',
+        'name': 'Activity Demo create',
+        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
+        'description': 'test demo create an new activity',
+        'status': 'active',
+        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
+        }),
+      Activity(**{
+        'id': 'c61a4a49-3364-49a3-a666-0c5f2d15072b',
+        'name': 'Activity Demo create',
+        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
+        'description': 'test demo create an new activity',
+        'status': 'active',
+        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
+        }),
+    ]
+    results = activitiesSqlDao.get_all()
+    assert expected_result == results

V2/time_entries/_application/_activities/_delete_activity.py

@@ -1,4 +1,4 @@
-from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao
+from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, db
 from time_entries._domain import ActivityService, _use_cases
 
 import azure.functions as func
@@ -8,6 +8,7 @@
 JSON_PATH = (
     'time_entries/_infrastructure/_data_persistence/activities_data.json'
 )
+DATABASE = db
 
 
 def delete_activity(req: func.HttpRequest) -> func.HttpResponse:
@@ -33,5 +34,5 @@ def _delete(activity_id: str) -> str:
 
 def _create_activity_service(path: str):
     activity_json = ActivitiesJsonDao(path)
-    activity_sql = ActivitiesSQLDao()
+    activity_sql = ActivitiesSQLDao(DATABASE)
     return ActivityService(activity_sql)

V2/time_entries/_application/_activities/_get_activities.py

@@ -1,4 +1,4 @@
-from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao
+from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, db
 from time_entries._domain import ActivityService, _use_cases
 
 import azure.functions as func
@@ -8,6 +8,7 @@
 JSON_PATH = (
     'time_entries/_infrastructure/_data_persistence/activities_data.json'
 )
+DATABASE = db
 
 
 def get_activities(req: func.HttpRequest) -> func.HttpResponse:
@@ -52,5 +53,5 @@ def _get_all() -> str:
 
 def _create_activity_service(path: str):
     activity_json = ActivitiesJsonDao(path)
-    activity_sql = ActivitiesSQLDao()
+    activity_sql = ActivitiesSQLDao(DATABASE)
     return ActivityService(activity_sql)

V2/time_entries/_infrastructure/__init__.py

@@ -1,3 +1,4 @@
 from ._data_persistence import ActivitiesJsonDao
 from ._data_persistence import ActivitiesSQLDao
-
+from ._data_persistence import db
+from ._data_persistence import DataAccessLayerSQL

V2/time_entries/_infrastructure/_data_persistence/__init__.py

@@ -1,2 +1,5 @@
 from ._activities_json_dao import ActivitiesJsonDao
 from ._activities_sql_dao import ActivitiesSQLDao
+from ._data_access_layer_sql import db
+from ._data_access_layer_sql import DataAccessLayerSQL
+

V2/time_entries/_infrastructure/_data_persistence/_activities_sql_dao.py

@@ -1,47 +1,47 @@
 from time_entries._domain import ActivitiesDao, Activity
 from sqlalchemy.sql import select
-from ..database import db
 import dataclasses
 import typing
 
 class ActivitiesSQLDao(ActivitiesDao):
-    def __init__(self):
+    def __init__(self,database):
         self.activity_keys = [
             field.name for field in dataclasses.fields(Activity)
         ]
-        db.db_init()
+        self.db = database
+        self.db.db_init()
 
 
    #GET Activity by id
     def get_by_id(self, activity_id: str) -> Activity:
         """search for the activity by the given id
         parameters: str (the id string of the searched activity)
         returns: Activity (The activity model with the response if found or a void if not)."""
-        query = select(db.activity).where(db.activity.c.id == activity_id)
-        activity = db.connection.execute(query).one()
+        query = select(self.db.activity).where(self.db.activity.c.id == activity_id)
+        activity = self.db.connection.execute(query).one()
         return self.__create_activity_dto(dict(activity)) if activity else None
 
     def get_all(self) -> typing.List[Activity]:
-        query = select(db.activity)
-        result = db.connection.execute(query)
+        query = select(self.db.activity)
+        result = self.db.connection.execute(query)
         return [
             self.__create_activity_dto(dict(activity))
             for activity in result
         ]
 
     def create_activity(self, activity_data: dict) -> Activity:
-        query = db.activity.insert().values(activity_data)
-        activity = db.connection.execute(query)
+        query = self.db.activity.insert().values(activity_data)
+        activity = self.db.connection.execute(query)
         return self.__create_activity_dto(activity.last_inserted_params())
 
     def delete(self, activity_id: str) -> Activity:
-        query = db.activity.update().where(db.activity.c.id == activity_id).values(status = 'inactive')
-        db.connection.execute(query)
+        query = self.db.activity.update().where(self.db.activity.c.id == activity_id).values(status = 'inactive')
+        self.db.connection.execute(query)
         return self.get_by_id(activity_id);
 
     def update(self, activity_id: str, new_activity: dict) -> Activity:
-        query = db.activity.update().where(db.activity.c.id==activity_id).values(new_activity)
-        db.connection.execute(query)
+        query = self.db.activity.update().where(self.db.activity.c.id==activity_id).values(new_activity)
+        self.db.connection.execute(query)
         return self.get_by_id(activity_id)
 
     def __create_activity_dto(self, activity: dict) -> Activity:

V2/time_entries/_infrastructure/database/data_access_layer_sql.py renamed to V2/time_entries/_infrastructure/_data_persistence/_data_access_layer_sql.py

@@ -55,5 +55,4 @@ def db_init(self, conn_string: str = conn_string):
         self.metadata.create_all(self.engine)
         self.connection = self.engine.connect()
 
-db = DataAccessLayerSQL() 
-
+db = DataAccessLayerSQL()