From 9f92d8e3b86b3ab2c12da5ec7d1918f8b805370f Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 28 Feb 2024 16:09:30 +0100 Subject: [PATCH] userpref --- .../calender/api/KalenderRestController.java | 2 +- .../com/nttdata/calender/presets/Presets.java | 46 ++++++++++++------- 2 files changed, 30 insertions(+), 18 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 6275787..f4a9584 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -380,7 +380,7 @@ public class KalenderRestController { @CrossOrigin("*") @PostMapping("api/editUserPreferences") @ResponseBody - public String editUserPreferences(@RequestBody EditUserPreferencesRequest request) throws ARException, NotFoundError { + public JSONObject editUserPreferences(@RequestBody EditUserPreferencesRequest request) throws ARException, NotFoundError { Presets presets = new Presets(javaAPI); return presets.editUserPreferences(request); } 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 a1386e4..65e716f 100644 --- a/backend/src/main/java/com/nttdata/calender/presets/Presets.java +++ b/backend/src/main/java/com/nttdata/calender/presets/Presets.java @@ -3,6 +3,8 @@ package com.nttdata.calender.presets; import java.util.ArrayList; import java.util.List; +import org.json.JSONObject; + import com.bmc.arsys.api.ARException; import com.bmc.arsys.api.Value; import com.bmc.thirdparty.org.springframework.beans.factory.annotation.Autowired; @@ -154,24 +156,34 @@ public class Presets { api.modifyEntry(preset.getEntryId(), queryPresets); } - public String editUserPreferences(EditUserPreferencesRequest request) throws ARException { - var queryUserPreferences = new Query.QueryBuilder(formUserPref) - .addFieldValue("Details", 364000002, new Value(request.getDetails())) - .addFieldValue("View", 364000003, new Value(request.getView())) - .addFieldValue("Language", 364000004, new Value(request.getLanguage())) - .build(); - - var preferences = api - .queryFieldsById("\'2\'==\"" + api.getUser() + "\"", queryUserPreferences.getFieldIds(), - formUserPref, null, 0, 0) - .get(0); - - // bei falschen input parameter - if (preferences.isEmpty() || preferences == null) - return "Error"; - api.modifyEntry(preferences.getEntryId(), queryUserPreferences); - return "Success"; + public JSONObject editUserPreferences(EditUserPreferencesRequest request) throws ARException { + var queryUserPreferences = new Query.QueryBuilder(formUserPref) + .addFieldValue("Details", 364000002, new Value(request.getDetails())) + .addFieldValue("View", 364000003, new Value(request.getView())) + .addFieldValue("Language", 364000004, new Value(request.getLanguage())) + .build(); + + var preferences = api + .queryFieldsById("\'2\'==\"" + api.getUser() + "\"", queryUserPreferences.getFieldIds(), + formUserPref, null, 0, 0) + .get(0); + + JSONObject response = new JSONObject(); + + // Check for incorrect input parameters + if (preferences.isEmpty() || preferences == null) { + response.put("status", "Error"); + response.put("message", "Invalid input parameters"); + return response; + } + + api.modifyEntry(preferences.getEntryId(), queryUserPreferences); + + response.put("status", "Success"); + response.put("message", "User preferences updated successfully"); + return response; } + public void allPresets() throws ARException, NotFoundError { var entries = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\" OR \'364000004\'!=NULL OR \'364000003\'!=NULL",