From 64b091697027cfea41d537dac8b2d32301f32af6 Mon Sep 17 00:00:00 2001
From: Said Gedik <said.gedik@nttdata.com>
Date: Wed, 24 May 2023 12:43:20 +0200
Subject: [PATCH] fixed/modified setApprovalFlag

---
 .../com/nttdata/calender/changes/Change.java  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java
index 69c15fe..af618e6 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/Change.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java
@@ -135,34 +135,34 @@ public class Change {
                         change.setChangeImplementerPersonId(getValueStringByID(entry, "ChangeImplementerPersonId"));
                         change.setPackageType(getValueStringByID(entry, "PackageType"));
                         change.setContract(getValueStringByID(entry, "Contract"));
-                        try {
-                                change.setApprovalFlag(inApprovalList(api.getUser(), getValueStringByID(entry, "ChangerNr")));
-                        } catch (ARException e) {
-                                e.printStackTrace();
-                        }
                         change.setImplementerEdit(
                                         Optional.ofNullable(entry.get(queryChange.getFieldId("ChangeCoordinator")))
                                                         .map(Object::toString)
                                                         .filter(peopleFullName::equals)
                                                         .isPresent());
+                        try {
+                                var flag = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr"));
+                                change.setApprovalFlag(flag);
+                        } catch (ARException e) {
+                                e.printStackTrace();
+                        }
                         changes.add(change);
                 });
 
                 api.freeImpersonatedUser();
-
                 return new ChangeResponse(entriesSize, changes);
         }
 
         public boolean inApprovalList(String user, String changeNr) throws ARException {
                 var queryApprovalList = new Query.QueryBuilder("ASF:OverviewConsole_TicketsJoinAPDetailSignature")
-                        .addFieldId("Approvers", 13207).build();
-        
+                                .addFieldId("Approvers", 13207).build();
+
                 var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"",
-                        queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0);
-        
-                String approvers = approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString();
-                return approvers.contains(user);
-            }
+                                queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0);
+                
+                var approvers = !approversOI.isEmpty() ? approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString() : null;
+                return approvers != null ? approvers.contains(user) : false;
+        }
 
         /**
          * Returns the {@link Value} of an entry based on the provided description.