diff --git a/server/controllers/api/apiRoom.js b/server/controllers/api/apiRoom.js index 9f77c87..74d8195 100644 --- a/server/controllers/api/apiRoom.js +++ b/server/controllers/api/apiRoom.js @@ -5,6 +5,8 @@ const {enableRoomSocket} = require('../../socket'); const getAll = async (req, res, next) => { try { + const publicRooms = await roomQueries.findPublicRooms(); + res.status(200).json({rooms: [...publicRooms]}) } @@ -17,7 +19,6 @@ const show = async (req, res, next) => { try { const roomId = req.params.id; // TODO eventually add check for user's private rooms - const publicRooms = await roomQueries.findPublicRooms(); enableRoomSocket(roomId); const currentRoom = await roomQueries.findRoomById(roomId); diff --git a/server/data/migrations/20200120224032_game.js b/server/data/migrations/20200120224032_game.js index b70b147..db63b06 100644 --- a/server/data/migrations/20200120224032_game.js +++ b/server/data/migrations/20200120224032_game.js @@ -18,6 +18,7 @@ exports.up = function(knex) { table.float('komi').default(6.5); table.integer('handicap').default(0); table.integer('board_size').default(19); + table.boolean('open').default(true); table.string('application'); table.string('application_version'); diff --git a/server/data/seeds/04_user.js b/server/data/seeds/03_user.js similarity index 100% rename from server/data/seeds/04_user.js rename to server/data/seeds/03_user.js diff --git a/server/data/seeds/03_game.js b/server/data/seeds/04_game.js similarity index 59% rename from server/data/seeds/03_game.js rename to server/data/seeds/04_game.js index 185c88e..65414cf 100644 --- a/server/data/seeds/03_game.js +++ b/server/data/seeds/04_game.js @@ -10,7 +10,14 @@ exports.seed = function(knex) { application: 'node-go', application_version: '0.1.0', player_black: 'anon', player_white: 'anon', player_black_rank: 'K3', player_white_rank: 'K2', - room: 1, time_setting: 1 + room: 1, time_setting: 1, open: false + }, + { + id: 2, date: new Date(), + application: 'node-go', application_version: '0.1.0', + player_black: 'user-one', player_black_rank: 'UR', + user_black: 2, + room: 1, time_setting: 1, open: true } ]); }); diff --git a/server/package.json b/server/package.json index 02e1854..ca2c60f 100644 --- a/server/package.json +++ b/server/package.json @@ -9,7 +9,8 @@ "migrate": "./node_modules/.bin/knex migrate:latest", "migrate-test": "./node_modules/.bin/knex migrate:latest --env test", "seed": "./node_modules/.bin/knex seed:run", - "make-seed": "./node_modules/.bin/knex seed:make" + "make-seed": "./node_modules/.bin/knex seed:make", + "reset-db": "./node_modules/.bin/knex migrate:rollback true && npm run migrate && npm run seed" }, "dependencies": { "bcrypt": "^3.0.7",