From e2d9793871057546caaf64f312815203eea3dd56 Mon Sep 17 00:00:00 2001
From: Said Gedik <said.gedik@nttdata.com>
Date: Thu, 20 Jun 2024 19:22:00 +0200
Subject: [PATCH] fixed issues

---
 .../java/com/nttdata/calender/api/KalenderRestController.java | 4 ++--
 .../java/com/nttdata/calender/api/RequestInterceptor.java     | 4 ++--
 .../src/main/java/com/nttdata/calender/changes/Change.java    | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

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 5a84028..84e109d 100644
--- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
+++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
@@ -282,7 +282,7 @@ public class KalenderRestController {
     @ResponseBody
     public ChangeUpdateRequest updateChange(@RequestBody ChangeUpdateRequest request, HttpServletRequest httpRequest)
             throws ARException, ValidationError {
-        httpRequest.setAttribute("changeUpdateRequest", request);
+        httpRequest.setAttribute("requestBody", request);
         change.modifyTimestamp(request);
         return request;
     }
@@ -302,7 +302,7 @@ public class KalenderRestController {
     @PostMapping("/api/updateState")
     public ResponseEntity<String> updateState(@RequestBody StateChangeRequest request, HttpServletRequest httpRequest) throws ARException {
         logRequest("/updateState", request.toString());
-        httpRequest.setAttribute("changeUpdateState", request);
+        httpRequest.setAttribute("requestBody", request);
         var response = stateChange.createStateChange(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 f8196de..675325f 100644
--- a/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java
+++ b/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java
@@ -53,11 +53,11 @@ public class RequestInterceptor implements HandlerInterceptor {
 
                 if (requestBody instanceof ChangeUpdateRequest) {
                     ChangeUpdateRequest changeUpdateRequest = (ChangeUpdateRequest) requestBody;
-                    changeNr = changeUpdateRequest.getChangeNr();
+                    changeNr += changeUpdateRequest.getChangeNr();
                     action += " | Date change";
                 } else if (requestBody instanceof StateChangeRequest) {
                     StateChangeRequest changeStateRequest = (StateChangeRequest) requestBody;
-                    changeNr = changeStateRequest.getChangeNr();
+                    changeNr += changeStateRequest.getChangeNr();
                     action += " | State transition";
                 }
 
diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java
index 5f30734..0083184 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/Change.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java
@@ -212,6 +212,8 @@ public class Change {
                                 .addFieldId("FullName", 1000000017)
                                 .addFieldId("SupportGroupId", 1000000079)
                                 .build();
+
+                System.out.println(api.getUser());
                 var peopleInfos = api.queryFieldsById("\'Login ID\' = \"" + api.getUser() + "\"",
                                 queryPerson.getFieldIds(),
                                 queryPerson.getFormName(), null, 0, 0);