JamesQ/MatchmakingBackend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved Deletion Trigger to start of request parse to prevent issues down the line.

Browse Source
This commit is contained in:
James Quinley 2022-02-09 15:29:02 -08:00
parent c2a4cb1064
commit 1ad7ba95e1
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
View File

@ -67,6 +67,7 @@ public class delegationServices {
if (requesttype == 0) { if (requesttype == 0) {
delegationTimer.DeleteTargetRequest(ClientID);
int CTOKEN = (int) Lrequest.get("Token"); int CTOKEN = (int) Lrequest.get("Token");
System.out.println("Sync Request (Read)"); System.out.println("Sync Request (Read)");
Document accountServer; Document accountServer;
@ -135,7 +136,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
//delegationTimer.trigger(); //delegationTimer.trigger();
} }
} else { } else {
@ -151,7 +152,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
} }
} catch(MongoCommandException ERC){ } catch(MongoCommandException ERC){
System.out.println("Malformed Request"); System.out.println("Malformed Request");
@ -167,13 +168,14 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} }
//sync read request //sync read request
//TODO This has issues, and won't get past line 171. Working on a fix for that. //TODO This has issues, and won't get past line 171. Working on a fix for that.
if (requesttype == 1) { if (requesttype == 1) {
delegationTimer.DeleteTargetRequest(ClientID);
System.out.println("Sync Request (Write)"); System.out.println("Sync Request (Write)");
int CTOKEN = (int) Lrequest.get("Token"); int CTOKEN = (int) Lrequest.get("Token");
Document accountServer; Document accountServer;
@ -235,7 +237,6 @@ public class delegationServices {
accountS.updateOne(searchQuery, updateQuery7); accountS.updateOne(searchQuery, updateQuery7);
System.out.println("Updated Account"); System.out.println("Updated Account");
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} else { } else {
System.out.println("Sync Failure"); System.out.println("Sync Failure");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -250,7 +251,6 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} else { } else {
System.out.println("Banned Account"); System.out.println("Banned Account");
@ -265,7 +265,6 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
} }
} catch(MongoCommandException ERC){ } catch(MongoCommandException ERC){
System.out.println("Malformed Request"); System.out.println("Malformed Request");
@ -281,10 +280,10 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} }
if (requesttype == 2) { if (requesttype == 2) {
delegationTimer.DeleteTargetRequest(ClientID);
System.out.println("Login Request (USR&PASS)"); System.out.println("Login Request (USR&PASS)");
String username = (String) Lrequest.get("User"); String username = (String) Lrequest.get("User");
String password = (String) Lrequest.get("Password"); String password = (String) Lrequest.get("Password");
@ -344,7 +343,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery6); dCollection.updateOne(searchQuery, updateQuery6);
dCollection.updateOne(searchQuery, updateQuery7); dCollection.updateOne(searchQuery, updateQuery7);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} else { } else {
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("clientid", ClientID); searchQuery.append("clientid", ClientID);
@ -358,7 +357,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} else { } else {
System.out.println("Banned Account"); System.out.println("Banned Account");
@ -373,7 +372,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
} }
} catch (Exception ERC) { } catch (Exception ERC) {
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -388,11 +387,12 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} }
if (requesttype == 3) { if (requesttype == 3) {
delegationTimer.DeleteTargetRequest(ClientID);
System.out.println("Login Request (TKN)"); System.out.println("Login Request (TKN)");
int CTOKEN = (int) Lrequest.get("Token"); int CTOKEN = (int) Lrequest.get("Token");
// Document TResolve = dCollection.find(eq("type", 3)).first(); // Document TResolve = dCollection.find(eq("type", 3)).first();
@ -453,7 +453,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery8);
dCollection.updateOne(searchQuery, updateQuery7); dCollection.updateOne(searchQuery, updateQuery7);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} else { } else {
System.out.println("Login Failure"); System.out.println("Login Failure");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -468,7 +468,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} else { } else {
System.out.println("Banned Account"); System.out.println("Banned Account");
@ -483,7 +483,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
} }
} catch (MongoCommandException ERC) { } catch (MongoCommandException ERC) {
System.out.println("Malformed Request"); System.out.println("Malformed Request");
@ -498,7 +498,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
//delegationTimer.trigger(); //delegationTimer.trigger();
} }
} }
@ -520,7 +520,7 @@ public class delegationServices {
Lrequest.append("status",true); Lrequest.append("status",true);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
delegationTimer.DeleteTargetRequest(ClientID);
} }