feat:update event (#719)

* fix:优化

* 1

* feat:add Aggregate root object creation, modification, and deletion events

* feat:optimization topic default value

* feat:init event

* feat:test bulkevent

* feat:update BulkMarkEventAsInProgress

* fix:IntegrationEvents.Tests.Infrastructure.CustomIntegrationEventLogService

* fix:resolve conflicts

* feat:remove test api

* fix:DefaultUserContext

* fix:optimization

* fix:取消集成事件默认Topic,可能引起命名冲突优化

* fix:remove backup.csproj

* fix:TestEntityCreatedEventAsync

src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain.Tests/EventTest.cs

@@ -1,4 +1,4 @@
-// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 namespace Masa.BuildingBlocks.Ddd.Domain.Tests;

src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Events/EntityChangedEvent.cs

@@ -0,0 +1,15 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.Ddd.Domain.Events
+{
+    public abstract record class EntityChangedEvent<TEntity> : DomainCommand
+    {
+        public TEntity Entity { get; set; }
+
+        public EntityChangedEvent(TEntity entity)
+        {
+            Entity = entity;
+        }
+    }
+}

src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Events/EntityCreatedDomainEvent.cs

@@ -0,0 +1,12 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.Ddd.Domain.Events
+{
+    public record class EntityCreatedDomainEvent<TEntity> : EntityChangedEvent<TEntity>
+    {
+        public EntityCreatedDomainEvent(TEntity entity) : base(entity)
+        {
+        }
+    }
+}

src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Events/EntityDeletedDomainEvent.cs

@@ -0,0 +1,12 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.Ddd.Domain.Events
+{
+    public record class EntityDeletedDomainEvent<TEntity> : EntityChangedEvent<TEntity>
+    {
+        public EntityDeletedDomainEvent(TEntity entity) : base(entity)
+        {
+        }
+    }
+}

src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Events/EntityModifiedDomainEvent.cs

@@ -0,0 +1,12 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.Ddd.Domain.Events
+{
+    public record class EntityModifiedDomainEvent<TEntity> : EntityChangedEvent<TEntity>
+    {
+        public EntityModifiedDomainEvent(TEntity entity) : base(entity)
+        {
+        }
+    }
+}

src/BuildingBlocks/Dispatcher/Masa.BuildingBlocks.Dispatcher.IntegrationEvents/IntegrationEvent.cs

@@ -5,12 +5,12 @@ namespace Masa.BuildingBlocks.Dispatcher.IntegrationEvents;
 
 public abstract record IntegrationEvent : IIntegrationEvent
 {
-    [JsonInclude]public Guid EventId { private get; set; }
+    [JsonInclude] public Guid EventId { private get; set; }
 
     [JsonInclude]
     public DateTime EvenCreateTime { private get; set; }
 
-    [NotMapped] [JsonIgnore] public IUnitOfWork? UnitOfWork { get; set; }
+    [NotMapped][JsonIgnore] public IUnitOfWork? UnitOfWork { get; set; }
 
     public virtual string Topic { get; set; }
 

src/BuildingBlocks/Dispatcher/Masa.BuildingBlocks.Dispatcher.IntegrationEvents/Logs/IIntegrationEventLogService.cs

@@ -37,10 +37,16 @@ Task SaveEventAsync(
 
     Task MarkEventAsPublishedAsync(Guid eventId, CancellationToken cancellationToken = default);
 
+    Task<List<Guid>> BulkMarkEventAsPublishedAsync(IEnumerable<Guid> eventIds, CancellationToken cancellationToken = default);
+
     Task MarkEventAsInProgressAsync(Guid eventId, int minimumRetryInterval, CancellationToken cancellationToken = default);
 
+    Task<List<Guid>> BulkMarkEventAsInProgressAsync(IEnumerable<Guid> eventIds, int minimumRetryInterval, CancellationToken cancellationToken = default);
+
     Task MarkEventAsFailedAsync(Guid eventId, CancellationToken cancellationToken = default);
 
+    Task<List<Guid>> BulkMarkEventAsFailedAsync(IEnumerable<Guid> eventIds, CancellationToken cancellationToken = default);
+
     /// <summary>
     /// Delete successfully published and expired data
     /// </summary>

src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions.Tests/UserFriendlyExceptionTest.cs

@@ -1,6 +1,8 @@
-// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
+using Microsoft.Extensions.Logging;
+
 namespace Masa.BuildingBlocks.Exceptions.Tests;
 
 [TestClass]

src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/MasaException.cs

@@ -1,4 +1,4 @@
-// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 // ReSharper disable once CheckNamespace
@@ -91,16 +91,16 @@ public MasaException(string errorCode, LogLevel? logLevel, params object[] param
     {
     }
 
-    public MasaException(string message, Exception? innerException, string errorCode, LogLevel? logLevel = null, params object[] parameters)
-        : base(message, innerException)
+    public MasaException(Exception? innerException, string errorCode, LogLevel? logLevel = null, params object[] parameters)
+        : base(null, innerException)
     {
         _errorCode = errorCode;
         _parameters = parameters;
         _logLevel = logLevel;
     }
 
-    public MasaException(Exception? innerException, string errorCode, LogLevel? logLevel = null, params object[] parameters)
-        : base(null, innerException)
+    public MasaException(string message, Exception? innerException, string errorCode, LogLevel? logLevel = null, params object[] parameters)
+        : base(message, innerException)
     {
         _errorCode = errorCode;
         _parameters = parameters;

src/Contrib/Authentication/Identity/Masa.Contrib.Authentication.Identity.Core/DefaultUserContext.cs

@@ -1,6 +1,8 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
+using System.Collections;
+
 namespace Masa.Contrib.Authentication.Identity;
 
 internal class DefaultUserContext : UserContext
@@ -44,26 +46,55 @@ public DefaultUserContext(
             if (claimType == null)
                 continue;
 
-            string? claimValue = null;
-            if (property.PropertyType != typeof(string) && typeof(System.Collections.IEnumerable).IsAssignableFrom(property.PropertyType))
-            {
-                var claimsValues = ClaimsPrincipal?.Claims.Where(claim => claim.Type == claimType)
-                    .Select(claim => claim.Value);
-                if (claimsValues?.Any() == true)
-                    claimValue = JsonSerializer.Serialize(claimsValues);
-            }
-            else
-            {
-                claimValue = ClaimsPrincipal?.FindClaimValue(claimType);
-            }
-
+            string? claimValue = ClaimsPrincipal?.FindClaimValue(claimType);
             if (claimValue != null)
             {
+                object? claimTypeValue = null;
+
+                try
+                {
+                    claimTypeValue = TypeConvertProvider.ConvertTo(claimValue, property.PropertyType);
+                }
+                catch
+                {
+                    claimTypeValue = this.ParseNonJson(property);
+                }
+
                 modelRelation.Setters[property]
-                    .Invoke(userModel, new[] { TypeConvertProvider.ConvertTo(claimValue, property.PropertyType) });
+                        .Invoke(userModel, new[] { claimTypeValue });
             }
         }
 
         return userModel;
     }
+
+    private object? ParseNonJson(PropertyInfo property)
+    {
+        var claimValues = new List<string>();
+        var claimType = _optionsMonitor.CurrentValue.GetClaimType(property.Name);
+        if (claimType == null)
+            return null;
+
+        if (property.PropertyType != typeof(string) && typeof(IEnumerable).IsAssignableFrom(property.PropertyType))
+        {
+            var claimsValues = ClaimsPrincipal?.Claims.Where(claim => claim.Type == claimType)
+                .Select(claim => claim.Value).ToList();
+
+            claimsValues?.ForEach(item =>
+            {
+                try
+                {
+                    var claimsValue = JsonSerializer.Deserialize<List<string>>(item);
+                    if (claimsValue?.Any() == true)
+                        claimValues.AddRange(claimsValue);
+                }
+                catch
+                {
+                    claimValues.Add(item);
+                }
+            });
+        }
+
+        return TypeConvertProvider.ConvertTo(JsonSerializer.Serialize(claimValues), property.PropertyType);
+    }
 }

src/Contrib/Authentication/Identity/Tests/Masa.Contrib.Authentication.Identity.BlazorServer.Tests/IdentityTest.cs

@@ -1,6 +1,8 @@
-// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
+using Newtonsoft.Json;
+
 namespace Masa.Contrib.Authentication.Identity.BlazorServer.Tests;
 
 [TestClass]
@@ -62,6 +64,93 @@ public void TestMasaIdentity2()
         Assert.AreEqual(1, userRoles[0]);
     }
 
+    [TestMethod]
+    public void TestMasaIdentity3()
+    {
+        var services = new ServiceCollection();
+        var claimsPrincipal = new ClaimsPrincipal(new List<ClaimsIdentity>()
+        {
+            new(new List<Claim>()
+            {
+                new("sub", "1"),
+                new(ClaimType.DEFAULT_USER_NAME, "Jim"),
+                new(ClaimType.DEFAULT_USER_ROLE, "1")//"[\"1\"]"
+            })
+        });
+        Mock<AuthenticationStateProvider> authenticationStateProvider = new();
+        authenticationStateProvider
+            .Setup(provider => provider.GetAuthenticationStateAsync())
+            .ReturnsAsync(new AuthenticationState(claimsPrincipal));
+
+        services.AddScoped(_ => authenticationStateProvider.Object);
+        services.AddMasaIdentity(option =>
+        {
+            option.UserId = "sub";
+        });
+
+        Assert.IsTrue(services.Any<ICurrentPrincipalAccessor, BlazorCurrentPrincipalAccessor>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IUserSetter>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IUserContext>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IMultiTenantUserContext>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IMultiEnvironmentUserContext>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IIsolatedUserContext>(ServiceLifetime.Scoped));
+
+        var serviceProvider = services.BuildServiceProvider();
+        var userContext = serviceProvider.GetService<IUserContext>();
+        Assert.IsNotNull(userContext);
+        Assert.AreEqual("1", userContext.UserId);
+        Assert.AreEqual("Jim", userContext.UserName);
+
+        var userRoles = userContext.GetUserRoles<int>().ToList();
+        Assert.AreEqual(1, userRoles.Count);
+        Assert.AreEqual(1, userRoles[0]);
+    }
+
+    [TestMethod]
+    public void TestMasaIdentity4()
+    {
+        var roles = new List<string>()
+        {
+            "admin", "admin2", "admin3","admin4"
+        };
+        var services = new ServiceCollection();
+        var claimsPrincipal = new ClaimsPrincipal(new List<ClaimsIdentity>()
+        {
+            new(new List<Claim>()
+            {
+                new("sub", "1"),
+                new(ClaimType.DEFAULT_USER_NAME, "Jim"),
+                new(ClaimType.DEFAULT_USER_ROLE, JsonConvert.SerializeObject(roles))//"[\"1\"]"
+            })
+        });
+        Mock<AuthenticationStateProvider> authenticationStateProvider = new();
+        authenticationStateProvider
+            .Setup(provider => provider.GetAuthenticationStateAsync())
+            .ReturnsAsync(new AuthenticationState(claimsPrincipal));
+
+        services.AddScoped(_ => authenticationStateProvider.Object);
+        services.AddMasaIdentity(option =>
+        {
+            option.UserId = "sub";
+        });
+
+        Assert.IsTrue(services.Any<ICurrentPrincipalAccessor, BlazorCurrentPrincipalAccessor>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IUserSetter>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IUserContext>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IMultiTenantUserContext>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IMultiEnvironmentUserContext>(ServiceLifetime.Scoped));
+        Assert.IsTrue(services.Any<IIsolatedUserContext>(ServiceLifetime.Scoped));
+
+        var serviceProvider = services.BuildServiceProvider();
+        var userContext = serviceProvider.GetService<IUserContext>();
+        Assert.IsNotNull(userContext);
+        Assert.AreEqual("1", userContext.UserId);
+        Assert.AreEqual("Jim", userContext.UserName);
+
+        var userRoles = userContext.GetUserRoles<string>().ToList();
+        Assert.AreEqual(4, userRoles.Count);
+    }
+
     [TestMethod]
     public void TestIdentityByYaml()
     {