diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 97afbb1..ba6a06e 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -120,22 +120,44 @@ public class delegationServices { String blockedRG = (String) Filter.get("rgflag"); if ((Boolean)Filter.get("serviceState") == false) { - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("rid", Lrequest.get("rid")); + if ((Boolean)Filter.get("serviceTermination") == true) + { + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("rid", Lrequest.get("rid")); + + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + BasicDBObject updateQuery2 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 60)); + updateQuery2.append("$set", + new BasicDBObject().append("dn",Filter.get("serviceTerminationNotes"))); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery2); + dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); + } else + { + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("rid", Lrequest.get("rid")); + + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + BasicDBObject updateQuery2 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 52)); + updateQuery2.append("$set", + new BasicDBObject().append("dn",Filter.get("deniedmsg"))); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery2); + dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); + } - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - BasicDBObject updateQuery2 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 52)); - updateQuery2.append("$set", - new BasicDBObject().append("dn",Filter.get("deniedmsg"))); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery2); - dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); } else { if (blockedRG.contains(RG)) { BasicDBObject searchQuery = new BasicDBObject();