Refactor game-player relationship to initialize p0 and p1 at game creation

api/controllers/game/create.js

@@ -1,22 +1,25 @@
 const gameAPI = sails.hooks['customgamehook'];
 
 module.exports = function (req, res) {
-  const { gameName, isRanked = false } = req.body;
+  const { gameName, isRanked = false, player0Id, player1Id } = req.body;
+
   if (req.body.gameName) {
     gameAPI
-      .createGame(gameName, isRanked)
+      .createGame(gameName, isRanked, gameService.GameStatus.CREATED, player0Id, player1Id)
       .then(function (game) {
         sails.sockets.broadcast('GameList', 'gameCreated', {
           id: game.id,
           name: game.name,
           status: game.status,
           isRanked: game.isRanked,
-          players: [],
+          players: [], // This will now be populated based on p0 and p1
         });
         return res.ok({ gameId: game.id });
       })
       .catch(function (reason) {
         res.badRequest(reason);
       });
+  } else {
+    res.badRequest({ message: "Game name is required" });
   }
-};
+};

api/hooks/customGameHook/index.js

@@ -6,12 +6,14 @@ module.exports = function gameHook() {
   // Game API //
   //////////////
   return {
-    createGame: function (gameName, isRanked = false, status = gameService.GameStatus.CREATED) {
+    createGame: function (gameName, isRanked = false, status = gameService.GameStatus.CREATED, player0Id, player1Id) {
       return new Promise(function (resolve, reject) {
         Game.create({
           name: gameName,
           isRanked: isRanked === true,
           status,
+          p0: player0Id,
+          p1: player1Id,
         })
           .fetch()
           .then((game) => {
@@ -30,24 +32,36 @@ module.exports = function gameHook() {
     },
     findOpenGames: function () {
       return new Promise(function (resolve, reject) {
-        const recentUpdateThreshhold = dayjs.utc().subtract(1, 'day')
-          .toDate();
+        const recentUpdateThreshold = dayjs.utc().subtract(1, 'day').toDate();
+
         Game.find({
           status: gameService.GameStatus.CREATED,
-          createdAt: { '>=': recentUpdateThreshhold },
+          createdAt: { '>=': recentUpdateThreshold },
         })
-          .populate('players')
+          .populate('players') // Populate the players array
           .exec(function (error, games) {
             if (error) {
               return reject(error);
-            } else if (!games) {
+            } else if (!games || games.length === 0) {
               return reject({ message: "Can't find games" });
             }
-            const openGames = games.filter(({ players }) => players.length < 2);
-            return resolve(openGames);
+
+            // Filter games with fewer than 2 players and transform the players array
+            const openGames = games
+              .filter(({ players }) => players.length < 2) // Keep games with fewer than 2 players
+              .map((game) => {
+                // Transform players array to include only id and username
+                game.players = game.players.map((player) => ({
+                  id: player.id, // Use 'id' since Sails.js generates it automatically
+                  username: player.username,
+                }));
+                return game; // Return the updated game object
+              });
+
+            return resolve(openGames); // Resolve with transformed open games
           });
       });
-    },
+    },    
     findGame: function (id) {
       return new Promise(function (resolve, reject) {
         Game.findOne(id)

api/models/Game.js

@@ -144,4 +144,11 @@ module.exports = {
       columnType: 'timestamptz',
     },
   },
+
+  customToJSON: function () {
+    return {
+      ...this,
+      players: [this.p0, this.p1].filter(Boolean),
+    };
+  },
 }; // end exports