diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index ea03339..b9bb8b7 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -87,8 +87,6 @@ public class delegationServices { try { try { ClientID = (int) Lrequest.get("clientid"); - System.out.println(Macid); - } catch (Exception exrp) { delegationTimer.DeleteTargetRequest(ClientID); } @@ -127,11 +125,50 @@ public class delegationServices { System.out.println("Delegation Has Started"); if(requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype ==7 || requesttype == 8 || requesttype ==9 || requesttype ==10 || requesttype ==11 || requesttype ==12 || requesttype == 20 || requesttype == 21 || requesttype == 41) { - if (requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype == 19 || requesttype == 12) { + if ( requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype == 19 || requesttype == 12) { System.out.println("An Excluded Request (7MAL, 12S, 4C, 5C, 6C) Has Been Detected, Ignoring"); //Thinking of moving all purge timer call to here to centralize deletion decision. System.out.println(requesttype); } + if (requesttype == 41) + { + System.out.println("Update Request"); + BasicDBObject searchQuery = new BasicDBObject(); + BasicDBObject SqS = new BasicDBObject(); + SqS.append("clientid", ClientID); + + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery2 = new BasicDBObject(); + BasicDBObject updateQuery3 = new BasicDBObject(); + BasicDBObject updateQuery4 = new BasicDBObject(); + BasicDBObject updateQuery6 = new BasicDBObject(); + try + { + Document LCP = RGFilter.find(eq("rgkey", "UAROCKS")).first(); + String UPDT =(String)LCP.get("URI"); + updateQuery.append("$set", + new BasicDBObject().append("type", 42)); + updateQuery2.append("$set", + new BasicDBObject().append("uri",UPDT)); + updateQuery6.append("$set", + new BasicDBObject().append("status", true)); + } + catch (Exception ex) + { + updateQuery.append("$set", + new BasicDBObject().append("type", 43)); + updateQuery2.append("$set", + new BasicDBObject().append("uri","F")); + updateQuery6.append("$set", + new BasicDBObject().append("status", true)); + } + dCollection.updateOne(SqS, updateQuery); + dCollection.updateOne(SqS,updateQuery2); + dCollection.updateOne(SqS, updateQuery6); + System.out.println("Finished Updater Request"); + delegationTimer.DeleteTargetRequest(ClientID); + + } if (requesttype == 0) { int CTOKEN = (int) Lrequest.get("Token"); System.out.println("Sync Request (Read)"); @@ -238,7 +275,7 @@ public class delegationServices { delegationTimer.DeleteTargetRequest(ClientID); } } - + System.out.println("Lets Service This Request: " + ClientID); //sync write request if (requesttype == 1) { System.out.println("Sync Request (Write)"); @@ -865,44 +902,6 @@ public class delegationServices { { //Friends Network Login Goes Here, Fun. } - if (requesttype == 41) - { - System.out.println("Update Request"); - BasicDBObject searchQuery = new BasicDBObject(); - BasicDBObject SqS = new BasicDBObject(); - SqS.append("clientid", ClientID); - - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery2 = new BasicDBObject(); - BasicDBObject updateQuery3 = new BasicDBObject(); - BasicDBObject updateQuery4 = new BasicDBObject(); - BasicDBObject updateQuery6 = new BasicDBObject(); - try - { - updateQuery.append("$set", - new BasicDBObject().append("type", 42)); - updateQuery2.append("$set", - new BasicDBObject().append("uri",(String)Filter.get("up"))); - updateQuery6.append("$set", - new BasicDBObject().append("status", true)); - } - catch (Exception ex) - { - updateQuery.append("$set", - new BasicDBObject().append("type", 43)); - updateQuery2.append("$set", - new BasicDBObject().append("uri",(String)Filter.get("up"))); - updateQuery6.append("$set", - new BasicDBObject().append("status", true)); - } - dCollection.updateOne(SqS, updateQuery); - dCollection.updateOne(SqS,updateQuery2); - dCollection.updateOne(SqS, updateQuery6); - System.out.println("Finished Updater Request"); - //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); - - } } else { System.out.println("Malformed Request, Non Recoverable (Request Type Not Found)"); BasicDBObject searchQuery = new BasicDBObject(); @@ -932,9 +931,12 @@ public class delegationServices { new BasicDBObject().append("type", 7)); updateQuery1.append("$set", new BasicDBObject().append("status", true)); + updateQuery1.append("$set", + new BasicDBObject().append("pos", "934")); Lrequest.append("status",true); dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery,updateQuery); delegationTimer.DeleteTargetRequest(ClientID); } }