From 59b5d31c35ce5832ff3ddc5476d8fc7aca688672 Mon Sep 17 00:00:00 2001
From: Sorrel Bri <sorrel.bri.june@gmail.com>
Date: Thu, 23 Jan 2020 16:04:40 -0800
Subject: [PATCH] patch no-query bug in rooms/ endpoint

---
 .../play-node-go/server/controllers/api/apiRoom.js       | 3 ++-
 .../server/data/migrations/20200120224032_game.js        | 1 +
 .../server/data/seeds/{04_user.js => 03_user.js}         | 0
 .../server/data/seeds/{03_game.js => 04_game.js}         | 9 ++++++++-
 .../server/packages/play-node-go/server/package.json     | 3 ++-
 5 files changed, 13 insertions(+), 3 deletions(-)
 rename packages/server/packages/play-node-go/server/data/seeds/{04_user.js => 03_user.js} (100%)
 rename packages/server/packages/play-node-go/server/data/seeds/{03_game.js => 04_game.js} (59%)

diff --git a/packages/server/packages/play-node-go/server/controllers/api/apiRoom.js b/packages/server/packages/play-node-go/server/controllers/api/apiRoom.js
index 9f77c87..74d8195 100644
--- a/packages/server/packages/play-node-go/server/controllers/api/apiRoom.js
+++ b/packages/server/packages/play-node-go/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/packages/server/packages/play-node-go/server/data/migrations/20200120224032_game.js b/packages/server/packages/play-node-go/server/data/migrations/20200120224032_game.js
index b70b147..db63b06 100644
--- a/packages/server/packages/play-node-go/server/data/migrations/20200120224032_game.js
+++ b/packages/server/packages/play-node-go/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/packages/server/packages/play-node-go/server/data/seeds/04_user.js b/packages/server/packages/play-node-go/server/data/seeds/03_user.js
similarity index 100%
rename from packages/server/packages/play-node-go/server/data/seeds/04_user.js
rename to packages/server/packages/play-node-go/server/data/seeds/03_user.js
diff --git a/packages/server/packages/play-node-go/server/data/seeds/03_game.js b/packages/server/packages/play-node-go/server/data/seeds/04_game.js
similarity index 59%
rename from packages/server/packages/play-node-go/server/data/seeds/03_game.js
rename to packages/server/packages/play-node-go/server/data/seeds/04_game.js
index 185c88e..65414cf 100644
--- a/packages/server/packages/play-node-go/server/data/seeds/03_game.js
+++ b/packages/server/packages/play-node-go/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/packages/server/packages/play-node-go/server/package.json b/packages/server/packages/play-node-go/server/package.json
index 02e1854..ca2c60f 100644
--- a/packages/server/packages/play-node-go/server/package.json
+++ b/packages/server/packages/play-node-go/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",