From 6e34a72a8b879d124da0f95f102ec0d6e0a537c5 Mon Sep 17 00:00:00 2001
From: Said Gedik <said.gedik@nttdata.com>
Date: Thu, 25 May 2023 11:54:57 +0200
Subject: [PATCH] implemented toApproval flag

---
 .../com/nttdata/calender/changes/Change.java  | 21 ++++++++++++-------
 .../nttdata/calender/changes/ChangeItem.java  |  9 ++++++++
 2 files changed, 22 insertions(+), 8 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 ba2e9e8..c4d0835 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/Change.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java
@@ -141,15 +141,17 @@ public class Change {
                                                         .filter(peopleFullName::equals)
                                                         .isPresent());
                         try {
+                                var currentState = getValue(entry, "State").getIntValue();
                                 var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr"));
 
-                                var approveAndRejectFlag = approveAndReject(inApproval, getValue(entry, "State").getIntValue());
-                                change.setFlagApprove(approveAndRejectFlag);
-                                change.setFlagReject(approveAndRejectFlag);
-                                
-                                var cancelFlag = cancel(getValueStringByID(entry, "SupportGroupId"), getValue(entry, "State").getIntValue());
-                                change.setFlagCancel(cancelFlag);         
+                                var approve_reject = flagApproval(inApproval, currentState);
+                                change.setFlagApprove(approve_reject);
+                                change.setFlagReject(approve_reject);
                                 
+                                var cancel = flagCancel(getValueStringByID(entry, "SupportGroupId"), currentState);
+                                change.setFlagCancel(cancel);         
+
+                                change.setFlagToApproval(flagToApproval(currentState));
                         } catch (ARException e) {
                                 e.printStackTrace();
                         }
@@ -171,12 +173,12 @@ public class Change {
                 return approvers != null ? approvers.contains(user) : false;
         }
 
-        public boolean approveAndReject(boolean approval, int status) {
+        public boolean flagApproval(boolean approval, int status) {
                 boolean approvableStatus = (status == 1 || status == 10);
                 return approval && approvableStatus;
         }
 
-        public boolean cancel(String supportGroupId, int status) throws ARException {
+        public boolean flagCancel(String supportGroupId, int status) throws ARException {
                 var queryRoles = new Query.QueryBuilder("CTM:SupportGroupFuncRoleLookUp").addFieldId("Role", 1000000014).build();
                 var role = api.queryFieldsById("\'Support Group ID\' = \"" + supportGroupId + "\"", queryRoles.getFieldIds(), queryRoles.getFormName(), null, 0, 0)
                         .get(0).get(queryRoles.getFieldId("Role")).toString();
@@ -186,6 +188,9 @@ public class Change {
                 return approvableStatus && isChangeManager;
         }
 
+        public boolean flagToApproval(int status) {
+                return status == 0;
+        }
 
         /**
          * Returns the {@link Value} of an entry based on the provided description.
diff --git a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
index 50b7bf5..9008c91 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
@@ -31,6 +31,7 @@ public class ChangeItem {
     private Date D2;
     private Date D3;
     private Date D4;
+    private boolean flagToApproval;
     private boolean flagApprove;
     private boolean flagReject;
     private boolean flagCancel;
@@ -159,6 +160,14 @@ public class ChangeItem {
         this.changeImplementerPersonId = changeImplementerPersonId;
     }
 
+    public boolean getFlagToApproval() {
+        return this.flagToApproval;
+    }
+
+    public void setFlagToApproval(boolean flagToApproval) {
+        this.flagToApproval = flagToApproval;
+    }
+
     public boolean getFlagApprove() {
         return this.flagApprove;
     }