chore: cleanup (global) VariablesController

Author: pandinocoder

Intersect.Server/Web/RestApi/Routes/V1/VariablesController.cs

@@ -1,4 +1,5 @@
-using Intersect.GameObjects;
+using Intersect.Enums;
+using Intersect.GameObjects;
 using Intersect.Server.Database;
 using Intersect.Server.Database.GameData;
 using Intersect.Server.Entities;
@@ -7,98 +8,110 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Intersect.Server.Web.RestApi.Routes.V1
+namespace Intersect.Server.Web.RestApi.Routes.V1;
+
+[Route("api/v1/variables/global")]
+[Authorize]
+public sealed partial class VariablesController : IntersectController
 {
-    [Route("api/v1/variables/global")]
-    [Authorize]
-    public sealed partial class VariablesController : IntersectController
+    [HttpGet]
+    public IActionResult GlobalVariablesGet([FromQuery] PagingInfo pageInfo)
     {
-        [HttpGet]
-        public object GlobalVariablesGet([FromQuery] PagingInfo pageInfo)
-        {
-            pageInfo.Page = Math.Max(pageInfo.Page, 0);
-            pageInfo.PageSize = Math.Max(Math.Min(pageInfo.PageSize, 100), 5);
+        pageInfo.Page = Math.Max(pageInfo.Page, 0);
+        pageInfo.PageSize = Math.Max(Math.Min(pageInfo.PageSize, 100), 5);
 
-            var entries = GameContext.Queries.ServerVariables(pageInfo.Page, pageInfo.PageSize)?.ToList();
+        var entries = GameContext.Queries.ServerVariables(pageInfo.Page, pageInfo.PageSize)?.ToList();
 
-            return new DataPage<ServerVariableBase>
+        return Ok(
+            new DataPage<ServerVariableBase>
             {
-                Total = ServerVariableBase.Lookup.Count(),
+                Total = ServerVariableBase.Lookup.Count,
                 Page = pageInfo.Page,
                 PageSize = pageInfo.PageSize,
                 Count = entries?.Count ?? 0,
                 Values = entries,
-            };
-        }
-
-        [HttpGet("{guid:guid}")]
-        public object GlobalVariableGet(Guid guid)
-        {
-            if (Guid.Empty == guid)
-            {
-                return BadRequest(@"Invalid global variable id.");
             }
+        );
+    }
 
-            var variable = GameContext.Queries.ServerVariableById(guid);
+    [HttpGet("{variableId:guid}")]
+    public IActionResult GlobalVariableGet(Guid variableId)
+    {
+        if (variableId == default)
+        {
+            return BadRequest($@"Variable id cannot be {variableId}");
+        }
 
-            if (variable == null)
-            {
-                return NotFound($@"No global variable with id '{guid}'.");
-            }
+        var variable = GameContext.Queries.ServerVariableById(variableId);
 
-            return variable;
+        // ReSharper disable once ConvertIfStatementToReturnStatement
+        if (variable == null)
+        {
+            return NotFound($@"No global variable with id '{variableId}'.");
         }
 
-        [HttpGet("{guid:guid}/value")]
-        public object GlobalVariableGetValue(Guid guid)
+        return Ok(variable);
+    }
+
+    [HttpGet("{variableId:guid}/value")]
+    public IActionResult GlobalVariableGetValue(Guid variableId)
+    {
+        if (variableId == default)
         {
-            if (Guid.Empty == guid)
-            {
-                return BadRequest(@"Invalid global variable id.");
-            }
+            return BadRequest($@"Variable id cannot be {variableId}");
+        }
 
-            var variable = GameContext.Queries.ServerVariableById(guid);
+        var variable = GameContext.Queries.ServerVariableById(variableId);
 
-            if (variable == null)
-            {
-                return NotFound($@"No global variable with id '{guid}'.");
-            }
-
-            return new
-            {
-                value = variable.Value.Value,
-            };
+        if (variable == null)
+        {
+            return NotFound($@"No global variable with id '{variableId}'.");
         }
 
-        [HttpPost("{guid:guid}")]
-        public object GlobalVariableSet(Guid guid, [FromBody] VariableValueBody valueBody)
-        {
-            if (Guid.Empty == guid)
+        return Ok(
+            new VariableValueBody
             {
-                return BadRequest(@"Invalid global variable id.");
+                Value = variable.Value.Value,
             }
+        );
+    }
 
-            var variable = GameContext.Queries.ServerVariableById(guid);
+    [HttpPost("{variableId:guid}")]
+    public IActionResult GlobalVariableSet(Guid variableId, [FromBody] VariableValueBody variableValue)
+    {
+        if (variableId == default)
+        {
+            return BadRequest($@"Variable id cannot be {variableId}");
+        }
 
-            if (variable == null)
-            {
-                return NotFound($@"No global variable with id '{guid}'.");
-            }
+        var variable = GameContext.Queries.ServerVariableById(variableId);
 
-            var changed = true;
-            if (variable.Value?.Value == valueBody.Value)
-            {
-                changed = false;
-            }
-            variable.Value.Value = valueBody.Value;
+        if (variable == null)
+        {
+            return NotFound($@"No global variable with id '{variableId}'.");
+        }
 
-            if (changed)
+        var changed = false;
+        if (variable.Value != null)
+        {
+            if (variable.Value.Value != variableValue.Value)
             {
-                Player.StartCommonEventsWithTriggerForAll(Enums.CommonEventTrigger.ServerVariableChange, "", guid.ToString());
+                variable.Value.Value = variableValue.Value;
+                changed = true;
             }
-            DbInterface.UpdatedServerVariables.AddOrUpdate(variable.Id, variable, (key, oldValue) => variable);
+        }
 
-            return variable;
+        // ReSharper disable once InvertIf
+        if (changed)
+        {
+            Player.StartCommonEventsWithTriggerForAll(
+                CommonEventTrigger.ServerVariableChange,
+                "",
+                variableId.ToString()
+            );
+            DbInterface.UpdatedServerVariables.AddOrUpdate(variable.Id, variable, (_, _) => variable);
         }
+
+        return Ok(variable);
     }
-}
+}