From f8779ae887a0ab358e88547e740f2c9c3ec68d85 Mon Sep 17 00:00:00 2001
From: sorrelbri <sorrel.bri.june@gmail.com>
Date: Fri, 26 Jun 2020 16:24:55 -0700
Subject: [PATCH] patch game end bug, update_board socket message always
 returns data in consistent format

---
 .../play-node-go/src/components/GameUI/Board/Board.js |  4 ++--
 .../play-node-go/src/reducers/games/reducer.games.js  | 11 +++--------
 packages/server/socket.js                             | 10 ++++++++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/play-node-go/src/components/GameUI/Board/Board.js b/packages/play-node-go/src/components/GameUI/Board/Board.js
index 767f81d..e55aa58 100644
--- a/packages/play-node-go/src/components/GameUI/Board/Board.js
+++ b/packages/play-node-go/src/components/GameUI/Board/Board.js
@@ -42,8 +42,8 @@ const Board = (props) => {
       const posY = (i % boardSize) + 1;
       const pointData = board[`${posX}-${posY}`];
       const dotData =
-        meta && meta.turn === 0 && !meta.winner
-          ? meta?.territory[`${posX}-${posY}`]
+        meta && meta.turn === 0 && !meta.winner && meta.territory
+          ? meta.territory[`${posX}-${posY}`]
           : game.turn || meta?.turn;
       boardPoints.push(
         <Point
diff --git a/packages/play-node-go/src/reducers/games/reducer.games.js b/packages/play-node-go/src/reducers/games/reducer.games.js
index 72618d3..e183a05 100644
--- a/packages/play-node-go/src/reducers/games/reducer.games.js
+++ b/packages/play-node-go/src/reducers/games/reducer.games.js
@@ -80,14 +80,9 @@ function joinRequest(state, action) {
 }
 
 function updateBoard(state, action) {
-  const {
-    gameRecord,
-    pass,
-    turn,
-    winner,
-    playerState,
-    territory,
-  } = action.body.meta;
+  console.log(action.body);
+  const { gameRecord, pass, turn, winner, playerState } = action.body.meta;
+  const territory = action.body.territory;
   return {
     ...state,
     board: action.body.board,
diff --git a/packages/server/socket.js b/packages/server/socket.js
index 1ce6753..82a2fbd 100644
--- a/packages/server/socket.js
+++ b/packages/server/socket.js
@@ -103,12 +103,18 @@ io.on("connection", async (socket) => {
         const { id, room } = game;
         const gameNsp = `game${id}`;
         try {
-          const { board, ...meta } = await gameServices.toggleTerritory({
+          const {
+            board,
+            territory,
+            ...meta
+          } = await gameServices.toggleTerritory({
             id,
             point,
           });
           socket.join(gameNsp, () => {
-            io.of(room).to(gameNsp).emit("update_board", { board, meta });
+            io.of(room)
+              .to(gameNsp)
+              .emit("update_board", { board, territory, meta });
           });
         } catch (e) {
           console.log(e);