Merge remote-tracking branch 'origin/dev' into 97-last-day-changes

backend/api/rounds.js

@@ -449,7 +449,7 @@ function roundcheck(client, tournament, roundid) {
         // fetched the round objects of the active round
         let activePlayer;
         for (let i = 0; i < rounds.length; i++) {
-          if (rounds[i]._id.str == roundid.str) {
+          if (String(rounds[i]._id) == String(roundid)) {
             activePlayer = rounds[i].playerId;
             break;
           }

backend/api/tournament.js

@@ -309,6 +309,46 @@ router.get("/playeractive/:userid", (req, res) => {
   );
 });
 
+router.get("/specific/:id", (req, res) => {
+  MongoClient.connect(
+    connectionUrl,
+    { useNewUrlParser: true, useUnifiedTopology: true },
+    (err, client) => {
+      // Unable to connect to database
+      if (err) {
+        res.sendStatus(500); // Internal server error
+        return;
+      }
+      let id;
+      if (!req.params.id) {
+        res.sendStatus(400);
+      }
+      try {
+        id = mongo.ObjectID(req.params.id);
+      } catch (err) {
+        res.sendStatus(400);
+      }
+      // Using the database gameWare and collection tournaments
+      const db = client.db("gameWare");
+      const collection = "tournaments";
+
+      db.collection(collection)
+        .find({
+          _id: id,
+        })
+        .toArray((err, result) => {
+          if (err) {
+            res.sendStatus(500);
+            client.close();
+            return;
+          }
+          res.json(result[0]);
+          client.close();
+        });
+    }
+  );
+});
+
 router.get("/player/:userid/:active", (req, res) => {
   // Returns the tournaments of player with active field matching parameter
   // Also checks the state of all tournaments

frontend/core/src/com/gameware/game/QueryIntermediate.java

@@ -160,6 +160,15 @@ public class QueryIntermediate {
         return tournaments;
     }
 
+    public static Tournament getSpecificTournament(String tournamentID) throws IOException, NoSuchElementException {
+        String route = "tournament/specific/" + tournamentID;
+        String[] response = sendGetRequest(route);
+        checkStatusCode(response);
+        Tournament tournament = json.fromJson(Tournament.class, response[1]);
+        checkObjectNotNull(tournament);
+        return tournament;
+    }
+
     public static Tournament joinATournament(String playerId) throws IOException, NoSuchElementException {
         String route = "tournament/join/";
         Map<String, String> params = new HashMap<>();