Winsomnia/MireaBackend
1
0
Fork 0
Code Pull Requests Actions Projects Releases Activity

refactor: code restructuring

Browse Source
This commit is contained in:
Polianin Nikita 2024-10-07 02:13:35 +03:00
parent de5dc274d7
commit 1c981fb7bf
29 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Endpoint/Common/Services/PairPeriodTimeConverter.cs
View File

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

2
Endpoint/Middleware/CacheMaxAgeMiddleware.cs → Endpoint/Configuration/Core/Middleware/CacheMaxAgeMiddleware.cs
View File

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

0
Endpoint/Middleware/CustomExceptionHandlerMiddleware.cs → Endpoint/Configuration/Core/Middleware/CustomExceptionHandlerMiddleware.cs
View File

0
Endpoint/Middleware/JwtRevocationMiddleware.cs → Endpoint/Configuration/Core/Middleware/JwtRevocationMiddleware.cs
View File

0
Endpoint/Middleware/MaintenanceModeMiddleware.cs → Endpoint/Configuration/Core/Middleware/MaintenanceModeMiddleware.cs
View File

2
Endpoint/Configuration/ApplicationConfiguration/ApiVersioningConfiguration.cs → Endpoint/Configuration/Core/Startup/ApiVersioningConfiguration.cs
View File

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

6
Endpoint/Configuration/ApplicationConfiguration/CacheConfiguration.cs → Endpoint/Configuration/Core/Startup/CacheConfiguration.cs
View File

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

2
Endpoint/Configuration/ApplicationConfiguration/EnvironmentConfiguration.cs → Endpoint/Configuration/Core/Startup/EnvironmentConfiguration.cs
View File

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

2
Endpoint/Configuration/ApplicationConfiguration/JwtConfiguration.cs → Endpoint/Configuration/Core/Startup/JwtConfiguration.cs
View File

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

4
Endpoint/Configuration/ApplicationConfiguration/LoggerConfiguration.cs → Endpoint/Configuration/Core/Startup/LoggerConfiguration.cs
View File

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

6
Endpoint/Configuration/ApplicationConfiguration/SecureConfiguration.cs → Endpoint/Configuration/Core/Startup/SecureConfiguration.cs
View File

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

2
Endpoint/Configuration/ApplicationConfiguration/SwaggerConfiguration.cs → Endpoint/Configuration/Core/Startup/SwaggerConfiguration.cs
View File

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

6
Endpoint/Configuration/General/Interfaces/IIsConfigured.cs
View File

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

2
Endpoint/Common/Settings/ISaveSettings.cs → Endpoint/Configuration/ISaveSettings.cs
View File

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

5
Endpoint/Common/Settings/Admin.cs → Endpoint/Configuration/Model/Admin.cs
View File

@ -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.IO;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace Mirea.Api.Endpoint.Common.Settings; namespace Mirea.Api.Endpoint.Configuration.Model;
public class Admin : ISaveSettings public class Admin : ISaveSettings
{ {

7
Endpoint/Common/Settings/GeneralConfig.cs → Endpoint/Configuration/Model/GeneralConfig.cs
View File

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

2
Endpoint/Configuration/General/Attributes/RequiredSettingsAttribute.cs → Endpoint/Configuration/Validation/Attributes/RequiredSettingsAttribute.cs
View File

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

6
Endpoint/Configuration/Validation/Interfaces/IIsConfigured.cs Normal file
View File

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

6
Endpoint/Configuration/General/Settings/CacheSettings.cs → Endpoint/Configuration/Validation/Settings/CacheSettings.cs
View File

@ -1,7 +1,7 @@
using Mirea.Api.Endpoint.Configuration.General.Attributes; using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
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;
[RequiredSettings] [RequiredSettings]
public class CacheSettings : IIsConfigured public class CacheSettings : IIsConfigured

6
Endpoint/Configuration/General/Settings/DbSettings.cs → Endpoint/Configuration/Validation/Settings/DbSettings.cs
View File

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

4
Endpoint/Configuration/General/Settings/EmailSettings.cs → Endpoint/Configuration/Validation/Settings/EmailSettings.cs
View File

@ -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 public class EmailSettings : IIsConfigured
{ {

6
Endpoint/Configuration/General/Settings/LogSettings.cs → Endpoint/Configuration/Validation/Settings/LogSettings.cs
View File

@ -1,7 +1,7 @@
using Mirea.Api.Endpoint.Configuration.General.Attributes; using Mirea.Api.Endpoint.Configuration.ConfigurationChecks.Attributes;
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;
[RequiredSettings] [RequiredSettings]
public class LogSettings : IIsConfigured public class LogSettings : IIsConfigured

6
Endpoint/Configuration/General/Settings/ScheduleSettings.cs → Endpoint/Configuration/Validation/Settings/ScheduleSettings.cs
View File

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

2
Endpoint/Configuration/General/SetupTokenService.cs → Endpoint/Configuration/Validation/SetupTokenService.cs
View File

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

8
Endpoint/Configuration/General/Validators/SettingsRequiredValidator.cs → Endpoint/Configuration/Validation/Validators/SettingsRequiredValidator.cs
View File

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

7
Endpoint/Controllers/Configuration/SetupController.cs
View File

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

2
Endpoint/Controllers/V1/AuthController.cs
View File

@ -10,7 +10,7 @@ using Mirea.Api.Dto.Responses;
using Mirea.Api.Endpoint.Common.Attributes; using Mirea.Api.Endpoint.Common.Attributes;
using Mirea.Api.Endpoint.Common.Exceptions; using Mirea.Api.Endpoint.Common.Exceptions;
using Mirea.Api.Endpoint.Common.Services; 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.Common.Dto.Requests;
using Mirea.Api.Security.Services; using Mirea.Api.Security.Services;
using System; using System;

2
Endpoint/Controllers/V1/ScheduleController.cs
View File

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

8
Endpoint/Program.cs
View File

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