code upkeep

api/move.go

@@ -21,6 +21,10 @@ const (
 	ColorDetermined    MessageType = "colorDetermined"
 )
 
+func (m WebsocketMessage) IsValid() bool {
+	return m.IsValidMoveMessage()
+}
+
 func (m WebsocketMessage) IsValidMoveMessage() bool {
 	if m.Type != MoveMessage {
 		return false

chess/game.go

@@ -14,6 +14,7 @@ type Game struct {
 	board             Board
 	players           []*Player
 	currentTurnPlayer *Player
+	gameState         int
 }
 
 const (
@@ -24,9 +25,11 @@ const (
 
 func NewGame() *Game {
 	var game = Game{
-		id:    uuid.New(),
+		id:        uuid.New(),
-		board: newBoard(),
+		board:     newBoard(),
+		gameState: PlayerToMove,
 	}
+	game.currentTurnPlayer = game.GetPlayer1()
 	game.board.Init()
 
 	return &game
@@ -44,9 +47,7 @@ func (game Game) GetPlayer2() *Player {
 	return game.players[1]
 }
 
-func (game *Game) Handle() {
+func (game *Game) Prepare() {
-	defer game.killGame()
-
 	ok := game.waitForWebsocketConnections()
 	if !ok {
 		return
@@ -56,38 +57,37 @@ func (game *Game) Handle() {
 	if err != nil {
 		return
 	}
+}
 
-	gameState := PlayerToMove
+func (game *Game) Handle() {
-	game.currentTurnPlayer = game.GetPlayer1()
+	defer game.killGame()
 	var receivedMove types.Move
 
 	for {
-
+		switch game.gameState {
-		switch gameState {
 		case PlayerToMove:
-			receivedMove, err = game.currentTurnPlayer.ReadMove()
+			log.Println("with player ", game.currentTurnPlayer, " to move")
+			receivedMove, err := game.currentTurnPlayer.ReadMove()
 			if err != nil {
 				log.Println("Error while reading message:", err)
 				return
 			}
 			log.Println("Player ", game.currentTurnPlayer, " moved:\n", receivedMove)