More organized communication strategy.

Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/MoveHandler.cs

@@ -4,7 +4,6 @@ using Gameboard.ShogiUI.Sockets.Managers.Utility;
 using Gameboard.ShogiUI.Sockets.Repositories;
 using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages;
 using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
@@ -13,26 +12,21 @@ namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
 {
   public class MoveHandler : IActionHandler
   {
-    private readonly ILogger<MoveHandler> logger;
     private readonly IGameboardRepository gameboardRepository;
     private readonly ISocketCommunicationManager communicationManager;
     public MoveHandler(
-      ILogger<MoveHandler> logger,
       ISocketCommunicationManager communicationManager,
       IGameboardRepository gameboardRepository)
     {
-      this.logger = logger;
       this.gameboardRepository = gameboardRepository;
       this.communicationManager = communicationManager;
     }
 
     public async Task Handle(WebSocket socket, string json, string userName)
     {
-      logger.LogInformation("Socket Request \n{0}\n", new[] { json });
       var request = JsonConvert.DeserializeObject<MoveRequest>(json);
       // Basic move validation
-      var move = request.Move;
-      if (move.To.Equals(move.From))
+      if (request.Move.To.Equals(request.Move.From))
       {
         var serialized = JsonConvert.SerializeObject(
             new ErrorResponse(ClientAction.Move)
@@ -43,33 +37,25 @@ namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
         return;
       }
 
-      var getSessionResponse = await gameboardRepository.GetGame(request.GameName);
-      var isPlayer1 = userName == getSessionResponse.Session.Player1;
-      if (!isPlayer1)
-      {
-        // Convert the move coords to player1 perspective.
-        move = Move.ConvertPerspective(move);
-      }
-
+      var session = (await gameboardRepository.GetGame(request.GameName)).Session;
+      var isPlayer2 = userName == session.Player2;
+      // Shogi.Api expects the move coordinates from the perspective of player 1.
+      var move = isPlayer2 ? Move.ConvertPerspective(request.Move) : request.Move;
       await gameboardRepository.PostMove(request.GameName, new PostMove(Mapper.Map(move)));
 
-      var response = new MoveResponse(ClientAction.Move)
+      var responseForPlayer1 = new MoveResponse(ClientAction.Move)
       {
         GameName = request.GameName,
-        PlayerName = userName
+        PlayerName = userName,
+        Move = isPlayer2 ? Move.ConvertPerspective(request.Move) : request.Move
       };
-      await communicationManager.BroadcastToGame(
-          request.GameName,
-          (playerName, sslStream) =>
-          {
-            response.Move = playerName.Equals(userName)
-                  ? request.Move
-                  : Move.ConvertPerspective(request.Move);
-            var serialized = JsonConvert.SerializeObject(response);
-            logger.LogInformation("Socket Response \n{0}\n", new[] { serialized });
-            return serialized;
-          }
-      );
+      var responseForPlayer2 = new MoveResponse(ClientAction.Move)
+      {
+        GameName = request.GameName,
+        PlayerName = userName,
+        Move = isPlayer2 ? request.Move : Move.ConvertPerspective(request.Move)
+      };
+      await communicationManager.BroadcastToGame(session.Name, responseForPlayer1, responseForPlayer2);
     }
   }
 }