Endpoint/Common/Services/PairPeriodTimeConverter.cs

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

Endpoint/Configuration/Core/Middleware/CacheMaxAgeMiddleware.cs

@@ -8,7 +8,7 @@ using System;
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace Mirea.Api.Endpoint.Middleware;
+namespace Mirea.Api.Endpoint.Configuration.Core.Middleware;
 
 public class CacheMaxAgeMiddleware(RequestDelegate next, IServiceProvider serviceProvider)
 {

Endpoint/Configuration/Core/Middleware/CustomExceptionHandlerMiddleware.cs

@@ -7,7 +7,7 @@ using System;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace Mirea.Api.Endpoint.Middleware;
+namespace Mirea.Api.Endpoint.Configuration.Core.Middleware;
 
 public class CustomExceptionHandlerMiddleware(RequestDelegate next)
 {

Endpoint/Configuration/Core/Middleware/JwtRevocationMiddleware.cs

@@ -2,7 +2,7 @@
 using Mirea.Api.Security.Common.Interfaces;
 using System.Threading.Tasks;
 
-namespace Mirea.Api.Endpoint.Middleware;
+namespace Mirea.Api.Endpoint.Configuration.Core.Middleware;
 
 public class JwtRevocationMiddleware(RequestDelegate next)
 {

Endpoint/Configuration/Core/Middleware/MaintenanceModeMiddleware.cs

@@ -3,7 +3,7 @@ using Mirea.Api.Endpoint.Common.Attributes;
 using Mirea.Api.Endpoint.Common.Interfaces;
 using System.Threading.Tasks;
 
-namespace Mirea.Api.Endpoint.Middleware;
+namespace Mirea.Api.Endpoint.Configuration.Core.Middleware;
 
 public class MaintenanceModeMiddleware(RequestDelegate next, IMaintenanceModeService maintenanceModeService, IMaintenanceModeNotConfigureService maintenanceModeNotConfigureService)
 {

Endpoint/Configuration/Core/Startup/CacheConfiguration.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 using Mirea.Api.Endpoint.Configuration.Model;
+using Mirea.Api.Endpoint.Configuration.Model.GeneralSettings;
 
 namespace Mirea.Api.Endpoint.Configuration.Core.Startup;
 

Endpoint/Configuration/Core/Startup/SecureConfiguration.cs

@@ -1,8 +1,8 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Mirea.Api.Endpoint.Common.Services.Security;
-using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
 using Mirea.Api.Endpoint.Configuration.Model;
+using Mirea.Api.Endpoint.Configuration.Model.GeneralSettings;
 using Mirea.Api.Security;
 using Mirea.Api.Security.Common.Interfaces;
 

Endpoint/Configuration/ISaveSettings.cs

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

Endpoint/Configuration/Model/Admin.cs

@@ -1,5 +1,4 @@
-using Mirea.Api.Endpoint.Common.Interfaces;
-using Mirea.Api.Endpoint.Common.Services;
+using Mirea.Api.Endpoint.Common.Services;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;

Endpoint/Configuration/Model/GeneralConfig.cs

@@ -1,6 +1,5 @@
-using Mirea.Api.Endpoint.Common.Interfaces;
-using Mirea.Api.Endpoint.Common.Services;
-using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Settings;
+using Mirea.Api.Endpoint.Common.Services;
+using Mirea.Api.Endpoint.Configuration.Model.GeneralSettings;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;

Endpoint/Configuration/Model/GeneralSettings/CacheSettings.cs

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

Endpoint/Configuration/Model/GeneralSettings/DbSettings.cs

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

Endpoint/Configuration/Model/GeneralSettings/EmailSettings.cs

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

Endpoint/Configuration/Model/GeneralSettings/LogSettings.cs

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

Endpoint/Configuration/Model/GeneralSettings/ScheduleSettings.cs

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

Endpoint/Configuration/Validation/Attributes/RequiredSettingsAttribute.cs

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

Endpoint/Configuration/Validation/Interfaces/IIsConfigured.cs

@@ -1,4 +1,4 @@
-namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
+namespace Mirea.Api.Endpoint.Configuration.Validation.Interfaces;
 
 public interface IIsConfigured
 {

Endpoint/Configuration/Validation/SetupTokenService.cs

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

Endpoint/Configuration/Validation/Validators/SettingsRequiredValidator.cs

@@ -1,11 +1,11 @@
 using Microsoft.Extensions.Options;
-using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
-using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Interfaces;
 using Mirea.Api.Endpoint.Configuration.Model;
+using Mirea.Api.Endpoint.Configuration.Validation.Attributes;
+using Mirea.Api.Endpoint.Configuration.Validation.Interfaces;
 using System;
 using System.Reflection;
 
-namespace Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Validators;
+namespace Mirea.Api.Endpoint.Configuration.Validation.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.Configuration.ConfigurationChecks.Settings;
-using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Validators;
 using Mirea.Api.Endpoint.Configuration.Model;
+using Mirea.Api.Endpoint.Configuration.Model.GeneralSettings;
+using Mirea.Api.Endpoint.Configuration.Validation.Validators;
 using Mirea.Api.Security.Services;
 using MySqlConnector;
 using Npgsql;

Endpoint/Program.cs

@@ -10,11 +10,11 @@ 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.Configuration.ConfigurationChecks;
-using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Validators;
+using Mirea.Api.Endpoint.Configuration.Core.Middleware;
 using Mirea.Api.Endpoint.Configuration.Core.Startup;
 using Mirea.Api.Endpoint.Configuration.Model;
-using Mirea.Api.Endpoint.Middleware;
+using Mirea.Api.Endpoint.Configuration.Validation;
+using Mirea.Api.Endpoint.Configuration.Validation.Validators;
 using Mirea.Api.Security.Services;
 using System;
 using System.IO;