diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index b0b98ca..4d2cf0d 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -126,7 +126,7 @@ public class delegationServices { } else { System.out.println("Sync Failure"); BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("rid",(int) Lrequest.get("rid")); + searchQuery.append("rid", Lrequest.get("rid")); BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); @@ -173,7 +173,6 @@ public class delegationServices { } //sync read request - //TODO This has issues, and won't get past line 171. Working on a fix for that. if (requesttype == 1) { delegationTimer.DeleteTargetRequest(ClientID); System.out.println("Sync Request (Write)"); @@ -436,6 +435,9 @@ public class delegationServices { updateQuery4.append("$set", new BasicDBObject().append("User", UserName)); updateQuery5.append("$set", + + + new BasicDBObject().append("Password", Password)); updateQuery7.append("$set", new BasicDBObject().append("Email", Email)); @@ -626,11 +628,19 @@ public class delegationServices { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid",CID); dCollection.deleteMany(searchQuery); - System.out.println("Flushed a targeted request from the server"); + System.out.println("Flushed a targeted request (CID) from the server"); } - public static void delegate () + + public static void TargetDeleteRID (int CID) { + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("rid",CID); + dCollection.deleteMany(searchQuery); + System.out.println("Flushed a targeted request (RID) from the server"); + + + } public static void delegate () { userAuthetication(); } diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java b/src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java index d22068a..92c7010 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java @@ -39,4 +39,19 @@ public class delegationTimer { }; scheduler.scheduleAtFixedRate(runnable, 0, 1, TimeUnit.SECONDS); } -} + public static void DeleteTargetRequestRID (int RID) + { + final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); + final Runnable runnable = new Runnable() { + int countdownStarter = 9; + public void run() { + countdownStarter--; + if (countdownStarter <= 0) { + countdownStarter = 9; + delegationServices.TargetDeleteRID(RID); + scheduler.shutdown(); + } + } + }; + scheduler.scheduleAtFixedRate(runnable, 0, 1, TimeUnit.SECONDS); + }}