From 6f309a9b4a62d5cf6574c66db8c6f5ec57517af4 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <600878@stud.hvl.no>
Date: Sat, 20 May 2023 10:15:17 +0200
Subject: [PATCH] Moved some logic to other methods

---
 .../Controllers/GameController.cs             | 20 ++++++++++---------
 pac-man-board-game/Game/Actions.cs            |  4 ++++
 pac-man-board-game/Utils/Extensions.cs        |  5 ++++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pac-man-board-game/Controllers/GameController.cs b/pac-man-board-game/Controllers/GameController.cs
index 00a2b50..a5466ab 100644
--- a/pac-man-board-game/Controllers/GameController.cs
+++ b/pac-man-board-game/Controllers/GameController.cs
@@ -1,6 +1,4 @@
 using System.Net.WebSockets;
-using System.Text.Json;
-using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Mvc;
 using pacMan.Game;
 using pacMan.Game.Interfaces;
@@ -27,22 +25,26 @@ public class GameController : GenericController
     protected override ArraySegment<byte> Run(WebSocketReceiveResult result, byte[] data)
     {
         var stringResult = data.GetString(data.Length);
-        // Removes invalid characters from the string
-        stringResult = Regex.Replace(stringResult, @"\p{C}+", "");
 
         Logger.Log(LogLevel.Information, "Received: {}", stringResult);
-        var action = JsonSerializer.Deserialize<ActionMessage>(stringResult);
+        var action = ActionMessage.FromJson(stringResult);
 
-        switch (action?.Action)
+        DoAction(action);
+        return action.ToArraySegment();
+    }
+
+    private void DoAction(ActionMessage message)
+    {
+        switch (message.Action)
         {
             case GameAction.RollDice:
                 var rolls = _diceCup.Roll();
                 Logger.Log(LogLevel.Information, "Rolled {}", string.Join(", ", rolls));
 
-                action.Data = rolls;
-                return action.ToArraySegment();
+                message.Data = rolls;
+                break;
             default:
-                return new ArraySegment<byte>("Invalid action"u8.ToArray());
+                throw new ArgumentOutOfRangeException(nameof(message), "Action not allowed");
         }
     }
 }
\ No newline at end of file
diff --git a/pac-man-board-game/Game/Actions.cs b/pac-man-board-game/Game/Actions.cs
index f70a448..be5d0e8 100644
--- a/pac-man-board-game/Game/Actions.cs
+++ b/pac-man-board-game/Game/Actions.cs
@@ -1,3 +1,5 @@
+using System.Text.Json;
+
 namespace pacMan.Game;
 
 public enum GameAction
@@ -9,6 +11,8 @@ public class ActionMessage<T>
 {
     public GameAction Action { get; set; }
     public T? Data { get; set; }
+
+    public static ActionMessage FromJson(string json) => JsonSerializer.Deserialize<ActionMessage>(json)!;
 }
 
 public class ActionMessage : ActionMessage<dynamic>
diff --git a/pac-man-board-game/Utils/Extensions.cs b/pac-man-board-game/Utils/Extensions.cs
index 2c1af68..be90bc3 100644
--- a/pac-man-board-game/Utils/Extensions.cs
+++ b/pac-man-board-game/Utils/Extensions.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 
 namespace pacMan.Utils;
 
@@ -7,7 +8,9 @@ public static class Extensions
 {
     public static string GetString(this byte[] bytes, int length)
     {
-        return Encoding.UTF8.GetString(bytes, 0, length);
+        var s = Encoding.UTF8.GetString(bytes, 0, length);
+        // Removes invalid characters from the string
+        return Regex.Replace(s, @"\p{C}+", "");
     }
 
     public static ArraySegment<byte> ToArraySegment(this object obj)