From d5b122b6126f4056f68eabd5df0fa0657117c424 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 14:55:35 +0200 Subject: [PATCH 1/7] added SG IH & KV to Change Items --- .../com/nttdata/calender/changes/Change.java | 5 ++++- .../nttdata/calender/changes/ChangeItem.java | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) 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 618d7c8..8e5db23 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -63,6 +63,8 @@ public class Change { .addFieldId("ChangeImplementerPersonId", 610023232) .addFieldId("PackageType", 670031016) .addFieldId("Contract", 670031002) + .addFieldId("SupportGroupIH", 1000003229) + .addFieldId("SupportGroupKV", 1000000015) .build(); } @@ -129,13 +131,14 @@ public class Change { change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg")); change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId")); change.setSupportGroupId(getValueStringByID(entry, "SupportGroupId")); + change.setSupportGroupKV(getValueStringByID(entry, "SupportGroupKV")); + change.setSupportGroupIH(getValueStringByID(entry, "SupportGroupIH")); change.setProviderCluster(getValueStringByID(entry, "ProviderCluster")); change.setChangeImplementer(getValueStringByID(entry, "ChangeImplementer")); change.setChangeImplementerLogin(getValueStringByID(entry, "ChangeImplementerLogin")); change.setChangeImplementerPersonId(getValueStringByID(entry, "ChangeImplementerPersonId")); change.setPackageType(getValueStringByID(entry, "PackageType")); change.setContract(getValueStringByID(entry, "Contract")); - change.setImplementerEdit( Optional.ofNullable(entry.get(queryChange.getFieldId("ChangeCoordinator"))) .map(Object::toString) 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..4aed6a0 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -16,6 +16,8 @@ public class ChangeItem { private int state; private String contract; private String supportGroup; + private String supportGroupIH; + private String supportGroupKV; private String coordinatorSgId; private String coordinatorSg; private String supportGroupId; @@ -156,6 +158,22 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } + public String getSupportGroupKV() { + return this.supportGroupKV; + } + + public void setSupportGroupKV(String supportGroupKV) { + this.supportGroupKV = supportGroupKV; + } + + public String getSupportGroupIH() { + return this.supportGroupIH; + } + + public void setSupportGroupIH(String supportGroupIH) { + this.supportGroupIH = supportGroupIH; + } + /** * * Gets the status reason of the change item. From c72fd1b04646689e81c33c80aaf37eb083876841 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 14:58:56 +0200 Subject: [PATCH 2/7] removed KV because it exists as SupportGroup --- .../main/java/com/nttdata/calender/changes/Change.java | 2 -- .../java/com/nttdata/calender/changes/ChangeItem.java | 9 --------- 2 files changed, 11 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 8e5db23..d138a7d 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -64,7 +64,6 @@ public class Change { .addFieldId("PackageType", 670031016) .addFieldId("Contract", 670031002) .addFieldId("SupportGroupIH", 1000003229) - .addFieldId("SupportGroupKV", 1000000015) .build(); } @@ -131,7 +130,6 @@ public class Change { change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg")); change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId")); change.setSupportGroupId(getValueStringByID(entry, "SupportGroupId")); - change.setSupportGroupKV(getValueStringByID(entry, "SupportGroupKV")); change.setSupportGroupIH(getValueStringByID(entry, "SupportGroupIH")); change.setProviderCluster(getValueStringByID(entry, "ProviderCluster")); change.setChangeImplementer(getValueStringByID(entry, "ChangeImplementer")); 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 4aed6a0..4a99894 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -17,7 +17,6 @@ public class ChangeItem { private String contract; private String supportGroup; private String supportGroupIH; - private String supportGroupKV; private String coordinatorSgId; private String coordinatorSg; private String supportGroupId; @@ -158,14 +157,6 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } - public String getSupportGroupKV() { - return this.supportGroupKV; - } - - public void setSupportGroupKV(String supportGroupKV) { - this.supportGroupKV = supportGroupKV; - } - public String getSupportGroupIH() { return this.supportGroupIH; } From 784f689498baa9e645c9ae5b1c40e4886a9e631c Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 15:08:59 +0200 Subject: [PATCH 3/7] no --- .../main/java/com/nttdata/calender/changes/Change.java | 2 -- .../java/com/nttdata/calender/changes/ChangeItem.java | 9 --------- 2 files changed, 11 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 d138a7d..16ee06a 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -63,7 +63,6 @@ public class Change { .addFieldId("ChangeImplementerPersonId", 610023232) .addFieldId("PackageType", 670031016) .addFieldId("Contract", 670031002) - .addFieldId("SupportGroupIH", 1000003229) .build(); } @@ -130,7 +129,6 @@ public class Change { change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg")); change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId")); change.setSupportGroupId(getValueStringByID(entry, "SupportGroupId")); - change.setSupportGroupIH(getValueStringByID(entry, "SupportGroupIH")); change.setProviderCluster(getValueStringByID(entry, "ProviderCluster")); change.setChangeImplementer(getValueStringByID(entry, "ChangeImplementer")); change.setChangeImplementerLogin(getValueStringByID(entry, "ChangeImplementerLogin")); 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 4a99894..f9214fd 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -16,7 +16,6 @@ public class ChangeItem { private int state; private String contract; private String supportGroup; - private String supportGroupIH; private String coordinatorSgId; private String coordinatorSg; private String supportGroupId; @@ -157,14 +156,6 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } - public String getSupportGroupIH() { - return this.supportGroupIH; - } - - public void setSupportGroupIH(String supportGroupIH) { - this.supportGroupIH = supportGroupIH; - } - /** * * Gets the status reason of the change item. From e66c39fe402d0890862144c82e09bb7667574a38 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 16:51:26 +0200 Subject: [PATCH 4/7] 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. From bed4771b2dcaa833fc45334f8097dd1610c59093 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 17:07:27 +0200 Subject: [PATCH 5/7] packagename done --- backend/src/main/java/com/nttdata/calender/changes/Change.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fdb48ee..346f3b5 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -158,7 +158,7 @@ public class Change { 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(); + return packageName.get(queryPackage.getFieldId("PackageName")).toString(); } /** From f3b753f2d3db2143f07d40f1bc1d1e329804025a Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 31 May 2023 11:26:14 +0200 Subject: [PATCH 6/7] get list of KVs --- .../com/nttdata/calender/api/KalenderRestController.java | 8 +++++--- .../com/nttdata/calender/supportgroup/SupportGroup.java | 7 +++++++ 2 files changed, 12 insertions(+), 3 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 8f72cc1..e969c5f 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -99,14 +99,16 @@ public class KalenderRestController { @CrossOrigin("*") - @GetMapping("/api/getKV") + @GetMapping("/api/getSupportGroupKV") @ResponseBody - public Object getSupportGroupKV() { + public Object getSupportGroupKV() throws ARException { + var kv = SupportGroup.getInstance(); + kv.getSupportGroupKVs(javaAPI); return null; } @CrossOrigin("*") - @GetMapping("/api/getIH") + @GetMapping("/api/getSupportGroupIH") @ResponseBody public Object getSupportGroupIH() { return null; diff --git a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java index 326359c..86681ef 100644 --- a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java +++ b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java @@ -93,6 +93,13 @@ public class SupportGroup { } } + public ArrayList getSupportGroupKVs(RemedyJavaAPI api) throws ARException { + var queryKVs = new Query.QueryBuilder("ASF:WI_TAS_Paket").addFieldId("SupportGroupKV", 1000000015).build(); + var kv = api.queryFieldsById("", queryKVs.getFieldIds(), queryKVs.getFormName(), null, 0, 0); + for (var k : kv) System.out.println("--------------------- " + k); + return null; + } + /** * Returns the list of support groups. * From 53473e0fe6f129825da5cfdbb117f3ea5a3d9ff2 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 31 May 2023 13:32:23 +0200 Subject: [PATCH 7/7] deleted kv and ih (not needed) --- .../calender/api/KalenderRestController.java | 17 ----------------- .../calender/supportgroup/SupportGroup.java | 7 ------- 2 files changed, 24 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 e969c5f..da16b85 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -97,23 +97,6 @@ public class KalenderRestController { } } - - @CrossOrigin("*") - @GetMapping("/api/getSupportGroupKV") - @ResponseBody - public Object getSupportGroupKV() throws ARException { - var kv = SupportGroup.getInstance(); - kv.getSupportGroupKVs(javaAPI); - return null; - } - - @CrossOrigin("*") - @GetMapping("/api/getSupportGroupIH") - @ResponseBody - public Object getSupportGroupIH() { - return null; - } - /** * Handles GET request to retrieve all support groups. * diff --git a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java index 86681ef..326359c 100644 --- a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java +++ b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java @@ -93,13 +93,6 @@ public class SupportGroup { } } - public ArrayList getSupportGroupKVs(RemedyJavaAPI api) throws ARException { - var queryKVs = new Query.QueryBuilder("ASF:WI_TAS_Paket").addFieldId("SupportGroupKV", 1000000015).build(); - var kv = api.queryFieldsById("", queryKVs.getFieldIds(), queryKVs.getFormName(), null, 0, 0); - for (var k : kv) System.out.println("--------------------- " + k); - return null; - } - /** * Returns the list of support groups. *