reactor : add crm configuration (#667)

* feat : Add DynamicsCrmDbContext * chore : Remove useless code * chore : Handling code odors * chore : Handling code odors * chore : Handling code odors * chore : Handling code odors * reactor : add crm configuration * chore : Dealing with bad odors * chore : Dealing with bad odors
masastack · Aug 22, 2023 · b83ab5b · b83ab5b
1 parent de44ad1
commit b83ab5b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/src/Utils/DynamicsCrm/Masa.Utils.DynamicsCrm.Core/ServiceCollectionExtensions.cs b/src/Utils/DynamicsCrm/Masa.Utils.DynamicsCrm.Core/ServiceCollectionExtensions.cs
@@ -0,0 +1,17 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.Utils.DynamicsCrm.Core;
+
+public static class ServiceCollectionExtensions
+{
+    public static IServiceCollection AddCrmConfiguration(this IServiceCollection services, Action<CrmConfiguration> crmConfigurationAction)
+    {
+        var crmConfiguration = new CrmConfiguration();
+        crmConfigurationAction.Invoke(crmConfiguration);
+
+        services.TryAddSingleton<ICrmConfiguration>(crmConfiguration);
+
+        return services;
+    }
+}
diff --git a/src/Utils/DynamicsCrm/Masa.Utils.DynamicsCrm.Core/_Imports.cs b/src/Utils/DynamicsCrm/Masa.Utils.DynamicsCrm.Core/_Imports.cs
@@ -1,3 +1,6 @@
 global using System.ComponentModel.DataAnnotations.Schema;
 global using Masa.BuildingBlocks.Ddd.Domain.Entities;
 global using Masa.BuildingBlocks.Authentication.Identity;
+global using Masa.Utils.DynamicsCrm.Core.Configurations;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
diff --git a/...micsCrm/Masa.Utils.DynamicsCrm.EntityFrameworkCore/Filters/DynamicsCrmSaveChangeFilter.cs b/...micsCrm/Masa.Utils.DynamicsCrm.EntityFrameworkCore/Filters/DynamicsCrmSaveChangeFilter.cs
@@ -46,14 +46,20 @@ private static void AuditEntityHandler(EntityEntry entity, Guid systemUserId, Gu
 
     private Guid GetUserId()
     {
+        var defaultUserId = _crmConfiguration?.SystemUserId ?? Guid.Empty;
+
         if (_userContext == null)
-            return Guid.Empty;
+            return defaultUserId;
+
+        var tUserId = _userContext.GetUserId<TUserId>();
 
-        var userId = _userContext.GetUserId<TUserId>();
+        if (tUserId is not Guid)
+            return defaultUserId;
 
-        if (!(userId is Guid))
-            return Guid.Empty;
+        var userId = tUserId as Guid?;
+        if (userId == null || userId == Guid.Empty)
+            return defaultUserId;
 
-        return userId as Guid? ?? _crmConfiguration?.SystemUserId ?? Guid.Empty;
+        return userId.Value;
     }
 }
diff --git a/...a.Utils.DynamicsCrm.EntityFrameworkCore/Filters/DynamicsCrmSoftDeleteSaveChangesFilter.cs b/...a.Utils.DynamicsCrm.EntityFrameworkCore/Filters/DynamicsCrmSoftDeleteSaveChangesFilter.cs
@@ -63,7 +63,7 @@ private void HandleNavigationEntry(IEnumerable<NavigationEntry> navigationEntrie
 
     private void HandleDependent(object dependentEntry)
     {
-        var userId = _userContext?.GetUserId<Guid>() ?? _crmConfiguration?.SystemUserId ?? Guid.Empty;
+        var userId = GetUserId();
 
         var entityEntry = _context.Entry(dependentEntry);
         entityEntry.State = EntityState.Modified;
@@ -79,15 +79,21 @@ private void HandleDependent(object dependentEntry)
 
     private Guid GetUserId()
     {
+        var defaultUserId = _crmConfiguration?.SystemUserId ?? Guid.Empty;
+
         if (_userContext == null)
-            return Guid.Empty;
+            return defaultUserId;
+
+        var tUserId = _userContext.GetUserId<TUserId>();
 
-        var userId = _userContext.GetUserId<TUserId>();
+        if (tUserId is not Guid)
+            return defaultUserId;
 
-        if (!(userId is Guid))
-            return Guid.Empty;
+        var userId = tUserId as Guid?;
+        if (userId == null || userId == Guid.Empty)
+            return defaultUserId;
 
-        return userId as Guid? ?? _crmConfiguration?.SystemUserId ?? Guid.Empty;
+        return userId.Value;
     }
 }