taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed/modified setApprovalFlag

main
Said Gedik 2023-05-24 12:43:20 +02:00
parent 4ecaea20f8
commit 64b0916970
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/src/main/java/com/nttdata/calender/changes/Change.java
View File

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