From 0ccfb5e51caaa150b1766937f5908dd6a69be556 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 10 Oct 2023 13:42:34 +0200 Subject: [PATCH] getAllPresets --- .../calender/api/KalenderRestController.java | 31 ++++++++++++------- .../com/nttdata/calender/presets/Presets.java | 3 +- 2 files changed, 22 insertions(+), 12 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 cc21e4a..027d401 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -299,14 +299,6 @@ public class KalenderRestController { return implementer.get(request); } - @CrossOrigin("*") - @GetMapping("api/initPresets") - @ResponseBody - public Object initPresets() throws ARException, NotFoundError { - Presets presets = new Presets(javaAPI); - return presets.initPresets(); - } - @CrossOrigin("*") @PostMapping("/api/savePreset") @ResponseBody @@ -321,11 +313,28 @@ public class KalenderRestController { // @CrossOrigin("*") // @PostMapping("/api/selectPreset") // @ResponseBody - // public boolean selectPreset(@RequestBody String guid) throws ARException, NotFoundError { - // Presets presets = new Presets(javaAPI); - // return presets.selectPreset(guid); + // public boolean selectPreset(@RequestBody String guid) throws ARException, + // NotFoundError { + // Presets presets = new Presets(javaAPI); + // return presets.selectPreset(guid); // } + @CrossOrigin("*") + @GetMapping("api/updatePresets") + @ResponseBody + public Object initPresets() throws ARException, NotFoundError { + Presets presets = new Presets(javaAPI); + return presets.initPresets(); + } + + @CrossOrigin("*") + @GetMapping("/api/getAllPresets") + @ResponseBody + public List savePreset() throws NotFoundError, ARException { + Presets presets = new Presets(javaAPI); + return presets.getAll(); + } + /** * Logs the received request with the endpoint and request body. * diff --git a/backend/src/main/java/com/nttdata/calender/presets/Presets.java b/backend/src/main/java/com/nttdata/calender/presets/Presets.java index c22139e..02a3ca6 100644 --- a/backend/src/main/java/com/nttdata/calender/presets/Presets.java +++ b/backend/src/main/java/com/nttdata/calender/presets/Presets.java @@ -109,7 +109,8 @@ public class Presets { } } - public List getAll() { + public List getAll() throws NotFoundError, ARException { + allPresets(); return this.presets; } }