Refactor controller imports and clean up code style

- Removed redundant using statements and organized namespaces in MapsController, PlayerAnalyticsController, PlayersController, ProfileController, ProtectedNamesController, ServerAdminController, ServersController, StatusController, TagsController, UserController.
- Improved code readability by adjusting formatting and simplifying conditional statements in various controllers and services.
- Enhanced the logic in methods for better clarity and efficiency, particularly in ActivityLogService, AgentTelemetryService, and GameServerConfigHelper.
- Updated extension methods to streamline functionality and improve maintainability.

Author: frasermolyneux

src/XtremeIdiots.Portal.Integrations.Forums/AdminActionTopics.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using System.Globalization;
 using MX.InvisionCommunity.Api.Abstractions;
+using System.Globalization;
 using XtremeIdiots.Portal.Integrations.Forums.Extensions;
 using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
 

src/XtremeIdiots.Portal.Web.Tests/ApiControllers/ConnectedPlayersControllerTests.cs

@@ -1,21 +1,18 @@
-using System.Net;
-using System.Security.Claims;
-using System.Text;
-
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-
 using Moq;
 using MX.Api.Abstractions;
 using MX.Observability.ApplicationInsights.Auditing;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-
+using System.Net;
+using System.Security.Claims;
+using System.Text;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.ConnectedPlayers;
 using XtremeIdiots.Portal.Repository.Api.Client.V1;
 using ConnectedPlayersApiController = XtremeIdiots.Portal.Web.ApiControllers.ConnectedPlayersController;
@@ -140,7 +137,7 @@ public async Task GetConnectedPlayersAjax_WithInvalidOrderColumnIndex_ReturnsBad
         mockRepositoryApiClient.Verify(x => x.ConnectedPlayers.V1.GetConnectedPlayers(
             It.IsAny<Guid?>(),
             It.IsAny<Guid?>(),
-            It.IsAny<XtremeIdiots.Portal.Repository.Abstractions.Constants.V1.GameType?>(),
+            It.IsAny<Repository.Abstractions.Constants.V1.GameType?>(),
             It.IsAny<bool?>(),
             It.IsAny<int>(),
             It.IsAny<int>(),

src/XtremeIdiots.Portal.Web.Tests/ApiControllers/DemosControllerTests.cs

@@ -8,12 +8,12 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 using Moq;
-using MX.Observability.ApplicationInsights.Auditing;
-using System.Net;
 using MX.Api.Abstractions;
+using MX.Observability.ApplicationInsights.Auditing;
 using Newtonsoft.Json;
-using XtremeIdiots.Portal.Repository.Api.Client.V1;
+using System.Net;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.UserProfiles;
+using XtremeIdiots.Portal.Repository.Api.Client.V1;
 using XtremeIdiots.Portal.Web.ApiControllers;
 
 namespace XtremeIdiots.Portal.Web.Tests.ApiControllers;

src/XtremeIdiots.Portal.Web.Tests/ApiControllers/FileBrowseApiControllerTests.cs

@@ -9,14 +9,14 @@
 using MX.Api.Abstractions;
 using MX.Observability.ApplicationInsights.Auditing;
 using System.Net;
-using System.Security.Claims;
 using System.Reflection;
-using XtremeIdiots.Portal.Integrations.Servers.Api.Client.V1;
-using XtremeIdiots.Portal.Integrations.Servers.Abstractions.Models.V1.Ftp;
+using System.Security.Claims;
 using XtremeIdiots.Portal.Integrations.Servers.Abstractions.Interfaces.V1;
-using XtremeIdiots.Portal.Repository.Api.Client.V1;
+using XtremeIdiots.Portal.Integrations.Servers.Abstractions.Models.V1.Ftp;
+using XtremeIdiots.Portal.Integrations.Servers.Api.Client.V1;
 using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.GameServers;
+using XtremeIdiots.Portal.Repository.Api.Client.V1;
 using XtremeIdiots.Portal.Web.ApiControllers;
 using XtremeIdiots.Portal.Web.Auth.Constants;
 

src/XtremeIdiots.Portal.Web.Tests/ApiControllers/PlayersControllerTests.cs

@@ -1,21 +1,18 @@
-using System.Net;
-using System.Security.Claims;
-using System.Text;
-
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-
 using Moq;
 using MX.Api.Abstractions;
 using MX.GeoLocation.Api.Client.V1;
 using MX.Observability.ApplicationInsights.Auditing;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-
+using System.Net;
+using System.Security.Claims;
+using System.Text;
 using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.Players;
 using XtremeIdiots.Portal.Repository.Api.Client.V1;

src/XtremeIdiots.Portal.Web.Tests/Auth/Handlers/GameServersAuthHandlerTests.cs

@@ -1,5 +1,5 @@
-using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
+using System.Security.Claims;
 using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
 using XtremeIdiots.Portal.Web.Auth.Constants;
 using XtremeIdiots.Portal.Web.Auth.Handlers;

src/XtremeIdiots.Portal.Web.Tests/Controllers/ConnectedPlayersControllerTests.cs

@@ -1,18 +1,15 @@
-using System.Net;
-using System.Security.Claims;
-
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-
 using Moq;
 using MX.Api.Abstractions;
 using MX.Observability.ApplicationInsights.Auditing;
-
+using System.Net;
+using System.Security.Claims;
 using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.ConnectedPlayers;
 using XtremeIdiots.Portal.Repository.Api.Client.V1;
@@ -233,5 +230,4 @@ public async Task ForceUnlink_WhenSeniorAdminMissingProfileId_ReturnsForbid()
             It.IsAny<ForceUnlinkConnectedPlayerDto>(),
             It.IsAny<CancellationToken>()), Times.Never);
     }
