Merge branch 'TT-417-CRUD-V2-Projects' of https://github.com/ioet/time-tracker-backend into TT-417-CRUD-V2-Projects

Author: Jobzi

V2/time_tracker/projects/_application/_projects/_delete_project.py

@@ -4,12 +4,12 @@
 
 from ... import _domain
 from ... import _infrastructure
-from time_tracker._infrastructure import DB
+from time_tracker._infrastructure import DB as database
 from time_tracker.utils.enums import ResponseEnums as enums
 
 
 def delete_project(req: func.HttpRequest) -> func.HttpResponse:
-    project_dao = _infrastructure.ProjectsSQLDao(DB())
+    project_dao = _infrastructure.ProjectsSQLDao(database())
     project_service = _domain.ProjectService(project_dao)
     use_case = _domain._use_cases.DeleteProjectUseCase(project_service)
 

V2/time_tracker/projects/_application/_projects/_get_projects.py

@@ -5,13 +5,12 @@
 
 from ... import _domain
 from ... import _infrastructure
-from time_tracker._infrastructure import DB
+from time_tracker._infrastructure import DB as database
 from time_tracker.utils.enums import ResponseEnums as enums
 
 
 def get_projects(req: func.HttpRequest) -> func.HttpResponse:
-    database = DB()
-    project_dao = _infrastructure.ProjectsSQLDao(database)
+    project_dao = _infrastructure.ProjectsSQLDao(database())
     project_service = _domain.ProjectService(project_dao)
 
     project_id = req.route_params.get("id")

V2/time_tracker/projects/_application/_projects/_update_project.py

@@ -5,13 +5,12 @@
 
 from ... import _domain
 from ... import _infrastructure
-from time_tracker._infrastructure import DB
+from time_tracker._infrastructure import DB as database
 from time_tracker.utils.enums import ResponseEnums as enums
 
 
 def update_project(req: func.HttpRequest) -> func.HttpResponse:
-    database = DB()
-    project_dao = _infrastructure.ProjectsSQLDao(database)
+    project_dao = _infrastructure.ProjectsSQLDao(database())
     project_service = _domain.ProjectService(project_dao)
     use_case = _domain._use_cases.UpdateProjectUseCase(project_service)
 
@@ -41,6 +40,12 @@ def update_project(req: func.HttpRequest) -> func.HttpResponse:
             status_code=enums.STATUS_BAD_REQUEST.value,
             mimetype=enums.MIME_TYPE.value,
         )
+    except Exception as error:
+        return func.HttpResponse(
+            body=str(error).encode(),
+            status_code=enums.STATUS_BAD_REQUEST.value,
+            mimetype=enums.MIME_TYPE.value,
+        )
 
 
 def _validate_project(project_data: dict) -> bool:

V2/time_tracker/projects/_infrastructure/_data_persistence/_projects_dao.py

@@ -65,9 +65,12 @@ def delete(self, id: int) -> domain.Project:
         return self.get_by_id(id)
 
     def update(self, id: int, project_data: dict) -> domain.Project:
-        query = self.project.update().where(self.project.c.id == id).values(project_data)
-        self.db.get_session().execute(query)
-        return self.get_by_id(id)
+        try:
+            query = self.project.update().where(self.project.c.id == id).values(project_data)
+            self.db.get_session().execute(query)
+            return self.get_by_id(id)
+        except sq.exc.SQLAlchemyError as error:
+            raise Exception(error.orig)
 
     def __create_project_dto(self, project: dict) -> domain.Project:
         project = {key: project.get(key) for key in self.project_key}