Merge pull request #120 from jxnkwlp/feature/code-format

🎨 format and fix code warning

.editorconfig

@@ -313,11 +313,15 @@ roslynator_compiler_diagnostic_fixes.enabled = true
 # roslynator_compiler_diagnostic_fix.<COMPILER_DIAGNOSTIC_ID>.enabled = true|false
 # dotnet_diagnostic.<ANALYZER_ID>.severity = default|none|silent|suggestion|warning|error
 
+dotnet_diagnostic.CA1305.severity = silent
+dotnet_diagnostic.CA1310.severity = suggestion
+dotnet_diagnostic.CA1848.severity = silent
+dotnet_diagnostic.CA1863.severity = suggestion
 dotnet_diagnostic.Ca2016.severity = warning
+dotnet_diagnostic.ca2254.severity = silent
+dotnet_diagnostic.IDE0011.severity = suggestion
+dotnet_diagnostic.IDE0060.severity = silent
+dotnet_diagnostic.RCS1093.severity = suggestion
+dotnet_diagnostic.RCS1163.severity = silent
 dotnet_diagnostic.RCS1251.severity = none
-dotnet_diagnostic.CA1848.severity = silent
-dotnet_diagnostic.CA1305.severity = silent
-dotnet_diagnostic.ide0011.severity = warning
 dotnet_diagnostic.RCS1251.severity = silent
-dotnet_diagnostic.ide0011.severity = silent
-dotnet_diagnostic.ca2254.severity = silent

app/src/Passingwind.WorkflowApp.Application.Contracts/ApiKeys/IApiKeyAppService.cs

@@ -3,7 +3,6 @@
 
 namespace Passingwind.WorkflowApp.ApiKeys;
 
-public interface IApiKeyAppService : ICrudAppService<ApiKeyDto, Guid, ApiKeyListRequestDto, ApiKeyCreateOrUpdateDto, ApiKeyCreateOrUpdateDto>, IApplicationService
+public interface IApiKeyAppService : ICrudAppService<ApiKeyDto, Guid, ApiKeyListRequestDto, ApiKeyCreateOrUpdateDto, ApiKeyCreateOrUpdateDto>
 {
-
 }

app/src/Passingwind.WorkflowApp.Application.Contracts/Permissions/OAuth2SettingsPermissionDefinitionProvider.cs

@@ -11,10 +11,7 @@ public override void Define(IPermissionDefinitionContext context)
     {
         var settings = context.GetGroupOrNull(SettingManagementPermissions.GroupName);
 
-        if (settings != null)
-        {
-            settings.AddPermission(OAuth2SettingsPermissions.OAuth2, L("Permission:OAuth2"));
-        }
+        settings?.AddPermission(OAuth2SettingsPermissions.OAuth2, L("Permission:OAuth2"));
     }
 
     private static LocalizableString L(string name)

app/src/Passingwind.WorkflowApp.Application.Contracts/Permissions/WorkflowAppPermissionDefinitionProvider.cs

@@ -1,6 +1,4 @@
-using Passingwind.WorkflowApp.Localization;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Localization;
+using Volo.Abp.Authorization.Permissions;
 
 namespace Passingwind.WorkflowApp.Permissions;
 
@@ -12,9 +10,4 @@ public override void Define(IPermissionDefinitionContext context)
         //Define your own permissions here. Example:
         //myGroup.AddPermission(WorkflowAppPermissions.MyPermission1, L("Permission:MyPermission1"));
     }
-
-    private static LocalizableString L(string name)
-    {
-        return LocalizableString.Create<WorkflowAppResource>(name);
-    }
 }

