feat: TT-357 Docker and database configuration

Author: dsgarcia8

V2/Makefile

@@ -4,4 +4,5 @@ install:
 		pip install --upgrade pip
 		pip install -r requirements.txt
 		@echo "Completed! "
-
+start-local:
+	docker compose up

V2/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3.9'
+services:
+  database:
+    image: postgres:14
+    ports:
+      - "5433:5432"
+    environment:
+      - POSTGRES_USER=${DB_USER}
+      - POSTGRES_PASSWORD=${DB_PASS}
+      - POSTGRES_DB=${DB_NAME}

V2/tests/integration/daos/activities_sql_dao_test.py

@@ -7,7 +7,7 @@
 
 @pytest.fixture(name='create_fake_database')
 def _create_fake_database(with_data: bool) -> domain.ActivitiesDao:
-    infrastructure.db.db_init('sqlite:///:memory:')
+    db_fake = infrastructure.DB('sqlite:///:memory:')
     demo_data = [
         {
         'id': uuid.UUID('b4327ba6-9f96-49ee-a9ac-3c1edf525172'),
@@ -27,9 +27,9 @@ def _create_fake_database(with_data: bool) -> domain.ActivitiesDao:
         },
     ]
     if with_data:
-      query = infrastructure.db.activity.insert()
-      infrastructure.db.connection.execute(query, demo_data)
-    return infrastructure.db
+      query = db_fake.activity.insert()
+      db_fake.connection.execute(query, demo_data)
+    return db_fake
 
 
 @pytest.mark.parametrize('with_data',[False])

V2/time_entries/_application/_activities/_delete_activity.py

@@ -1,4 +1,4 @@
-from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, db
+from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, DB
 from time_entries._domain import ActivityService, _use_cases
 
 import azure.functions as func
@@ -8,7 +8,7 @@
 JSON_PATH = (
     'time_entries/_infrastructure/_data_persistence/activities_data.json'
 )
-DATABASE = db
+DATABASE = DB
 
 
 def delete_activity(req: func.HttpRequest) -> func.HttpResponse:

V2/time_entries/_application/_activities/_get_activities.py

@@ -1,4 +1,4 @@
-from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, db
+from time_entries._infrastructure import ActivitiesJsonDao, ActivitiesSQLDao, DB
 from time_entries._domain import ActivityService, _use_cases
 
 import azure.functions as func
@@ -8,7 +8,7 @@
 JSON_PATH = (
     'time_entries/_infrastructure/_data_persistence/activities_data.json'
 )
-DATABASE = db
+DATABASE = DB
 
 
 def get_activities(req: func.HttpRequest) -> func.HttpResponse:

V2/time_entries/_infrastructure/__init__.py

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

V2/time_entries/_infrastructure/_data_persistence/__init__.py

@@ -1,5 +1,4 @@
 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
-
+from ._db import DB
+from ._config import Config

V2/time_entries/_infrastructure/_data_persistence/_activities_sql_dao.py

@@ -14,12 +14,12 @@ def __init__(self,database):
 
     def get_by_id(self, activity_id: str) -> domain.Activity:
         query = sql.select(self.db.activity).where(self.db.activity.c.id ==  activity_id)
-        activity = self.db.get_connection().execute(query).one_or_none()
+        activity = self.db.get_session().execute(query).one_or_none()
         return self.__create_activity_dto(dict(activity)) if activity else None
 
     def get_all(self) -> typing.List[domain.Activity]:
         query = sql.select(self.db.activity)
-        result = self.db.get_connection().execute(query)
+        result = self.db.get_session().execute(query)
         return [
             self.__create_activity_dto(dict(activity))
             for activity in result
@@ -28,18 +28,18 @@ def get_all(self) -> typing.List[domain.Activity]:
     def create_activity(self, activity_data: dict) -> domain.Activity:
         activity_data.pop('id', None)
         query = self.db.activity.insert().values(activity_data)
-        activity = self.db.get_connection().execute(query)
+        activity = self.db.get_session().execute(query)
         return self.__create_activity_dto(activity.last_inserted_params())
 
     def delete(self, activity_id: str) -> domain.Activity:
         query = self.db.activity.update().where(self.db.activity.c.id == activity_id).values(status = 'inactive')
-        self.db.get_connection().execute(query)
+        self.db.get_session().execute(query)
         return self.get_by_id(activity_id);
 
     def update(self, activity_id: str, new_activity: dict) -> domain.Activity:
         new_activity.pop('id', None)
         query = self.db.activity.update().where(self.db.activity.c.id==activity_id).values(new_activity)
-        self.db.get_connection().execute(query)
+        self.db.get_session().execute(query)
         return self.get_by_id(activity_id)
 
     def __create_activity_dto(self, activity: dict) -> domain.Activity:

V2/time_entries/_infrastructure/_data_persistence/_config.py

@@ -0,0 +1,19 @@
+import typing
+
+_CONFIG_FILE = '.env'
+
+
+class Config(typing.NamedTuple):
+    DB_CONNECTION_STRING: str
+    DB_USER: str
+    DB_PASS: str
+    DB_NAME: str
+
+
+def load_config():
+    with open(_CONFIG_FILE, 'r') as config_file:
+        configs = {
+            config.split('=')[0]: config.split('=')[1].replace('\n', '')
+            for config in config_file.readlines()
+        }
+        return Config(**configs)

…ta_persistence/_data_access_layer_sql.py …_infrastructure/_data_persistence/_db.pyV2/time_entries/_infrastructure/_data_persistence/_data_access_layer_sql.py renamed to V2/time_entries/_infrastructure/_data_persistence/_db.py V2/time_entries/_infrastructure/_data_persistence/_data_access_layer_sql.py renamed to V2/time_entries/_infrastructure/_data_persistence/_db.py

@@ -3,6 +3,10 @@
 import sqlalchemy.types as types
 import sqlalchemy.dialects.postgresql as postgresql
 import sqlalchemy
+
+from ._config import load_config
+
+
 class GUID(types.TypeDecorator):
     """Platform-independent GUID type.
     Uses PostgreSQL's UUID type, otherwise uses
@@ -36,10 +40,11 @@ def process_result_value(self, value, dialect):
                 value = uuid.UUID(value)
             return value
 
-class DataAccessLayerSQL:
+class DB():
+    config = load_config()
     connection = None
     engine = None
-    conn_string = 'postgresql://postgres:root@localhost/time-tracker'
+    conn_string = config.DB_CONNECTION_STRING
     metadata = sqlalchemy.MetaData()
     activity = sqlalchemy.Table('activity', metadata,
                     sqlalchemy.Column('id',GUID() , primary_key=True,default= uuid.uuid4),
@@ -50,14 +55,10 @@ class DataAccessLayerSQL:
                     sqlalchemy.Column('tenant_id', sqlalchemy.String),
               )
 
-    def db_init(self, conn_string: str = conn_string): 
+    def __init__(self, conn_string: str = conn_string): 
         self.engine = sqlalchemy.create_engine(conn_string)
         self.metadata.create_all(self.engine)
         self.connection = self.engine.connect()
 
-    def get_connection(self):
-        if self.connection == None:
-            self.db_init()
-        return self.connection
-        
-db = DataAccessLayerSQL()
+    def get_session(self):
+        return self.connection