fix: TT-402 refactor azure update endpoint

Author: Jobzi

V2/tests/api/azure/time_entry_azure_endpoints_test.py

@@ -103,7 +103,7 @@ def test__update_time_entry_azure_endpoint__returns_an_time_entry__when_found_an
     assert activitiy_json_data == json.dumps(inserted_time_entries)
 
 
-def test__update_time_entries_azure_endpoint__returns_a_status_code_404__when_time_entry_recive_invalid_id():
+def test__update_time_entries_azure_endpoint__returns_a_status_code_400__when_time_entry_recive_invalid_format_id():
     time_entry_body = {"description": Faker().sentence()}
 
     req = func.HttpRequest(
@@ -115,10 +115,26 @@ def test__update_time_entries_azure_endpoint__returns_a_status_code_404__when_ti
 
     response = azure_time_entries._update_time_entry.update_time_entry(req)
 
-    assert response.status_code == 404
+    assert response.status_code == 400
     assert response.get_body() == b'Invalid Format ID'
 
 
+def test__update_time_entries_azure_endpoint__returns_a_status_code_404__when_time_entry_recive_invalid_id():
+    time_entry_body = {"description": Faker().sentence()}
+
+    req = func.HttpRequest(
+        method="PUT",
+        body=json.dumps(time_entry_body).encode("utf-8"),
+        url=TIME_ENTRY_URL,
+        route_params={"id": Faker().pyint()},
+    )
+
+    response = azure_time_entries._update_time_entry.update_time_entry(req)
+
+    assert response.status_code == 404
+    assert response.get_body() == b'Not found'
+
+
 def test__update_time_entries_azure_endpoint__returns_a_status_code_400__when_time_entry_recive_invalid_body():
 
     time_entry_body = Faker().pydict(5, True, str)

V2/time_tracker/time_entries/_application/_time_entries/_update_time_entry.py

@@ -1,47 +1,49 @@
 import dataclasses
 import json
-import logging
 
 import azure.functions as func
 
-from time_tracker.time_entries._infrastructure import TimeEntriesSQLDao
-from time_tracker.time_entries._domain import TimeEntryService, TimeEntry, _use_cases
+from ... import _domain
+from ... import _infrastructure
 from time_tracker._infrastructure import DB
 
 
 def update_time_entry(req: func.HttpRequest) -> func.HttpResponse:
-    logging.info(
-        'Python HTTP trigger function processed a request to update an time entry.'
-    )
-    time_entry_id = req.route_params.get('id')
-    time_entry_data = req.get_json() if req.get_body() else {}
-    time_entry_keys = [field.name for field in dataclasses.fields(TimeEntry)]
-
-    if all(key in time_entry_keys for key in time_entry_data.keys()):
-        try:
-            response = _update(int(time_entry_id), time_entry_data)
-            status_code = 200
-        except ValueError:
-            response = b'Invalid Format ID'
-            status_code = 404
-    else:
-        response = b'Incorrect time entry body'
-        status_code = 400
-
-    return func.HttpResponse(
-        body=response, status_code=status_code, mimetype="application/json"
-    )
-
-
-def _update(time_entry_id: int, time_entry_data: dict) -> str:
     database = DB()
-    time_entry_use_case = _use_cases.UpdateTimeEntryUseCase(
-        _create_time_entry_service(database)
-    )
-    time_entry = time_entry_use_case.update_time_entry(time_entry_id, time_entry_data)
-    return json.dumps(time_entry.__dict__) if time_entry else b'Not Found'
-
-
-def _create_time_entry_service(db: DB):
-    time_entry_dao = TimeEntriesSQLDao(db)
-    return TimeEntryService(time_entry_dao)
+    time_entry_dao = _infrastructure.TimeEntriesSQLDao(database)
+    time_entry_service = _domain.TimeEntryService(time_entry_dao)
+    use_case = _domain._use_cases.UpdateTimeEntryUseCase(time_entry_service)
+
+    try:
+        time_entry_id = int(req.route_params.get("id"))
+        time_entry_data = req.get_json()
+        status_code = 200
+
+        if not _validate_time_entry(time_entry_data):
+            status_code = 400
+            response = b"Incorrect time entry body"
+        else:
+            response = use_case.update_time_entry(time_entry_id, time_entry_data)
+            if not response:
+                status_code = 404
+                response = b"Not found"
+            else:
+                response = json.dumps(response.__dict__)
+
+        return func.HttpResponse(
+            body=response,
+            status_code=status_code,
+            mimetype="application/json",
+        )
+
+    except ValueError:
+        return func.HttpResponse(
+            body=b"Invalid Format ID",
+            status_code=400,
+            mimetype="application/json"
+        )
+
+
+def _validate_time_entry(time_entry_data: dict) -> bool:
+    time_entry_keys = [field.name for field in dataclasses.fields(_domain.TimeEntry)]
+    return all(key in time_entry_keys for key in time_entry_data.keys())

V2/time_tracker/time_entries/_infrastructure/_data_persistence/_time_entries_dao.py

@@ -45,13 +45,18 @@ def create(self, time_entry_data: domain.TimeEntry) -> domain.TimeEntry:
             return None
 
     def update(self, time_entry_id: int, time_entry_data: dict) -> domain.TimeEntry:
+        try:
+            query = self.time_entry.update().where(self.time_entry.c.id == time_entry_id).values(time_entry_data)
+            self.db.get_session().execute(query)
+            query_updated_time_entry = (
+                sqlalchemy.sql.select(self.time_entry)
+                .where(self.time_entry.c.id == time_entry_id)
+            )
+            time_entry = self.db.get_session().execute(query_updated_time_entry).one_or_none()
 
-        query = self.time_entry.update().where(self.time_entry.c.id == time_entry_id).values(time_entry_data)
-        self.db.get_session().execute(query)
-        query_updated_time_entry = sqlalchemy.sql.select(self.time_entry).where(self.time_entry.c.id == time_entry_id)
-        time_entry = self.db.get_session().execute(query_updated_time_entry).one_or_none()
-
-        return self.__create_time_entry_dto(dict(time_entry)) if time_entry else None
+            return self.__create_time_entry_dto(dict(time_entry)) if time_entry else None
+        except sqlalchemy.exc.SQLAlchemyError:
+            return None
 
     def delete(self, time_entry_id: int) -> domain.TimeEntry:
         query = (