From f170685f6cce16f168652574ddd9d828d9286e99 Mon Sep 17 00:00:00 2001
From: Said Gedik <said.gedik@nttdata.com>
Date: Mon, 5 Feb 2024 12:05:05 +0100
Subject: [PATCH] query fix allpresets

---
 .../com/nttdata/calender/presets/Presets.java | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

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 f9c65dc..a1386e4 100644
--- a/backend/src/main/java/com/nttdata/calender/presets/Presets.java
+++ b/backend/src/main/java/com/nttdata/calender/presets/Presets.java
@@ -174,21 +174,22 @@ public class Presets {
         }
 
         public void allPresets() throws ARException, NotFoundError {
-                var entries = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\"", defQuery.getFieldIds(),
+                var entries = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\" OR \'364000004\'!=NULL OR \'364000003\'!=NULL",
+                                defQuery.getFieldIds(),
                                 formDefault,
                                 null, 0,
                                 0);
 
                 if (entries.isEmpty() || entries == null) {
                         throw new NotFoundError("No presets found in this context");
-                } else {
-                        for (var v : entries) {
-                                var isSystem = v.get(defQuery.getFieldId("isSystemDefault"));
-                                presets.add(new Preset(v.get(defQuery.getFieldId("InstanceId")).toString(),
-                                                v.get(defQuery.getFieldId("Name")).toString(),
-                                                v.get(defQuery.getFieldId("Definition")).toString(),
-                                                isSystem.toString() != null && !isSystem.toString().isEmpty() ? "System" : "User"));
-                        }
+                }
+                for (var v : entries) {
+                        var isSystem = v.get(defQuery.getFieldId("isSystemDefault"));
+                        presets.add(new Preset(v.get(defQuery.getFieldId("InstanceId")).toString(),
+                                        v.get(defQuery.getFieldId("Name")).toString(),
+                                        v.get(defQuery.getFieldId("Definition")).toString(),
+                                        isSystem.toString() != null && !isSystem.toString().isEmpty() ? "System"
+                                                        : "User"));
                 }
         }
 
@@ -198,7 +199,8 @@ public class Presets {
                 api.deleteEntry(formDefault, entries.getEntryId());
 
                 // SYSTEMDEFAULT
-                var sysdef = api.queryFieldsById("\'364000001\'==\"Systemdefault\"", defQuery.getFieldIds(), formDefault, null, 0, 0).get(0);
+                var sysdef = api.queryFieldsById("\'364000001\'==\"Systemdefault\"", defQuery.getFieldIds(),
+                                formDefault, null, 0, 0).get(0);
                 String sysdefGUID = sysdef.get(defQuery.getFieldId("InstanceId")).toString();
 
                 // reset selected preset