From 90e03c5303b7a64f6ac75847f0c2213855c6385b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 21 Aug 2022 16:27:35 +0300
Subject: [PATCH] Set AbpAuditingOptions.ApplicationName by default

From the global application name.
---
 .../Volo/Abp/Auditing/AbpAuditingModule.cs    | 17 +++++++++++++-
 .../Abp/Auditing/AbpAuditingOptions_Tests.cs  | 23 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AbpAuditingOptions_Tests.cs

diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs
index bb3f104ce4..b6527f10c8 100644
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs
+++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs
@@ -1,4 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Data;
 using Volo.Abp.Json;
 using Volo.Abp.Modularity;
@@ -24,4 +26,17 @@ public class AbpAuditingModule : AbpModule
     {
         context.Services.OnRegistred(AuditingInterceptorRegistrar.RegisterIfNeeded);
     }
+
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        var applicationName = context.Services.GetApplicationName();
+        
+        if (!applicationName.IsNullOrEmpty())
+        {
+            Configure<AbpAuditingOptions>(options =>
+            {
+                options.ApplicationName = applicationName;
+            });
+        }
+    }
 }
diff --git a/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AbpAuditingOptions_Tests.cs b/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AbpAuditingOptions_Tests.cs
new file mode 100644
index 0000000000..6853046241
--- /dev/null
+++ b/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AbpAuditingOptions_Tests.cs
@@ -0,0 +1,23 @@
+using Microsoft.Extensions.Options;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.Auditing;
+
+public class AbpAuditingOptions_Tests : AbpAuditingTestBase
+{
+    private const string ApplicationName = "TEST_APP_NAME";
+    
+    protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
+    {
+        base.SetAbpApplicationCreationOptions(options);
+        options.ApplicationName = ApplicationName;
+    }
+    
+    [Fact]
+    public void Should_Set_Application_Name_From_Global_Application_Name_By_Default()
+    {
+        var options = GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
+        options.ApplicationName.ShouldBe(ApplicationName);
+    }
+}
\ No newline at end of file