From 76085d1da3878fe1ba3f75f00b28e8ca18909332 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 11 Oct 2023 11:11:38 +0200 Subject: [PATCH] renamePreset --- .../calender/api/KalenderRestController.java | 19 +++++++++------ .../com/nttdata/calender/presets/Presets.java | 23 ++++++++++++------- .../calender/presets/RenamePresetRequest.java | 13 +---------- 3 files changed, 28 insertions(+), 27 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 3d11054..0c3b880 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -311,7 +311,6 @@ public class KalenderRestController { return presets.getAll(); } - //TODO: Finish Select Preset @CrossOrigin("*") @PostMapping("/api/selectPreset") @ResponseBody @@ -329,12 +328,18 @@ public class KalenderRestController { return presets.initPresets(); } - // @CrossOrigin - // @PostMapping("api/renamePresets") - // @ResponseBody - // public Object renamePreset(@RequestBody RenamePresetRequest request) { - // return request; - // } + @CrossOrigin + @PostMapping("api/renamePreset") + @ResponseBody + public List renamePreset(@RequestBody RenamePresetRequest request) throws NotFoundError, ARException { + Presets presets = new Presets(javaAPI); + presets.renamePreset(request); + + for (var v : presets.getAll()) { + System.out.println(v.getName()); + } + return presets.getAll(); + } @CrossOrigin("*") @GetMapping("/api/getAllPresets") 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 d1f52b7..bfbc9c3 100644 --- a/backend/src/main/java/com/nttdata/calender/presets/Presets.java +++ b/backend/src/main/java/com/nttdata/calender/presets/Presets.java @@ -89,19 +89,26 @@ public class Presets { public boolean selectPreset(SelectPresetRequest guid) throws ARException { var queryP = new Query.QueryBuilder(formUserPref) - .addFieldValue("GUID", 364000001, new Value(guid.getGuid())).build(); - - var pref = api.queryFieldsById("\'2\'==\"ext_GedikSa\"", queryP.getFieldIds(), formUserPref, null, 0, 0); - + .addFieldValue("GUID", 364000001, new Value(guid.getGuid())).build(); + + var pref = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\"", queryP.getFieldIds(), formUserPref, null, 0, + 0); + api.modifyEntry(pref.get(0).getEntryId(), queryP); + + // TODO: Wann soll es false sein? Wenn kein Eintrag is? return true; } - // public void renamePreset(RenamePresetRequest request) throws ARException { - // var preset = api.queryFieldsById("\'179\'==\"" + request.getId() + "\"", - // defQuery.getFieldIds(), formDefault, null, 0, 0).get(0); + public void renamePreset(RenamePresetRequest request) throws ARException { - // } + var queryPresets = new Query.QueryBuilder(formDefault) + .addFieldValue("Name", 364000001, new Value(request.getNewName())).build(); + var preset = api.queryFieldsById("\'179\'==\"" + request.getId() + "\"", + queryPresets.getFieldIds(), formDefault, null, 0, 0).get(0); + + api.modifyEntry(preset.getEntryId(), queryPresets); + } public void allPresets() throws ARException, NotFoundError { var entries = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\"", query.getFieldIds(), formName, null, 0, diff --git a/backend/src/main/java/com/nttdata/calender/presets/RenamePresetRequest.java b/backend/src/main/java/com/nttdata/calender/presets/RenamePresetRequest.java index 5ff7238..61639a5 100644 --- a/backend/src/main/java/com/nttdata/calender/presets/RenamePresetRequest.java +++ b/backend/src/main/java/com/nttdata/calender/presets/RenamePresetRequest.java @@ -2,12 +2,10 @@ package com.nttdata.calender.presets; public class RenamePresetRequest { private String newName; - private String oldName; private String id; - public RenamePresetRequest(String newName, String oldName, String id) { + public RenamePresetRequest(String newName, String id) { this.newName = newName; - this.oldName = oldName; this.id = id; } @@ -19,14 +17,6 @@ public class RenamePresetRequest { this.newName = newName; } - public String getOldName() { - return this.oldName; - } - - public void setOldName(String oldName) { - this.oldName = oldName; - } - public String getId() { return this.id; } @@ -35,5 +25,4 @@ public class RenamePresetRequest { this.id = id; } - }