From 692a8b1400086c41c565930fef3c6017a6b2a6cb Mon Sep 17 00:00:00 2001
From: sorrelbri <sorrel.bri.june@gmail.com>
Date: Sat, 20 Jun 2020 16:56:03 -0700
Subject: [PATCH] add endGame function to FE

---
 packages/play-node-go/src/io.js                          | 2 +-
 .../play-node-go/src/reducers/games/reducer.games.js     | 9 +++++++--
 packages/server/services/Game.js                         | 1 +
 packages/server/socket.js                                | 4 ----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/play-node-go/src/io.js b/packages/play-node-go/src/io.js
index bdc40af..361e0f2 100644
--- a/packages/play-node-go/src/io.js
+++ b/packages/play-node-go/src/io.js
@@ -46,7 +46,7 @@ const launch = (nsp, dispatch) => {
     dispatch({ type: "GAMES", message: "GAME_RESIGN", body: data });
   });
 
-  socket.on("game_end", (data) => {
+  socket.on("end_game", (data) => {
     dispatch({ type: "GAMES", message: "GAME_END", body: data });
   });
 
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 33942c3..3fc0d2b 100644
--- a/packages/play-node-go/src/reducers/games/reducer.games.js
+++ b/packages/play-node-go/src/reducers/games/reducer.games.js
@@ -24,8 +24,7 @@ export const gamesReducer = (state, action) => {
     }
 
     case "GAME_END": {
-      console.log(action.body);
-      return state;
+      return gameEnd(state, action);
     }
 
     default: {
@@ -103,3 +102,9 @@ function gameResign(state, action) {
     meta: { gameRecord, pass, turn, winner, playerState },
   };
 }
+
+function gameEnd(state, action) {
+  console.log(action);
+  const { winner, score } = action.body.meta;
+  return { ...state, meta: { ...state.meta, winner, score } };
+}
diff --git a/packages/server/services/Game.js b/packages/server/services/Game.js
index 38d3521..ac257aa 100644
--- a/packages/server/services/Game.js
+++ b/packages/server/services/Game.js
@@ -235,6 +235,7 @@ const Game = ({ gameData = {}, gameRecord = [] } = {}) => {
         boardSize: this.boardSize,
         handicap: this.handicap,
         komi: this.komi,
+        score: this.score,
       };
     },
 
diff --git a/packages/server/socket.js b/packages/server/socket.js
index 569221f..1ce6753 100644
--- a/packages/server/socket.js
+++ b/packages/server/socket.js
@@ -126,10 +126,6 @@ io.on("connection", async (socket) => {
           });
         } catch (e) {
           console.log(e);
-        } finally {
-          socket.join(gameNsp, () => {
-            io.of(room).to(gameNsp).emit("end_game", { board, meta });
-          });
         }
       });
     });