added todos and moved the settings api url

Author: Apfelwurm

NetEvent/Client/Pages/Administration/SystemInfo.razor.cs

@@ -17,6 +17,8 @@ public partial class SystemInfo
         private ISystemInfoDataService _SystemInfoDataService { get; set; } = default!;
 
         #endregion
+
+        // TODO: deceide if _ClientComponents should be SystemInfoComponentEntryDto or not
         private readonly IList<SystemInfoComponentEntryDto> _ClientComponents = new List<SystemInfoComponentEntryDto>();
         private SystemInfoDto _SystemInfos = new SystemInfoDto();
         private string searchStringComponents = string.Empty;
@@ -37,6 +39,7 @@ protected override async Task OnInitializedAsync()
             }
         }
 
+        // TODO: maybe consolidate filter functions?
         private bool FilterFuncComponents1(SystemInfoComponentEntryDto systeminfocomponententry) => FilterFuncComponents(systeminfocomponententry, searchStringComponents);
 
         private static bool FilterFuncComponents(SystemInfoComponentEntryDto systeminfocomponententry, string searchString)

NetEvent/Client/Services/SystemSettingsService.cs

@@ -45,7 +45,7 @@ public async Task<List<SystemSettingValueDto>> GetSystemSettingsAsync(SystemSett
             {
                 var client = _HttpClientFactory.CreateClient(Constants.BackendApiHttpClientName);
 
-                var result = await client.GetFromJsonAsync<List<SystemSettingValueDto>>($"api/system/{systemSettingGroup}/all", cancellationToken);
+                var result = await client.GetFromJsonAsync<List<SystemSettingValueDto>>($"api/system/settings/{systemSettingGroup}/all", cancellationToken);
 
                 if (result == null)
                 {
@@ -68,7 +68,7 @@ public async Task<ServiceResult> UpdateSystemSetting(SystemSettingGroup systemSe
             {
                 var client = _HttpClientFactory.CreateClient(Constants.BackendApiHttpClientName);
 
-                var response = await client.PostAsJsonAsync($"api/system/{systemSettingGroup}", systemSetting, cancellationToken);
+                var response = await client.PostAsJsonAsync($"api/system/settings/{systemSettingGroup}", systemSetting, cancellationToken);
 
                 response.EnsureSuccessStatusCode();
 

NetEvent/Server.Tests/SystemModuleTest.cs

@@ -32,7 +32,7 @@ public async Task GetOrganizationHandler_Success_Test()
             }
 
             // Act
-            var response = await Client.GetFromJsonAsync<List<SystemSettingValueDto>>($"/api/system/{SystemSettingGroup.OrganizationData}/all");
+            var response = await Client.GetFromJsonAsync<List<SystemSettingValueDto>>($"/api/system/settings/{SystemSettingGroup.OrganizationData}/all");
 
             // Assert
             Assert.NotNull(response);
@@ -49,7 +49,7 @@ public async Task PostOrganizationHandler_Success_Test()
             // Insert
             var organizationDataCreate = new SystemSettingValueDto("key", "value");
 
-            var responseCreate = await Client.PostAsync($"/api/system/{SystemSettingGroup.OrganizationData}", JsonContent.Create(organizationDataCreate));
+            var responseCreate = await Client.PostAsync($"/api/system/settings/{SystemSettingGroup.OrganizationData}", JsonContent.Create(organizationDataCreate));
 
             responseCreate.EnsureSuccessStatusCode();
 
@@ -65,7 +65,7 @@ public async Task PostOrganizationHandler_Success_Test()
             // Update value
             var organizationDataUpdate = new SystemSettingValueDto("key", "value2");
 
-            var responseUpdate = await Client.PostAsync($"/api/system/{SystemSettingGroup.OrganizationData}", JsonContent.Create(organizationDataUpdate));
+            var responseUpdate = await Client.PostAsync($"/api/system/settings/{SystemSettingGroup.OrganizationData}", JsonContent.Create(organizationDataUpdate));
 
             responseUpdate.EnsureSuccessStatusCode();
 
@@ -84,9 +84,9 @@ public async Task PostOrganizationHandler_Error_Test()
         {
 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
 
-            var responseCreate = await Client.PostAsync($"/api/system/{SystemSettingGroup.OrganizationData}", JsonContent.Create(new SystemSettingValueDto(null, "value")));
+            var responseCreate = await Client.PostAsync($"/api/system/settings/{SystemSettingGroup.OrganizationData}", JsonContent.Create(new SystemSettingValueDto(null, "value")));
             Assert.False(responseCreate.IsSuccessStatusCode);
-            var responseUpdate = await Client.PostAsync($"/api/system/{SystemSettingGroup.OrganizationData}", JsonContent.Create(new SystemSettingValueDto("key", null)));
+            var responseUpdate = await Client.PostAsync($"/api/system/settings/{SystemSettingGroup.OrganizationData}", JsonContent.Create(new SystemSettingValueDto("key", null)));
             Assert.False(responseUpdate.IsSuccessStatusCode);
 
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.

NetEvent/Server/Modules/System/Endpoints/GetSystemInfo/GetSystemInfoHandler.cs

@@ -27,12 +27,14 @@ public Task<GetSystemInfoResponse> Handle(GetSystemInfoRequest request, Cancella
                 systeminfocomponents.Add(new SystemInfoComponentEntryDto(assem.ManifestModule.Name.ToString(), assem.ToString()));
             }
 
+            // TODO: is it possible to make that better?
             systeminfoversions.Add(new SystemInfoVersionEntryDto("NETEVENT", Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion));
             systeminfoversions.Add(new SystemInfoVersionEntryDto("BUILDNODE", string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILDNODE")) ? "dev" : Environment.GetEnvironmentVariable("BUILDNODE")));
             systeminfoversions.Add(new SystemInfoVersionEntryDto("BUILDID", string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILDID")) ? "dev" : Environment.GetEnvironmentVariable("BUILDNODE")));
             systeminfoversions.Add(new SystemInfoVersionEntryDto("BUILDNUMBER", string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILDNUMBER")) ? "dev" : Environment.GetEnvironmentVariable("BUILDNODE")));
             systeminfoversions.Add(new SystemInfoVersionEntryDto("SOURCE_COMMIT", string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SOURCE_COMMIT")) ? "dev" : Environment.GetEnvironmentVariable("BUILDNODE")));
 
+            // TODO: think about healthchecks and healthcheck modularity (to perform checks on various services like game servers, the mail server, payment apis ...) and remove dummy services
             systeminfohealth.Add(new SystemInfoHealthEntryDto("NETEVENT Server", string.Empty, true));
             systeminfohealth.Add(new SystemInfoHealthEntryDto("Email Service", "servername", false));
 

NetEvent/Server/Modules/System/SystemModule.cs

@@ -18,10 +18,8 @@ public class SystemModule : ModuleBase
         public override IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints)
         {
             endpoints.MapGet("/api/system/info/all", async ([FromServices] IMediator m) => ToApiResult(await m.Send(new GetSystemInfoRequest())));
-
-            // TODO: move to system/settings/
-            endpoints.MapGet("/api/system/{systemSettingGroup}/all", async ([FromRoute] SystemSettingGroup systemSettingGroup, [FromServices] IMediator m) => ToApiResult(await m.Send(new GetSystemSettingsRequest(systemSettingGroup))));
-            endpoints.MapPost("/api/system/{systemSettingGroup}", async ([FromRoute] SystemSettingGroup systemSettingGroup, [FromBody] Shared.Dto.SystemSettingValueDto systemSettingsValue, [FromServices] IMediator m) => ToApiResult(await m.Send(new PostSystemSettingsRequest(systemSettingGroup, systemSettingsValue))));
+            endpoints.MapGet("/api/system/settings/{systemSettingGroup}/all", async ([FromRoute] SystemSettingGroup systemSettingGroup, [FromServices] IMediator m) => ToApiResult(await m.Send(new GetSystemSettingsRequest(systemSettingGroup))));
+            endpoints.MapPost("/api/system/settings/{systemSettingGroup}", async ([FromRoute] SystemSettingGroup systemSettingGroup, [FromBody] Shared.Dto.SystemSettingValueDto systemSettingsValue, [FromServices] IMediator m) => ToApiResult(await m.Send(new PostSystemSettingsRequest(systemSettingGroup, systemSettingsValue))));
 
             return endpoints;
         }