From c95b25f28765288fab39d16ad804e2f83760a0f3 Mon Sep 17 00:00:00 2001
From: ivarnm <36505347+ivarnm@users.noreply.github.com>
Date: Fri, 3 Apr 2020 09:37:17 +0200
Subject: [PATCH] #69 Add doRoundCheck
---
.../com/gameware/game/QueryIntermediate.java | 8 +++--
.../com/gameware/game/models/RoundCheck.java | 33 +++++++++++++++++++
2 files changed, 38 insertions(+), 3 deletions(-)
create mode 100644 frontend/core/src/com/gameware/game/models/RoundCheck.java
diff --git a/frontend/core/src/com/gameware/game/QueryIntermediate.java b/frontend/core/src/com/gameware/game/QueryIntermediate.java
index 0cd5c59..d27987f 100644
--- a/frontend/core/src/com/gameware/game/QueryIntermediate.java
+++ b/frontend/core/src/com/gameware/game/QueryIntermediate.java
@@ -14,6 +14,7 @@ import com.gameware.game.models.Highscore;
import com.gameware.game.models.Player;
import com.gameware.game.models.Point;
import com.gameware.game.models.Round;
+import com.gameware.game.models.RoundCheck;
import com.gameware.game.models.Tournament;
import java.io.IOException;
@@ -209,12 +210,13 @@ public class QueryIntermediate {
return points;
}
- public static Tournament doRoundCheck(String tournamentId) throws IOException, NoSuchElementException {
+ public static RoundCheck doRoundCheck(String tournamentId) throws IOException, NoSuchElementException {
String route = "tournament/roundcheck/" + tournamentId;
String[] response = sendPutRequest(route, null);
checkStatusCode(response);
- System.out.println(response);
- return null;
+ RoundCheck roundCheck = json.fromJson(RoundCheck.class, response[1]);
+ checkObjectNotNull(roundCheck);
+ return roundCheck;
}
// ---------------- Highscore methods ----------------
diff --git a/frontend/core/src/com/gameware/game/models/RoundCheck.java b/frontend/core/src/com/gameware/game/models/RoundCheck.java
new file mode 100644
index 0000000..fb0da29
--- /dev/null
+++ b/frontend/core/src/com/gameware/game/models/RoundCheck.java
@@ -0,0 +1,33 @@
+package com.gameware.game.models;
+
+import com.badlogic.gdx.utils.Json;
+
+public class RoundCheck implements ModelInterface {
+ private boolean active;
+ private boolean nextRound;
+
+ public RoundCheck() {
+ }
+
+ public boolean isActive() {
+ return active;
+ }
+
+ public boolean isNextRound() {
+ return nextRound;
+ }
+
+ @Override
+ public void reset() {
+ active = false;
+ nextRound = false;
+ }
+
+ @Override
+ public String report() {return new Json().toJson(this);}
+
+ @Override
+ public String toString() {
+ return report();
+ }
+}
--
GitLab