PlayerInfo everywhere

gameengine.go

@@ -319,7 +319,7 @@ func buildNewJoinerMessage(joiner, recipient Player) OutboundMessage {
 	return OutboundMessage{
 		PlayerID: recipient.ID(),
 		Name:     recipient.Name(),
-		Joiner:   joiner.Name(),
+		Joiner:   PlayerInfo{Name: joiner.Name(), PlayerID: joiner.ID()},
 		Message:  fmt.Sprintf("%s has joined the game!", joiner.Name()),
 		Command:  protocol.NewJoiner,
 	}

gameengine_test.go

@@ -63,7 +63,8 @@ func TestGameEngineAddPlayer(t *testing.T) {
 			err := json.Unmarshal(msg, &data)
 			utils.AssertNoError(t, err)
 			fmt.Println(data)
-			utils.AssertEqual(t, data.Joiner, joiningPlayer.Name())
+			utils.AssertEqual(t, data.Joiner.Name, joiningPlayer.Name())
+			utils.AssertEqual(t, data.Joiner.PlayerID, joiningPlayer.ID())
 		})
 	})
 }

playermessages.go

@@ -17,7 +17,7 @@ type OutboundMessage struct {
 	PlayerID        string       `json:"player_id"`
 	Command         protocol.Cmd `json:"command"`
 	Name            string       `json:"name"` // pointless?
-	Joiner          string       `json:"joiner,omitempty"`
+	Joiner          PlayerInfo   `json:"joiner,omitempty"`
 	Message         string       `json:"message"`
 	Hand            []deck.Card  `json:"hand"`
 	Seen            []deck.Card  `json:"seen"`

server/server.go

@@ -34,11 +34,12 @@ type NewGameReq struct {
 }
 
 type PendingGameRes struct {
-	GameID   string            `json:"game_id"`
-	PlayerID string            `json:"player_id"`
-	Name     string            `json:"name"`
-	Admin    bool              `json:"is_admin"`
-	Players  []shed.PlayerInfo `json:"players,omitempty"`
+	GameID     string            `json:"game_id"`
+	PlayerID   string            `json:"player_id"`
+	Name       string            `json:"name"`
+	PlayerInfo shed.PlayerInfo   `json:"player_info"`
+	Admin      bool              `json:"is_admin"`
+	Players    []shed.PlayerInfo `json:"players,omitempty"`
 }
 
 type JoinGameReq struct {
@@ -182,11 +183,12 @@ func (g *GameServer) HandleNewGame(w http.ResponseWriter, r *http.Request) {
 	}
 
 	payload := PendingGameRes{
-		GameID:   gameID,
-		PlayerID: playerID,
-		Name:     data.Name,
-		Players:  []shed.PlayerInfo{{playerID, data.Name}},
-		Admin:    true,
+		GameID:     gameID,
+		PlayerID:   playerID,
+		PlayerInfo: shed.PlayerInfo{PlayerID: playerID, Name: data.Name},
+		Name:       data.Name,
+		Players:    []shed.PlayerInfo{{PlayerID: playerID, Name: data.Name}},
+		Admin:      true,
 	}
 
 	bytes, err := json.Marshal(payload)
@@ -283,10 +285,11 @@ func (g *GameServer) HandleJoinGame(w http.ResponseWriter, r *http.Request) {
 	}
 
 	payload := PendingGameRes{
-		PlayerID: playerID,
-		GameID:   data.GameID,
-		Name:     data.Name,
-		Players:  playerInfos,
+		PlayerID:   playerID,
+		GameID:     data.GameID,
+		PlayerInfo: shed.PlayerInfo{PlayerID: playerID, Name: data.Name},
+		Name:       data.Name,
+		Players:    playerInfos,
 	}
 
 	bytes, err := json.Marshal(payload)

server/server_integration_test.go

@@ -118,7 +118,7 @@ func TestCreateAndJoinNewGame(t *testing.T) {
 		var payload shed.OutboundMessage
 		err = json.Unmarshal(got, &payload)
 		utils.AssertNoError(t, err)
-		utils.AssertEqual(t, payload.Joiner, joinerName)
+		utils.AssertEqual(t, payload.Joiner.Name, joinerName)
 	})
 }
 
@@ -153,7 +153,7 @@ func TestStartGame(t *testing.T) {
 		var data shed.OutboundMessage
 		err = json.Unmarshal(bytes, &data)
 		utils.AssertNoError(t, err)
-		utils.AssertEqual(t, data.Joiner, player2Name)
+		utils.AssertEqual(t, data.Joiner.Name, player2Name)
 	})
 
 	// When the creator sends the command to start the game