-
 }

src/XtremeIdiots.Portal.Web.Tests/Controllers/ProfileControllerTests.cs

@@ -1,19 +1,16 @@
-using System.Net;
-using System.Security.Claims;
-
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-
 using Moq;
 using MX.Api.Abstractions;
 using MX.Observability.ApplicationInsights.Auditing;
 using Newtonsoft.Json;
-
+using System.Net;
+using System.Security.Claims;
 using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.ConnectedPlayers;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.UserProfiles;

src/XtremeIdiots.Portal.Web.Tests/Controllers/ServerAdminControllerTests.cs

@@ -1,5 +1,3 @@
-using System.Net;
-using System.Security.Claims;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.AspNetCore.Authorization;
@@ -14,13 +12,15 @@
 using MX.Observability.ApplicationInsights.Auditing;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Net;
+using System.Security.Claims;
 using XtremeIdiots.Portal.Integrations.Forums;
 using XtremeIdiots.Portal.Integrations.Servers.Abstractions.Models.V1.Rcon;
+using XtremeIdiots.Portal.Integrations.Servers.Api.Client.V1;
 using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.GameServers;
 using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.Screenshots;
 using XtremeIdiots.Portal.Repository.Api.Client.V1;
-using XtremeIdiots.Portal.Integrations.Servers.Api.Client.V1;
 using XtremeIdiots.Portal.Web.Auth.Constants;
 using XtremeIdiots.Portal.Web.Controllers;
 using XtremeIdiots.Portal.Web.Services;
@@ -160,7 +160,7 @@ public async Task GetScreenshots_IncludeDeletedScopedAuthorizationFails_ReturnsU
         mockAuthorizationService
             .Setup(x => x.AuthorizeAsync(
                 It.IsAny<ClaimsPrincipal>(),
-                It.Is<object>(resource => resource is XtremeIdiots.Portal.Web.Auth.PotentialAccessProbe),
+                It.Is<object>(resource => resource is Web.Auth.PotentialAccessProbe),
                 AuthPolicies.GameServers_Admin_Screenshots_Delete))
             .ReturnsAsync(AuthorizationResult.Success());
 
@@ -390,7 +390,7 @@ public async Task ServerDetail_WhenGameTypeIsNotCallOfDuty4x_HidesScreenshotFeat
 
         mockRepositoryApiClient
             .Setup(x => x.LiveStatus.V1.GetGameServerLiveStatus(serverId, It.IsAny<CancellationToken>()))
-            .ReturnsAsync(new ApiResult<XtremeIdiots.Portal.Repository.Abstractions.Models.V1.LiveStatus.GameServerLiveStatusDto>(HttpStatusCode.OK));
+            .ReturnsAsync(new ApiResult<Repository.Abstractions.Models.V1.LiveStatus.GameServerLiveStatusDto>(HttpStatusCode.OK));
 
         mockAuthorizationService
             .Setup(x => x.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), It.IsAny<string>()))
@@ -418,7 +418,7 @@ public async Task ServerDetail_WhenGameTypeIsCallOfDuty4x_ShowsScreenshotFeature
 
         mockRepositoryApiClient
             .Setup(x => x.LiveStatus.V1.GetGameServerLiveStatus(serverId, It.IsAny<CancellationToken>()))
-            .ReturnsAsync(new ApiResult<XtremeIdiots.Portal.Repository.Abstractions.Models.V1.LiveStatus.GameServerLiveStatusDto>(HttpStatusCode.OK));
+            .ReturnsAsync(new ApiResult<Repository.Abstractions.Models.V1.LiveStatus.GameServerLiveStatusDto>(HttpStatusCode.OK));
 
         mockAuthorizationService
             .Setup(x => x.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), It.IsAny<string>()))

src/XtremeIdiots.Portal.Web/ApiControllers/ActivityLogController.cs

@@ -126,11 +126,9 @@ public IActionResult GetActivityLogEvents([FromQuery] string? categories)
 
     private static List<ActivityLogCategory> ParseCategories(string? categories)
     {
-        if (string.IsNullOrWhiteSpace(categories))
-            return [];
-
-        return
-        [
+        return string.IsNullOrWhiteSpace(categories)
+            ? []
+            : [
             .. categories
                 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
                 .Select(c => Enum.TryParse<ActivityLogCategory>(c, out var cat) ? cat : (ActivityLogCategory?)null)
@@ -142,11 +140,9 @@ .. categories
 
     private static List<string> ParseCommaSeparated(string? value)
     {
-        if (string.IsNullOrWhiteSpace(value))
-            return [];
-
-        return
-        [
+        return string.IsNullOrWhiteSpace(value)
+            ? []
+            : [
             .. value
                 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
                 .Distinct()