app/src/Passingwind.WorkflowApp.Application.Contracts/SettingManagement/OAuth2SettingsDto.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Passingwind.WorkflowApp.SettingManagement;
+namespace Passingwind.WorkflowApp.SettingManagement;
 public class OAuth2SettingsDto
 {
     public bool Enabled { get; set; }

app/src/Passingwind.WorkflowApp.Domain.Shared/Localization/WorkflowAppResource.cs

@@ -5,5 +5,4 @@ namespace Passingwind.WorkflowApp.Localization;
 [LocalizationResourceName("WorkflowApp")]
 public class WorkflowAppResource
 {
-
 }

app/src/Passingwind.WorkflowApp.Domain.Shared/WorkflowAppDomainSharedModule.cs

@@ -33,10 +33,7 @@ public override void PreConfigureServices(ServiceConfigurationContext context)
 
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        Configure<AbpVirtualFileSystemOptions>(options =>
-        {
-            options.FileSets.AddEmbedded<WorkflowAppDomainSharedModule>();
-        });
+        Configure<AbpVirtualFileSystemOptions>(options => options.FileSets.AddEmbedded<WorkflowAppDomainSharedModule>());
 
         Configure<AbpLocalizationOptions>(options =>
         {
@@ -48,9 +45,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             options.DefaultResourceType = typeof(WorkflowAppResource);
         });
 
-        Configure<AbpExceptionLocalizationOptions>(options =>
-        {
-            options.MapCodeNamespace("WorkflowApp", typeof(WorkflowAppResource));
-        });
+        Configure<AbpExceptionLocalizationOptions>(options => options.MapCodeNamespace("WorkflowApp", typeof(WorkflowAppResource)));
     }
 }

app/src/Passingwind.WorkflowApp.Domain/ApiKeys/ApiKeyDomainService.cs

@@ -43,10 +43,9 @@ public Task<string> GenerateSecretAsync(ApiKey key)
                 return apiKey.UserId;
             }
         }
-        else
+        else if (Guid.TryParse(userIdString, out Guid userId2))
         {
-            if (Guid.TryParse(userIdString, out Guid userId2))
-                return userId2;
+            return userId2;
         }
 
         return null;

app/src/Passingwind.WorkflowApp.Domain/ApiKeys/IApiKeyRepository.cs

@@ -13,5 +13,4 @@ public interface IApiKeyRepository : IRepository<ApiKey, Guid>
     Task<List<ApiKey>> GetListAsync(Guid userId, bool includeDetails = false, CancellationToken cancellationToken = default);
 
     Task<List<ApiKey>> GetPagedListAsync(int skipCount, int maxResultCount, Guid userId, string sorting, bool includeDetails = false, CancellationToken cancellationToken = default);
-
 }

app/src/Passingwind.WorkflowApp.Domain/Data/WorkflowAppDbMigrationService.cs

@@ -52,7 +52,7 @@ public async Task MigrateAsync()
         await MigrateDatabaseSchemaAsync();
         await SeedDataAsync();
 
-        Logger.LogInformation($"Successfully completed host database migrations.");
+        Logger.LogInformation("Successfully completed host database migrations.");
 
         var tenants = await _tenantRepository.GetListAsync(includeDetails: true);
 
@@ -64,8 +64,8 @@ public async Task MigrateAsync()
                 if (tenant.ConnectionStrings.Any())
                 {
                     var tenantConnectionStrings = tenant.ConnectionStrings
-                        .Select(x => x.Value)
-                        .ToList();
+                        .ConvertAll(x => x.Value)
+;
 
                     if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings))
                     {
@@ -127,10 +127,8 @@ private bool AddInitialMigrationIfNotExist()
                 AddInitialMigration();
                 return true;
             }
