From d0a4d8a0a6e599fbae8e41519bb556e20cc06eb3 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 3 Jul 2024 16:17:10 +0200 Subject: [PATCH] added interceptor to all post actions --- .../calender/api/KalenderRestController.java | 30 +++++++++++++------ .../calender/api/RequestInterceptor.java | 11 ++++++- 2 files changed, 31 insertions(+), 10 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 457b1b1..9b15d1f 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -309,6 +309,7 @@ public class KalenderRestController { logRequest("/updateState", request.toString()); httpRequest.setAttribute("requestBody", request); httpRequest.setAttribute("formName", "ASF:CHG_CAL_Interactions"); + var response = stateChange.createStateChange(request); return ResponseEntity.ok(response); } @@ -328,6 +329,7 @@ public class KalenderRestController { HttpServletRequest httpRequest) throws ARException { httpRequest.setAttribute("requestBody", request); httpRequest.setAttribute("formName", "ASF:CHG_CAL_Interactions"); + var response = implementer.update(request); return ResponseEntity.ok(response); } @@ -348,6 +350,7 @@ public class KalenderRestController { HttpServletRequest httpRequest) throws ARException { httpRequest.setAttribute("requestBody", request); httpRequest.setAttribute("formName", "ASF:CHG_CAL_Interactions"); + var response = approval.update(request); return ResponseEntity.ok(response); } @@ -372,9 +375,10 @@ public class KalenderRestController { @ResponseBody public List savePreset(@RequestBody Preset request, HttpServletRequest httpRequest) throws ARException, ValidationError, NotFoundError { - Presets presets = new Presets(javaAPI); httpRequest.setAttribute("requestBody", request); httpRequest.setAttribute("formName", "ASF:CHG_CAL_FilterDefinitions"); + + Presets presets = new Presets(javaAPI); presets.savePreset(request); return presets.getAll(); } @@ -403,10 +407,12 @@ public class KalenderRestController { @CrossOrigin("*") @PostMapping("api/updatePreset") @ResponseBody - public List updatePreset(@RequestBody UpdatePresetRequest request, HttpServletRequest httpRequest) throws NotFoundError, ARException { - Presets presets = new Presets(javaAPI); + public List updatePreset(@RequestBody UpdatePresetRequest request, HttpServletRequest httpRequest) + throws NotFoundError, ARException { httpRequest.setAttribute("requestBody", request); httpRequest.setAttribute("formName", "ASF:CHG_CAL_FilterDefinitions"); + + Presets presets = new Presets(javaAPI); presets.updatePreset(request); return presets.getAll(); } @@ -414,10 +420,12 @@ public class KalenderRestController { @CrossOrigin("*") @PostMapping("api/deletePreset") @ResponseBody - public Object deletePreset(@RequestBody DeletePresetRequest request, HttpServletRequest httpRequest) throws ARException, NotFoundError { - Presets presets = new Presets(javaAPI); + public Object deletePreset(@RequestBody DeletePresetRequest request, HttpServletRequest httpRequest) + throws ARException, NotFoundError { httpRequest.setAttribute("requestBody", request); httpRequest.setAttribute("formName", "ASF:CHG_CAL_FilterDefinitions"); + + Presets presets = new Presets(javaAPI); presets.deletePreset(request); return presets.getAll(); } @@ -425,10 +433,12 @@ public class KalenderRestController { @CrossOrigin @PostMapping("api/renamePreset") @ResponseBody - public List renamePreset(@RequestBody RenamePresetRequest request, HttpServletRequest httpRequest) throws NotFoundError, ARException { - Presets presets = new Presets(javaAPI); + public List renamePreset(@RequestBody RenamePresetRequest request, HttpServletRequest httpRequest) + throws NotFoundError, ARException { httpRequest.setAttribute("requestBody", request); httpRequest.setAttribute("formName", "ASF:CHG_CAL_FilterDefinitions"); + + Presets presets = new Presets(javaAPI); presets.renamePreset(request); return presets.getAll(); } @@ -436,10 +446,12 @@ public class KalenderRestController { @CrossOrigin("*") @PostMapping("api/editUserPreferences") @ResponseBody - public void editUserPreferences(@RequestBody EditUserPreferencesRequest request, HttpServletRequest httpRequest) throws ARException, NotFoundError { - Presets presets = new Presets(javaAPI); + public void editUserPreferences(@RequestBody EditUserPreferencesRequest request, HttpServletRequest httpRequest) + throws ARException, NotFoundError { httpRequest.setAttribute("requestBody", request); httpRequest.setAttribute("formName", "ASF:CHG_CAL_UserPreferences"); + + Presets presets = new Presets(javaAPI); presets.editUserPreferences(request); } 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 2b9dcad..4fef020 100644 --- a/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java +++ b/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java @@ -9,7 +9,10 @@ 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.presets.DeletePresetRequest; +import com.nttdata.calender.presets.EditUserPreferencesRequest; import com.nttdata.calender.presets.Preset; +import com.nttdata.calender.presets.RenamePresetRequest; import com.nttdata.calender.presets.SelectPresetRequest; import com.nttdata.calender.presets.UpdatePresetRequest; import com.nttdata.calender.states.StateChangeRequest; @@ -69,9 +72,15 @@ public class RequestInterceptor implements HandlerInterceptor { } else if (requestBody instanceof Preset) { entry = buildQueryEntry(transactionId, "Save Preset", formName, ((Preset) requestBody).getId(), getAssignedTo(), status); } else if (requestBody instanceof SelectPresetRequest) { - entry = buildQueryEntry(transactionId, "Preset selected", formName, ((SelectPresetRequest) requestBody).getGuid(), getAssignedTo(), status); + entry = buildQueryEntry(transactionId, "Select Preset", formName, ((SelectPresetRequest) requestBody).getGuid(), getAssignedTo(), status); } else if (requestBody instanceof UpdatePresetRequest) { entry = buildQueryEntry(transactionId, "Update Preset", formName, ((UpdatePresetRequest) requestBody).getId(), getAssignedTo(), status); + } else if (requestBody instanceof DeletePresetRequest) { + entry = buildQueryEntry(transactionId, "Delete Preset", formName, ((DeletePresetRequest) requestBody).getId(), getAssignedTo(), status); + } else if (requestBody instanceof RenamePresetRequest) { + entry = buildQueryEntry(transactionId, "Rename Preset", formName, ((RenamePresetRequest) requestBody).getId(), getAssignedTo(), status); + } else if (requestBody instanceof EditUserPreferencesRequest) { + entry = buildQueryEntry(transactionId, "Edit User Preferences", formName, "", getAssignedTo(), status); } if (entry != null) {