From e66c39fe402d0890862144c82e09bb7667574a38 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 16:51:26 +0200 Subject: [PATCH] added packagename to change items --- .../calender/api/KalenderRestController.java | 16 ++++++++++++++++ .../com/nttdata/calender/changes/Change.java | 13 +++++++++++++ .../com/nttdata/calender/changes/ChangeItem.java | 10 ++++++++++ 3 files changed, 39 insertions(+) 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 7255f4b..8f72cc1 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.checkerframework.common.util.report.qual.ReportCall; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -96,6 +97,21 @@ public class KalenderRestController { } } + + @CrossOrigin("*") + @GetMapping("/api/getKV") + @ResponseBody + public Object getSupportGroupKV() { + return null; + } + + @CrossOrigin("*") + @GetMapping("/api/getIH") + @ResponseBody + public Object getSupportGroupIH() { + return null; + } + /** * Handles GET request to retrieve all support groups. * 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 16ee06a..fdb48ee 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -140,6 +140,13 @@ public class Change { .map(Object::toString) .filter(peopleFullName::equals) .isPresent()); + + + try { + change.setPackageName(queryPackageName(getValueStringByID(entry, "PackageType").toString())); + } catch (ARException e) { + e.printStackTrace(); + } changes.add(change); }); @@ -148,6 +155,12 @@ public class Change { return new ChangeResponse(entriesSize, changes); } + private String queryPackageName(String packageType) throws ARException{ + var queryPackage = new Query.QueryBuilder("CTR:GenericContractJoinCFG_Package").addFieldId("PackageName", 200000020).build(); + var packageName = api.queryFieldsById("\'InstanceId_Package\' = \"" + packageType + "\"", queryPackage.getFieldIds(), queryPackage.getFormName(), null, 0, 0).get(0); + return packageName.toString(); + } + /** * 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 f9214fd..8c77c3a 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -27,6 +27,7 @@ public class ChangeItem { private String changeImplementerPersonId; private boolean implementerEdit; private String packageType; + private String packageName; private Date D1; private Date D2; private Date D3; @@ -156,6 +157,15 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } + + public String getPackageName() { + return this.packageName; + } + + public void setPackageName(String packageName) { + this.packageName = packageName; + } + /** * * Gets the status reason of the change item.