-            else
-            {
-                return false;
-            }
+
+            return false;
         }
         catch (Exception e)
         {
@@ -208,7 +206,7 @@ private string GetSolutionDirectoryPath()
         {
             currentDirectory = Directory.GetParent(currentDirectory.FullName);
 
-            if (Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
+            if (Directory.GetFiles(currentDirectory.FullName).Any(f => f.EndsWith(".sln")))
             {
                 return currentDirectory.FullName;
             }

app/src/Passingwind.WorkflowApp.Domain/Settings/OAuth2Setting.cs

@@ -1,5 +1,5 @@
 namespace Passingwind.WorkflowApp.Settings;
-public class OAuth2Setting
+public static class OAuth2Setting
 {
     private const string Prefix = "OAuth2";
 

app/src/Passingwind.WorkflowApp.Domain/Settings/WorkflowAppSettings.cs

@@ -2,7 +2,6 @@
 
 public static class WorkflowAppSettings
 {
-    private const string Prefix = "WorkflowApp";
 
     //Add your own setting names here. Example:
     //public const string MySetting1 = Prefix + ".MySetting1";

app/src/Passingwind.WorkflowApp.Domain/WorkflowAppDomainModule.cs

@@ -31,10 +31,7 @@ public class WorkflowAppDomainModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        Configure<AbpMultiTenancyOptions>(options =>
-        {
-            options.IsEnabled = MultiTenancyConsts.IsEnabled;
-        });
+        Configure<AbpMultiTenancyOptions>(options => options.IsEnabled = MultiTenancyConsts.IsEnabled);
 
 #if DEBUG
         context.Services.Replace(ServiceDescriptor.Singleton<IEmailSender, NullEmailSender>());

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/EntityFrameworkCore/WorkflowAppDbContext.cs

@@ -62,26 +62,25 @@ public class WorkflowAppDbContext :
 
     public DbSet<ApiKey> ApiKeys { get; set; }
 
-
     public WorkflowAppDbContext(DbContextOptions<WorkflowAppDbContext> options)
         : base(options)
     {
     }
 
-    protected override void OnModelCreating(ModelBuilder builder)
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        base.OnModelCreating(builder);
+        base.OnModelCreating(modelBuilder);
 
         /* Include modules to your migration db context */
 
-        builder.ConfigurePermissionManagement();
-        builder.ConfigureSettingManagement();
-        builder.ConfigureBackgroundJobs();
-        builder.ConfigureAuditLogging();
-        builder.ConfigureIdentity();
-        builder.ConfigureFeatureManagement();
-        builder.ConfigureTenantManagement();
-        builder.ConfigureElsaModule();
+        modelBuilder.ConfigurePermissionManagement();
+        modelBuilder.ConfigureSettingManagement();
+        modelBuilder.ConfigureBackgroundJobs();
+        modelBuilder.ConfigureAuditLogging();
+        modelBuilder.ConfigureIdentity();
+        modelBuilder.ConfigureFeatureManagement();
+        modelBuilder.ConfigureTenantManagement();
+        modelBuilder.ConfigureElsaModule();
 
         /* Configure your own tables/entities inside here */
 
@@ -92,7 +91,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         //    //...
         //});
 
-        builder.Entity<ApiKey>(b =>
+        modelBuilder.Entity<ApiKey>(b =>
         {
             b.ToTable(WorkflowAppConsts.DbTablePrefix + "ApiKeys", WorkflowAppConsts.DbSchema);
             b.ConfigureByConvention();

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20220420161644_Initial.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Initial : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20220423154337_Add_Elsa.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Add_Elsa : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20220508114628_Update_Elsa_1.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Update_Elsa_1 : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20220522144358_Update_Elsa_2.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Update_Elsa_2 : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221016125046_Update_Elsa_3.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Update_Elsa_3 : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221023145912_Update_Elsa_4.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Update_Elsa_4 : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221102160115_Update_Elsa_5.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Update_Elsa_5 : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221104163859_Update_GlobalVariable_2.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Update_GlobalVariable_2 : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221120145453_Add_ApiKey.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 public partial class Add_ApiKey : Migration

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20230305035156_Update_Abp_7.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20230312135138_Add_WorkflowGroup.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20230312135521_Add_Index.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20230615080044_Update_Elsa_6.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20230706135617_Update_Abp_723.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20230807154316_Update_Elsa_7.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20230916070726_Add_WorkflowGroup2.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20230928152618_Add_GlobalCode.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />

app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20240205143836_Update_Abp_8.cs

@@ -1,8 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
-
 namespace Demo.Migrations;
 
 /// <inheritdoc />