🎨 format and clear code

jxnkwlp · Sep 16, 2023 · 731c0d1 · 731c0d1
1 parent 0f0bd6d
commit 731c0d1
Show file tree

Hide file tree

Showing 240 changed files with 992 additions and 1,764 deletions.
diff --git a/...rc/Passingwind.WorkflowApp.Application.Contracts/Permissions/OAuth2SettingsPermissions.cs b/...rc/Passingwind.WorkflowApp.Application.Contracts/Permissions/OAuth2SettingsPermissions.cs
@@ -5,4 +5,4 @@ namespace Passingwind.WorkflowApp.Permissions;
 public static class OAuth2SettingsPermissions
 {
     public const string OAuth2 = SettingManagementPermissions.GroupName + ".OAuth2";
-}
+}
diff --git a/app/src/Passingwind.WorkflowApp.Application.Contracts/SettingManagement/OAuth2SettingsDto.cs b/app/src/Passingwind.WorkflowApp.Application.Contracts/SettingManagement/OAuth2SettingsDto.cs
@@ -8,10 +8,10 @@
 namespace Passingwind.WorkflowApp.SettingManagement;
 public class OAuth2SettingsDto
 {
-    public bool Enabled { get; set; } 
-    public string DisplayName { get; set; } 
-    public string Authority { get; set; } 
-    public string MetadataAddress { get; set; } 
+    public bool Enabled { get; set; }
+    public string DisplayName { get; set; }
+    public string Authority { get; set; }
+    public string MetadataAddress { get; set; }
     public string ClientId { get; set; }
     public string ClientSecret { get; set; }
     public string Scope { get; set; }

diff --git a/app/src/Passingwind.WorkflowApp.Application/Account/IExternalLoginProviderManager.cs b/app/src/Passingwind.WorkflowApp.Application/Account/IExternalLoginProviderManager.cs
@@ -14,4 +14,4 @@ public interface IExternalLoginProviderManager : ITransientDependency
 
     Task RegisterOpenIdConnectAsync(string provider, string displayName, Action<OpenIdConnectOptions> configure);
     Task UnRegisterOpenIdConnectAsync(string provider);
-}
+}
diff --git a/app/src/Passingwind.WorkflowApp.Application/ApiKeys/ApiKeyAppService.cs b/app/src/Passingwind.WorkflowApp.Application/ApiKeys/ApiKeyAppService.cs
@@ -62,10 +62,7 @@ public async Task<PagedResultDto<ApiKeyDto>> GetListAsync(ApiKeyListRequestDto i
         var list = await _repository.GetPagedListAsync(input.SkipCount, input.MaxResultCount, userId, nameof(ApiKey.CreationTime) + " desc");
 
         var result = ObjectMapper.Map<List<ApiKey>, List<ApiKeyDto>>(list);
-        result.ForEach(x =>
-        {
-            x.Secret = null;
-        });
+        result.ForEach(x => x.Secret = null);
 
         return new PagedResultDto<ApiKeyDto>(count, result);
     }

diff --git a/app/src/Passingwind.WorkflowApp.Application/SettingManagement/OAuth2SettingsAppService.cs b/app/src/Passingwind.WorkflowApp.Application/SettingManagement/OAuth2SettingsAppService.cs
@@ -26,7 +26,7 @@ public OAuth2SettingsAppService(ISettingManager settingManager, ISettingProvider
 
     public async Task<OAuth2SettingsDto> GetAsync()
     {
-        OAuth2SettingsDto result = new OAuth2SettingsDto()
+        return new OAuth2SettingsDto()
         {
             Enabled = await _settingProvider.GetAsync<bool>(OAuth2Setting.Enabled),
             DisplayName = await _settingProvider.GetOrNullAsync(OAuth2Setting.DisplayName),
@@ -36,8 +36,6 @@ public async Task<OAuth2SettingsDto> GetAsync()
             ClientSecret = await _settingProvider.GetOrNullAsync(OAuth2Setting.ClientSecret),
             Scope = await _settingProvider.GetOrNullAsync(OAuth2Setting.Scope),
         };
-
-        return result;
     }
 
     public async Task UpdateAsync(OAuth2SettingUpdateDto input)

diff --git a/app/src/Passingwind.WorkflowApp.Application/WorkflowAppApplicationModule.cs b/app/src/Passingwind.WorkflowApp.Application/WorkflowAppApplicationModule.cs
@@ -21,9 +21,6 @@ public class WorkflowAppApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<WorkflowAppApplicationModule>();
-        });
+        Configure<AbpAutoMapperOptions>(options => options.AddMaps<WorkflowAppApplicationModule>());
     }
 }
