refactor: code restructuring

Endpoint/Common/Services/PairPeriodTimeConverter.cs

@@ -1,4 +1,4 @@
-using Mirea.Api.Endpoint.Configuration.General.Settings;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 using System.Collections.Generic;
 using System.Linq;
 

Endpoint/Configuration/Core/Middleware/CacheMaxAgeMiddleware.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Mirea.Api.Endpoint.Common.Attributes;
-using Mirea.Api.Endpoint.Common.Settings;
+using Mirea.Api.Endpoint.Configuration.Model;
 using System;
 using System.Reflection;
 using System.Threading.Tasks;

Endpoint/Configuration/Core/Startup/ApiVersioningConfiguration.cs

@@ -1,7 +1,7 @@
 using Asp.Versioning;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
+namespace Mirea.Api.Endpoint.Configuration.Core.Startup;
 
 public static class ApiVersioningConfiguration
 {

Endpoint/Configuration/Core/Startup/CacheConfiguration.cs

@@ -1,9 +1,9 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Mirea.Api.Endpoint.Common.Settings;
-using Mirea.Api.Endpoint.Configuration.General.Settings;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
+using Mirea.Api.Endpoint.Configuration.Model;
 
-namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
+namespace Mirea.Api.Endpoint.Configuration.Core.Startup;
 
 public static class CacheConfiguration
 {

Endpoint/Configuration/Core/Startup/EnvironmentConfiguration.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
+namespace Mirea.Api.Endpoint.Configuration.Core.Startup;
 
 public static class EnvironmentConfiguration
 {

Endpoint/Configuration/Core/Startup/JwtConfiguration.cs

@@ -7,7 +7,7 @@ using Mirea.Api.Security.Common.Interfaces;
 using System;
 using System.Text;
 
-namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
+namespace Mirea.Api.Endpoint.Configuration.Core.Startup;
 
 public static class JwtConfiguration
 {

Endpoint/Configuration/Core/Startup/LoggerConfiguration.cs

@@ -2,14 +2,14 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Mirea.Api.Endpoint.Common.Services;
-using Mirea.Api.Endpoint.Common.Settings;
+using Mirea.Api.Endpoint.Configuration.Model;
 using Serilog;
 using Serilog.Events;
 using Serilog.Filters;
 using Serilog.Formatting.Compact;
 using System.IO;
 
-namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
+namespace Mirea.Api.Endpoint.Configuration.Core.Startup;
 
 public static class LoggerConfiguration
 {

Endpoint/Configuration/Core/Startup/SecureConfiguration.cs

@@ -1,12 +1,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Mirea.Api.Endpoint.Common.Services.Security;
-using Mirea.Api.Endpoint.Common.Settings;
-using Mirea.Api.Endpoint.Configuration.General.Settings;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
+using Mirea.Api.Endpoint.Configuration.Model;
 using Mirea.Api.Security;
 using Mirea.Api.Security.Common.Interfaces;
 
-namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
+namespace Mirea.Api.Endpoint.Configuration.Core.Startup;
 
 public static class SecureConfiguration
 {

Endpoint/Configuration/Core/Startup/SwaggerConfiguration.cs

@@ -9,7 +9,7 @@ using Swashbuckle.AspNetCore.SwaggerGen;
 using System;
 using System.IO;
 
-namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
+namespace Mirea.Api.Endpoint.Configuration.Core.Startup;
 
 public static class SwaggerConfiguration
 {

Endpoint/Configuration/General/Interfaces/IIsConfigured.cs

@@ -1,6 +0,0 @@
-namespace Mirea.Api.Endpoint.Configuration.General.Interfaces;
-
-public interface IIsConfigured
-{
-    bool IsConfigured();
-}

Endpoint/Configuration/ISaveSettings.cs

@@ -1,4 +1,4 @@
-namespace Mirea.Api.Endpoint.Common.Settings;
+namespace Mirea.Api.Endpoint.Common.Interfaces;
 public interface ISaveSettings
 {
     void SaveSetting();

Endpoint/Configuration/Model/Admin.cs

@@ -1,9 +1,10 @@
-using Mirea.Api.Endpoint.Common.Services;
+using Mirea.Api.Endpoint.Common.Interfaces;
+using Mirea.Api.Endpoint.Common.Services;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Mirea.Api.Endpoint.Common.Settings;
+namespace Mirea.Api.Endpoint.Configuration.Model;
 
 public class Admin : ISaveSettings
 {

Endpoint/Configuration/Model/GeneralConfig.cs

@@ -1,10 +1,11 @@
-using Mirea.Api.Endpoint.Common.Services;
-using Mirea.Api.Endpoint.Configuration.General.Settings;
+using Mirea.Api.Endpoint.Common.Interfaces;
+using Mirea.Api.Endpoint.Common.Services;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Mirea.Api.Endpoint.Common.Settings;
+namespace Mirea.Api.Endpoint.Configuration.Model;
 
 public class GeneralConfig : ISaveSettings
 {

Endpoint/Configuration/Validation/Attributes/RequiredSettingsAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Mirea.Api.Endpoint.Configuration.General.Attributes;
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
 
 [AttributeUsage(AttributeTargets.Class, Inherited = false)]
 public class RequiredSettingsAttribute : Attribute;

Endpoint/Configuration/Validation/Interfaces/IIsConfigured.cs

@@ -0,0 +1,6 @@
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
+
+public interface IIsConfigured
+{
+    bool IsConfigured();
+}

Endpoint/Configuration/Validation/Settings/CacheSettings.cs

@@ -1,7 +1,7 @@
-using Mirea.Api.Endpoint.Configuration.General.Attributes;
-using Mirea.Api.Endpoint.Configuration.General.Interfaces;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
 
-namespace Mirea.Api.Endpoint.Configuration.General.Settings;
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 
 [RequiredSettings]
 public class CacheSettings : IIsConfigured

Endpoint/Configuration/Validation/Settings/DbSettings.cs

@@ -1,10 +1,10 @@
 using Mirea.Api.DataAccess.Persistence.Common;
-using Mirea.Api.Endpoint.Configuration.General.Attributes;
-using Mirea.Api.Endpoint.Configuration.General.Interfaces;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
 using System;
 using System.Text.Json.Serialization;
 
-namespace Mirea.Api.Endpoint.Configuration.General.Settings;
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 
 [RequiredSettings]
 public class DbSettings : IIsConfigured

Endpoint/Configuration/Validation/Settings/EmailSettings.cs

@@ -1,6 +1,6 @@
-using Mirea.Api.Endpoint.Configuration.General.Interfaces;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
 
-namespace Mirea.Api.Endpoint.Configuration.General.Settings;
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 
 public class EmailSettings : IIsConfigured
 {

Endpoint/Configuration/Validation/Settings/LogSettings.cs

@@ -1,7 +1,7 @@
-using Mirea.Api.Endpoint.Configuration.General.Attributes;
-using Mirea.Api.Endpoint.Configuration.General.Interfaces;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
 
-namespace Mirea.Api.Endpoint.Configuration.General.Settings;
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 
 [RequiredSettings]
 public class LogSettings : IIsConfigured

Endpoint/Configuration/Validation/Settings/ScheduleSettings.cs

@@ -1,10 +1,10 @@
-using Mirea.Api.Endpoint.Configuration.General.Attributes;
-using Mirea.Api.Endpoint.Configuration.General.Interfaces;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Mirea.Api.Endpoint.Configuration.General.Settings;
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 
 [RequiredSettings]
 public class ScheduleSettings : IIsConfigured

Endpoint/Configuration/Validation/SetupTokenService.cs

@@ -1,7 +1,7 @@
 using Mirea.Api.Endpoint.Common.Interfaces;
 using System;
 
-namespace Mirea.Api.Endpoint.Configuration.General;
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks;
 
 public class SetupTokenService : ISetupToken
 {

Endpoint/Configuration/Validation/Validators/SettingsRequiredValidator.cs

@@ -1,11 +1,11 @@
 using Microsoft.Extensions.Options;
-using Mirea.Api.Endpoint.Common.Settings;
-using Mirea.Api.Endpoint.Configuration.General.Attributes;
-using Mirea.Api.Endpoint.Configuration.General.Interfaces;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
+using Mirea.Api.Endpoint.Configuration.Model;
 using System;
 using System.Reflection;
 
-namespace Mirea.Api.Endpoint.Configuration.General.Validators;
+namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Validators;
 
 public class SettingsRequiredValidator
 {

Endpoint/Controllers/Configuration/SetupController.cs

@@ -10,9 +10,9 @@ using Mirea.Api.Endpoint.Common.Attributes;
 using Mirea.Api.Endpoint.Common.Exceptions;
 using Mirea.Api.Endpoint.Common.Interfaces;
 using Mirea.Api.Endpoint.Common.Services;
-using Mirea.Api.Endpoint.Common.Settings;
-using Mirea.Api.Endpoint.Configuration.General.Settings;
-using Mirea.Api.Endpoint.Configuration.General.Validators;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Validators;
+using Mirea.Api.Endpoint.Configuration.Model;
 using Mirea.Api.Security.Services;
 using MySqlConnector;
 using Npgsql;
@@ -29,7 +29,6 @@ using System.Security.Cryptography;
 namespace Mirea.Api.Endpoint.Controllers.Configuration;
 
 [ApiVersion("1.0")]
-[ApiController]
 [MaintenanceModeIgnore]
 [ApiExplorerSettings(IgnoreApi = true)]
 public class SetupController(

Endpoint/Controllers/V1/AuthController.cs

@@ -10,7 +10,7 @@ using Mirea.Api.Dto.Responses;
 using Mirea.Api.Endpoint.Common.Attributes;
 using Mirea.Api.Endpoint.Common.Exceptions;
 using Mirea.Api.Endpoint.Common.Services;
-using Mirea.Api.Endpoint.Common.Settings;
+using Mirea.Api.Endpoint.Configuration.Model;
 using Mirea.Api.Security.Common.Dto.Requests;
 using Mirea.Api.Security.Services;
 using System;

Endpoint/Controllers/V1/ScheduleController.cs

@@ -9,7 +9,7 @@ using Mirea.Api.Dto.Requests;
 using Mirea.Api.Dto.Responses;
 using Mirea.Api.Endpoint.Common.Attributes;
 using Mirea.Api.Endpoint.Common.Services;
-using Mirea.Api.Endpoint.Common.Settings;
+using Mirea.Api.Endpoint.Configuration.Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Endpoint/Program.cs

@@ -10,10 +10,10 @@ using Mirea.Api.DataAccess.Persistence;
 using Mirea.Api.DataAccess.Persistence.Common;
 using Mirea.Api.Endpoint.Common.Interfaces;
 using Mirea.Api.Endpoint.Common.Services;
-using Mirea.Api.Endpoint.Common.Settings;
-using Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
-using Mirea.Api.Endpoint.Configuration.General;
-using Mirea.Api.Endpoint.Configuration.General.Validators;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks;
+using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Validators;
+using Mirea.Api.Endpoint.Configuration.Core.Startup;
+using Mirea.Api.Endpoint.Configuration.Model;
 using Mirea.Api.Endpoint.Middleware;
 using Mirea.Api.Security.Services;
 using System;