From aa2763b4b25b866598b73567f1ef7c6955d64f29 Mon Sep 17 00:00:00 2001
From: Said Gedik <said.gedik@nttdata.com>
Date: Thu, 27 Jun 2024 15:39:37 +0200
Subject: [PATCH] transaction

---
 .vscode/settings.json                                 |  3 ++-
 .../nttdata/calender/api/KalenderRestController.java  | 11 ++++++++---
 .../com/nttdata/calender/api/RequestInterceptor.java  | 11 ++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index e0f15db..c6fe658 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "java.configuration.updateBuildConfiguration": "automatic"
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "java.compile.nullAnalysis.mode": "disabled"
 }
\ No newline at end of file
diff --git a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
index 84e109d..7b5fe01 100644
--- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
+++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
@@ -300,7 +300,8 @@ public class KalenderRestController {
      */
     @CrossOrigin("*")
     @PostMapping("/api/updateState")
-    public ResponseEntity<String> updateState(@RequestBody StateChangeRequest request, HttpServletRequest httpRequest) throws ARException {
+    public ResponseEntity<String> updateState(@RequestBody StateChangeRequest request, HttpServletRequest httpRequest)
+            throws ARException {
         logRequest("/updateState", request.toString());
         httpRequest.setAttribute("requestBody", request);
         var response = stateChange.createStateChange(request);
@@ -318,7 +319,9 @@ public class KalenderRestController {
      */
     @CrossOrigin("*")
     @PostMapping("api/updateImplementer")
-    public ResponseEntity<String> updateImplementer(@RequestBody ImplementerUpdateRequest request) throws ARException {
+    public ResponseEntity<String> updateImplementer(@RequestBody ImplementerUpdateRequest request,
+            HttpServletRequest httpRequest) throws ARException {
+        httpRequest.setAttribute("requestBody", request);
         var response = implementer.update(request);
         return ResponseEntity.ok(response);
     }
@@ -335,7 +338,9 @@ public class KalenderRestController {
     @CrossOrigin("*")
     @PostMapping("api/updateApproval")
     @ResponseBody
-    public ResponseEntity<String> updateApproval(@RequestBody ApprovalUpdateRequest request) throws ARException {
+    public ResponseEntity<String> updateApproval(@RequestBody ApprovalUpdateRequest request,
+            HttpServletRequest httpRequest) throws ARException {
+        httpRequest.setAttribute("requestBody", request);
         var response = approval.update(request);
         return ResponseEntity.ok(response);
     }
diff --git a/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java b/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java
index 675325f..f16443f 100644
--- a/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java
+++ b/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java
@@ -6,7 +6,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 
+import com.nttdata.calender.approval.ApprovalUpdateRequest;
 import com.nttdata.calender.changes.ChangeUpdateRequest;
+import com.nttdata.calender.implementer.ImplementerUpdateRequest;
 import com.nttdata.calender.states.StateChangeRequest;
 
 import javax.servlet.http.HttpServletRequest;
@@ -34,7 +36,8 @@ public class RequestInterceptor implements HandlerInterceptor {
 
     private static String output(String time, long id, String user, String status, String action, String ticket,
             String result) {
-        return String.format("%s\nTransaction ID: %d\nUser: %s\nStatus: %s\nAction: %s\nTicket: %s\nResult: %s",
+        return String.format(
+                "%s\n Transaction ID: %d\n User: %s\n Status: %s\n Action: %s\n Ticket: %s\n Result: %s",
                 time, id, user, status, action, ticket, result);
     }
 
@@ -59,6 +62,12 @@ public class RequestInterceptor implements HandlerInterceptor {
                     StateChangeRequest changeStateRequest = (StateChangeRequest) requestBody;
                     changeNr += changeStateRequest.getChangeNr();
                     action += " | State transition";
+                } else if (requestBody instanceof ImplementerUpdateRequest) {
+                    ImplementerUpdateRequest implementerUpdateRequest = (ImplementerUpdateRequest) requestBody;
+                    action += " | Implementer Update";
+                } else if (requestBody instanceof ApprovalUpdateRequest) {
+                    ApprovalUpdateRequest approvalUpdateRequest = (ApprovalUpdateRequest) requestBody;
+                    action += " | Approval Update";
                 }
 
                 String status = (ex == null) ? "Success" : "Error";