diff --git a/app/src/Passingwind.WorkflowApp.DbMigrator/DbMigratorHostedService.cs b/app/src/Passingwind.WorkflowApp.DbMigrator/DbMigratorHostedService.cs
@@ -24,9 +24,9 @@ public async Task StartAsync(CancellationToken cancellationToken)
     {
         using (var application = await AbpApplicationFactory.CreateAsync<WorkflowAppDbMigratorModule>(options =>
         {
-           options.Services.ReplaceConfiguration(_configuration);
-           options.UseAutofac();
-           options.Services.AddLogging(c => c.AddSerilog());
+            options.Services.ReplaceConfiguration(_configuration);
+            options.UseAutofac();
+            options.Services.AddLogging(c => c.AddSerilog());
         }))
         {
             await application.InitializeAsync();

diff --git a/app/src/Passingwind.WorkflowApp.DbMigrator/Program.cs b/app/src/Passingwind.WorkflowApp.DbMigrator/Program.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/...wind.WorkflowApp.EntityFrameworkCore/EntityFrameworkCore/Repositories/ApiKeyRepository.cs b/...wind.WorkflowApp.EntityFrameworkCore/EntityFrameworkCore/Repositories/ApiKeyRepository.cs
@@ -42,5 +42,4 @@ public async Task<List<ApiKey>> GetPagedListAsync(int skipCount, int maxResultCo
             .PageBy(skipCount, maxResultCount)
             .ToListAsync(cancellationToken);
     }
-
 }
diff --git a/...c/Passingwind.WorkflowApp.EntityFrameworkCore/EntityFrameworkCore/WorkflowAppDbContext.cs b/...c/Passingwind.WorkflowApp.EntityFrameworkCore/EntityFrameworkCore/WorkflowAppDbContext.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Passingwind.Abp.ElsaModule.EntityFrameworkCore;
 using Passingwind.WorkflowApp.ApiKeys;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
@@ -40,7 +40,9 @@ public class WorkflowAppDbContext :
      * uses this DbContext on runtime. Otherwise, it will use its own DbContext class.
      */
 
-    //Identity
+    /// <summary>
+    /// Identity
+    /// </summary>
     public DbSet<IdentityUser> Users { get; set; }
     public DbSet<IdentityRole> Roles { get; set; }
     public DbSet<IdentityClaimType> ClaimTypes { get; set; }
@@ -49,18 +51,19 @@ public class WorkflowAppDbContext :
     public DbSet<IdentityLinkUser> LinkUsers { get; set; }
     public DbSet<IdentityUserDelegation> UserDelegations { get; set; }
 
-    // Tenant Management
+    /// <summary>
+    /// Tenant Management
+    /// </summary>
     public DbSet<Tenant> Tenants { get; set; }
     public DbSet<TenantConnectionString> TenantConnectionStrings { get; set; }
 
-    #endregion
+    #endregion Entities from the modules
 
     public DbSet<ApiKey> ApiKeys { get; set; }
-   
+
     public WorkflowAppDbContext(DbContextOptions<WorkflowAppDbContext> options)
         : base(options)
     {
-
     }
 
     protected override void OnModelCreating(ModelBuilder builder)

diff --git a/...rkflowApp.EntityFrameworkCore/EntityFrameworkCore/WorkflowAppEntityFrameworkCoreModule.cs b/...rkflowApp.EntityFrameworkCore/EntityFrameworkCore/WorkflowAppEntityFrameworkCoreModule.cs
@@ -55,8 +55,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             /* The main point to change your DBMS.
              * See also DemoMigrationsDbContextFactory for EF Core tooling. */
             options.UseSqlServer();
-
         });
-
     }
 }
diff --git a/app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20220420161644_Initial.cs b/app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20220420161644_Initial.cs
@@ -38,10 +38,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                 ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpAuditLogs", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpAuditLogs", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpBackgroundJobs",
@@ -59,10 +56,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                 ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpBackgroundJobs", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpBackgroundJobs", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpClaimTypes",
@@ -79,10 +73,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                 ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpClaimTypes", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpClaimTypes", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpFeatureValues",
@@ -94,10 +85,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
                 ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpFeatureValues", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpFeatureValues", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpLinkUsers",
@@ -109,10 +97,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 TargetUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
                 TargetTenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpLinkUsers", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpLinkUsers", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpOrganizationUnits",
@@ -153,10 +138,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
                 ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpPermissionGrants", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpPermissionGrants", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpRoles",
@@ -172,10 +154,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                 ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpRoles", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpRoles", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpSecurityLogs",
@@ -197,10 +176,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                 ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpSecurityLogs", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpSecurityLogs", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpSettings",
@@ -212,10 +188,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
                 ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpSettings", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpSettings", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpTenants",
@@ -233,10 +206,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
                 DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpTenants", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpTenants", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpUsers",
@@ -271,10 +241,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
                 DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpUsers", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AbpUsers", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "AbpAuditLogActions",

diff --git a/app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20220423154337_Add_Elsa.cs b/app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20220423154337_Add_Elsa.cs
@@ -27,10 +27,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
                 LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_ElsaBookmarks", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_ElsaBookmarks", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "ElsaTriggers",
@@ -49,10 +46,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
                 LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_ElsaTriggers", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_ElsaTriggers", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "ElsaWorkflowDefinitions",
@@ -81,10 +75,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
                 DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_ElsaWorkflowDefinitions", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_ElsaWorkflowDefinitions", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "ElsaWorkflowInstances",
@@ -123,10 +114,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
                 DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_ElsaWorkflowInstances", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_ElsaWorkflowInstances", x => x.Id));
 
         migrationBuilder.CreateTable(
             name: "ElsaWorkflowDefinitionVersions",

diff --git a/...rc/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221023145912_Update_Elsa_4.cs b/...rc/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221023145912_Update_Elsa_4.cs
@@ -28,10 +28,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
                 DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_ElsaGlobalVariables", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_ElsaGlobalVariables", x => x.Id));
     }
 
     protected override void Down(MigrationBuilder migrationBuilder)

diff --git a/app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221120145453_Add_ApiKey.cs b/app/src/Passingwind.WorkflowApp.EntityFrameworkCore/Migrations/20221120145453_Add_ApiKey.cs
@@ -28,10 +28,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
                 DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
             },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AppApiKeys", x => x.Id);
-            });
+            constraints: table => table.PrimaryKey("PK_AppApiKeys", x => x.Id));
     }
 
     protected override void Down(MigrationBuilder migrationBuilder)