feat: Mongo Logger Factory, Conditional LinqProviderV2/V3, fixes, pac…

…kage updates (#317)
firebend · Apr 25, 2024 · b78051d · b78051d
1 parent 51602f0
commit b78051d
Show file tree

Hide file tree

Showing 20 changed files with 75 additions and 67 deletions.
diff --git a/Firebend.AutoCrud.Core/Firebend.AutoCrud.Core.csproj b/Firebend.AutoCrud.Core/Firebend.AutoCrud.Core.csproj
@@ -23,7 +23,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="AsyncKeyedLock" Version="6.3.4" />
+      <PackageReference Include="AsyncKeyedLock" Version="6.4.2" />
       <PackageReference Include="Firebend.JsonPatchGenerator" Version="8.0.3" />
       <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />

diff --git a/Firebend.AutoCrud.Core/Implementations/Entities/ClientRequestTransactionManager.cs b/Firebend.AutoCrud.Core/Implementations/Entities/ClientRequestTransactionManager.cs
@@ -26,7 +26,7 @@ private class QueuedTransaction
     private readonly IServiceProvider _serviceProvider;
 
     private readonly ConcurrentDictionary<string, Lazy<Task<IEntityTransaction>>> _sharedTransactions = new();
-    private readonly ConcurrentBag<QueuedTransaction> _transactions = new();
+    private readonly ConcurrentBag<QueuedTransaction> _transactions = [];
 
     public bool TransactionStarted { get; private set; }
     public ImmutableList<Guid> TransactionIds => GetTransactionsInOrder(true).Select(x => x.Id).ToImmutableList();

diff --git a/Firebend.AutoCrud.Core/Models/Entities/Result.cs b/Firebend.AutoCrud.Core/Models/Entities/Result.cs
@@ -23,7 +23,7 @@ public class Result<TModel> : Result
 
 public class ModelStateResult<TModel> : Result<TModel>
 {
-    private readonly List<ModelError> _errors = new List<ModelError>();
+    private readonly List<ModelError> _errors = [];
     public IReadOnlyList<ModelError> Errors => _errors;
 
     public ModelStateResult<TModel> AddError(string path, string error)

diff --git a/Firebend.AutoCrud.CustomFields.Mongo/Implementations/MongoCustomFieldsUpdateService.cs b/Firebend.AutoCrud.CustomFields.Mongo/Implementations/MongoCustomFieldsUpdateService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Firebend.AutoCrud.Core.Extensions;
@@ -72,7 +73,14 @@ public async Task<CustomFieldsEntity<TKey>> UpdateAsync(TKey rootEntityKey,
                                 & Builders<TEntity>.Filter.ElemMatch(x => x.CustomFields, cf => cf.Id == customField.Id);
 
         var mongoCollection = await GetCollectionAsync();
-        var updateDefinition = Builders<TEntity>.Update.Set(x => x.CustomFields.FirstMatchingElement(), customField);
+
+        var linqVersion = LinqProvider.GetValueOrDefault(MongoDB.Driver.Linq.LinqProvider.V3);
+
+        Expression<Func<TEntity, CustomFieldsEntity<TKey>>> filterExpression = linqVersion == MongoDB.Driver.Linq.LinqProvider.V2
+            ? x => x.CustomFields[-1]
+            : x => x.CustomFields.FirstMatchingElement();
+
+        var updateDefinition = Builders<TEntity>.Update.Set(filterExpression, customField);
 
         if (typeof(IModifiedEntity).IsAssignableFrom(typeof(TEntity)))
         {
@@ -178,7 +186,7 @@ public async Task<CustomFieldsEntity<TKey>> PatchAsync(TKey rootEntityKey,
                 new FindOneAndUpdateOptions<TEntity>
                 {
                     ReturnDocument = ReturnDocument.Before,
-                    ArrayFilters = new[] { arrayFilters },
+                    ArrayFilters = [arrayFilters],
                 },
                 cancellationToken);
         }
@@ -189,7 +197,7 @@ public async Task<CustomFieldsEntity<TKey>> PatchAsync(TKey rootEntityKey,
                 new FindOneAndUpdateOptions<TEntity>
                 {
                     ReturnDocument = ReturnDocument.Before,
-                    ArrayFilters = new[] { arrayFilters },
+                    ArrayFilters = [arrayFilters],
                 },
                 cancellationToken);
         }
@@ -221,7 +229,7 @@ public async Task<CustomFieldsEntity<TKey>> PatchAsync(TKey rootEntityKey,
         return entity.CustomFields?.FirstOrDefault(x => x.Id == key);
     }
 
-    private static string FixMongoPatchPath(Operation<CustomFieldsEntity<TKey>> operation)
+    private static string FixMongoPatchPath(OperationBase operation)
         => operation.path[1..].FirstCharToLower();
 
     private Task PublishUpdatedDomainEventAsync(TEntity previous,
@@ -242,6 +250,5 @@ private Task PublishUpdatedDomainEventAsync(TEntity previous,
         };
 
         return _domainEventPublisher.PublishEntityUpdatedEventAsync(domainEvent, entityTransaction, cancellationToken);
-
     }
 }
diff --git a/...DomainEvents.MassTransit/Extensions/AutoCrudMassTransitConfigureReceiveEndpointContext.cs b/...DomainEvents.MassTransit/Extensions/AutoCrudMassTransitConfigureReceiveEndpointContext.cs
@@ -0,0 +1,11 @@
+using System;
+using MassTransit;
+
+namespace Firebend.AutoCrud.DomainEvents.MassTransit.Extensions;
+
+public record AutoCrudMassTransitConfigureReceiveEndpointContext(
+    IReceiveEndpointConfigurator EndpointConfigurator,
+    string QueueName,
+    Type ConsumerType,
+    Type MessageType
+);
diff --git a/Firebend.AutoCrud.DomainEvents.MassTransit/Extensions/AutoCrudMassTransitConsumerInfo.cs b/Firebend.AutoCrud.DomainEvents.MassTransit/Extensions/AutoCrudMassTransitConsumerInfo.cs
@@ -7,17 +7,17 @@
 
 namespace Firebend.AutoCrud.DomainEvents.MassTransit.Extensions;
 
-public class AutoCrudMassTransitConsumerInfo
+public record AutoCrudMassTransitConsumerInfo
 {
-    public Type EntityType { get; set; }
+    public Type EntityType { get; }
 
-    public Type DomainEventType { get; set; }
+    public Type DomainEventType { get; }
 
-    public Type ConsumerType { get; set; }
+    public Type ConsumerType { get; }
 
-    public string EntityActionDescription { get; set; }
+    public string EntityActionDescription { get; }
 
-    public ServiceDescriptor ServiceDescriptor { get; set; }
+    public ServiceDescriptor ServiceDescriptor { get; }
 
     public Type MessageType => ServiceDescriptor?.ServiceType.GenericTypeArguments.FirstOrDefault() ?? ServiceDescriptor?.ServiceType;
 

diff --git a/Firebend.AutoCrud.DomainEvents.MassTransit/Extensions/MassTransitExtensions.cs b/Firebend.AutoCrud.DomainEvents.MassTransit/Extensions/MassTransitExtensions.cs
@@ -12,11 +12,11 @@ namespace Firebend.AutoCrud.DomainEvents.MassTransit.Extensions;
 
 public static class MassTransitExtensions
 {
-    private const string QueuePrefix = "FB_AC_DV_";
+    private const string QueuePrefix = "FB_AC_DE_";
 
     private static List<AutoCrudMassTransitConsumerInfo> _listeners;
 
-    private static List<AutoCrudMassTransitConsumerInfo> GetListeners(IServiceCollection serviceCollection)
+    public static List<AutoCrudMassTransitConsumerInfo> GetListeners(IServiceCollection serviceCollection)
     {
         if (_listeners != null && _listeners.Count != 0)
         {
@@ -48,7 +48,7 @@ public static void RegisterFirebendAutoCrudDomainEventHandlerEndPoints(
         IBusFactoryConfigurator bus,
         AutoCrudMassTransitQueueMode queueMode,
         string receiveEndpointPrefix = null,
-        Action<IReceiveEndpointConfigurator> configureReceiveEndpoint = null)
+        Action<AutoCrudMassTransitConfigureReceiveEndpointContext> configureReceiveEndpoint = null)
     {
         var queues = GetQueues(queueMode, receiveEndpointPrefix, _listeners);
 
@@ -59,12 +59,28 @@ public static void RegisterFirebendAutoCrudDomainEventHandlerEndPoints(
                 foreach (var consumerInfo in consumerInfos)
                 {
                     busRegistrationContext.ConfigureConsumer(consumerInfo.ConsumerType, re);
+
+                    if (configureReceiveEndpoint is null)
+                    {
+                        continue;
+                    }
+
+                    var ctx = new AutoCrudMassTransitConfigureReceiveEndpointContext(re,
+                        queueName,
+                        consumerInfo.ConsumerType,
+                        consumerInfo.MessageType);
+
+                    configureReceiveEndpoint.Invoke(ctx);
                 }
-                configureReceiveEndpoint?.Invoke(re);
             });
         }
 
-        _listeners.Clear();
+        ClearListeners();
+    }
+
+    public static void ClearListeners()
+    {
+        _listeners?.Clear();
         _listeners = null;
     }
 

diff --git a/Firebend.AutoCrud.IntegrationTests/BaseTest.cs b/Firebend.AutoCrud.IntegrationTests/BaseTest.cs
@@ -37,7 +37,7 @@ public abstract class BaseTest<
 {
     protected abstract string Url { get; }
 
-    protected List<IFlurlResponse> Responses { get; } = new();
+    protected List<IFlurlResponse> Responses { get; } = [];
 
     private TKey CreatedKey { get; set; }
 

diff --git a/Firebend.AutoCrud.IntegrationTests/Firebend.AutoCrud.IntegrationTests.csproj b/Firebend.AutoCrud.IntegrationTests/Firebend.AutoCrud.IntegrationTests.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="Bogus" Version="35.5.0" />
-        <PackageReference Include="CsvHelper" Version="31.0.3" />
+        <PackageReference Include="CsvHelper" Version="31.0.4" />
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Flurl.Http" Version="4.0.2" />
         <PackageReference Include="Flurl.Http.Newtonsoft" Version="0.9.1" />

diff --git a/Firebend.AutoCrud.IntegrationTests/TransactionTests.cs b/Firebend.AutoCrud.IntegrationTests/TransactionTests.cs
@@ -24,7 +24,7 @@ public class TransactionTests
     public async Task SeedData()
     {
         _efPerson = await CreatePersonAsync(EfPersonUrl);
-        _efPerson.CustomFields = new List<CustomFieldsEntity<Guid>>();
+        _efPerson.CustomFields = [];
         _mongoPerson = await CreatePersonAsync(MongoPersonUrl);
         _requestModel = new SessionTransactionRequestModel { EfPersonId = _efPerson.Id, MongoPersonId = _mongoPerson.Id };
     }

diff --git a/Firebend.AutoCrud.Io/Firebend.AutoCrud.Io.csproj b/Firebend.AutoCrud.Io/Firebend.AutoCrud.Io.csproj
@@ -24,7 +24,7 @@
 
     <ItemGroup>
       <PackageReference Include="ClosedXML" Version="0.102.2" />
-      <PackageReference Include="CsvHelper" Version="31.0.3" />
+      <PackageReference Include="CsvHelper" Version="31.0.4" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Firebend.AutoCrud.Mongo/Client/Crud/MongoUpdateClient.cs b/Firebend.AutoCrud.Mongo/Client/Crud/MongoUpdateClient.cs
@@ -81,7 +81,7 @@ public virtual async Task<List<TEntity>> UpsertManyAsync(List<EntityUpdate<TEnti
             return updatedEntities;
         }
 
-        return new List<TEntity>();
+        return [];
     }
 
     public virtual Task<List<TOut>> UpsertManyAsync<TOut>(List<EntityUpdate<TEntity>> entities,
@@ -111,7 +111,7 @@ public virtual async Task<List<TOut>> UpsertManyAsync<TOut>(List<EntityUpdate<TE
             return updatedEntities;
         }
 
-        return new List<TOut>();
+        return [];
     }
 
     public virtual Task<TEntity> UpdateAsync(TKey id,

diff --git a/Firebend.AutoCrud.Mongo/Client/MongoClientBase.cs b/Firebend.AutoCrud.Mongo/Client/MongoClientBase.cs
@@ -5,6 +5,7 @@
 using Firebend.AutoCrud.Mongo.Interfaces;
 using Microsoft.Extensions.Logging;
 using MongoDB.Driver;
+using MongoDB.Driver.Linq;
 
 namespace Firebend.AutoCrud.Mongo.Client;
 
@@ -15,6 +16,8 @@ public abstract class MongoClientBase<TKey, TEntity> : BaseDisposable
     private readonly IMongoClientFactory<TKey, TEntity> _mongoClientFactory;
     private IMongoClient _mongoClient;
 
+    public LinqProvider? LinqProvider => _mongoClient?.Settings?.LinqProvider;
+
     protected MongoClientBase(IMongoClientFactory<TKey, TEntity> clientFactory,
         ILogger logger,
         IMongoRetryService mongoRetryService)

diff --git a/Firebend.AutoCrud.Mongo/Client/MongoClientBaseDefaults.cs b/Firebend.AutoCrud.Mongo/Client/MongoClientBaseDefaults.cs
@@ -5,6 +5,7 @@ public static class MongoClientBaseDefaults
 #pragma warning disable CA2211, IDE1006
     // ReSharper disable once FieldCanBeMadeReadOnly.Global
     // ReSharper disable once InconsistentNaming
+    // ReSharper disable once ConvertToConstant.Global
     public static int NumberOfRetries = 7;
 #pragma warning restore CA2211, IDE1006
 }
diff --git a/Firebend.AutoCrud.Mongo/Client/MongoClientFactory.cs b/Firebend.AutoCrud.Mongo/Client/MongoClientFactory.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Logging;
 using MongoDB.Driver;
 using MongoDB.Driver.Core.Configuration;
-using MongoDB.Driver.Core.Events;
 using MongoDB.Driver.Linq;
 
 namespace Firebend.AutoCrud.Mongo.Client;
@@ -13,25 +12,24 @@ public class MongoClientFactory<TKey, TEntity> : IMongoClientFactory<TKey, TEnti
     where TKey : struct
     where TEntity : class, IEntity<TKey>
 {
-    private record MongoClientCacheFactoryContext(ILogger Logger,
+    private record MongoClientCacheFactoryContext(ILoggerFactory LoggerFactory,
         MongoClientSettings Settings,
-        bool EnableLogging,
         IMongoClientSettingsConfigurator SettingsConfigurator);
 
-    private readonly ILogger _logger;
     private readonly IMongoConnectionStringProvider<TKey, TEntity> _connectionStringProvider;
     private readonly IMongoClientSettingsConfigurator _settingsConfigurator;
+    private readonly ILoggerFactory _loggerFactory;
 
-    public MongoClientFactory(ILogger<MongoClientFactory<TKey, TEntity>> logger,
-        IMongoConnectionStringProvider<TKey, TEntity> connectionStringProvider,
+    public MongoClientFactory(IMongoConnectionStringProvider<TKey, TEntity> connectionStringProvider,
+        ILoggerFactory loggerFactory,
         IMongoClientSettingsConfigurator settingsConfigurator = null)
     {
-        _logger = logger;
         _connectionStringProvider = connectionStringProvider;
+        _loggerFactory = loggerFactory;
         _settingsConfigurator = settingsConfigurator;
     }
 
-    public async Task<IMongoClient> CreateClientAsync(string overrideShardKey = null, bool enableLogging = false)
+    public async Task<IMongoClient> CreateClientAsync(string overrideShardKey = null)
     {
         var connectionString = await _connectionStringProvider.GetConnectionStringAsync(overrideShardKey);
 
@@ -40,7 +38,7 @@ public async Task<IMongoClient> CreateClientAsync(string overrideShardKey = null
         var client = MongoClientFactoryCache.MongoClients.GetOrAdd(
             mongoClientSettings.Server.ToString(),
             CreateClientForCache,
-            new MongoClientCacheFactoryContext(_logger, mongoClientSettings, enableLogging, _settingsConfigurator)
+            new MongoClientCacheFactoryContext(_loggerFactory, mongoClientSettings, _settingsConfigurator)
         );
 
         return client;
@@ -50,24 +48,12 @@ private static IMongoClient CreateClientForCache(string server, MongoClientCache
     {
         context.Settings.LinqProvider = LinqProvider.V3;
 
-        if (context.EnableLogging)
-        {
-            context.Settings.ClusterConfigurator = cb => Configurator(cb, context);
-        }
+        context.Settings.LoggingSettings ??= new LoggingSettings(context.LoggerFactory);
 
         var settings = context.SettingsConfigurator is null
             ? context.Settings
             : context.SettingsConfigurator.Configure(server, context.Settings);
 
         return new MongoClient(settings);
     }
-
-    private static void Configurator(ClusterBuilder cb, MongoClientCacheFactoryContext context)
-    {
-        cb.Subscribe<CommandStartedEvent>(e => MongoClientFactoryLogger.Started(context.Logger, e.CommandName, e.Command));
-
-        cb.Subscribe<CommandSucceededEvent>(e => MongoClientFactoryLogger.Success(context.Logger, e.CommandName, e.Duration, e.Reply));
-
-        cb.Subscribe<CommandFailedEvent>(e => MongoClientFactoryLogger.Failed(context.Logger, e.CommandName, e.Duration));
-    }
 }
diff --git a/Firebend.AutoCrud.Mongo/Client/MongoClientFactoryLogger.cs b/Firebend.AutoCrud.Mongo/Client/MongoClientFactoryLogger.cs
diff --git a/Firebend.AutoCrud.Mongo/Interfaces/IMongoClientFactory.cs b/Firebend.AutoCrud.Mongo/Interfaces/IMongoClientFactory.cs
@@ -8,5 +8,5 @@ public interface IMongoClientFactory<TKey, TEntity>
     where TKey : struct
     where TEntity : class, IEntity<TKey>
 {
-    Task<IMongoClient> CreateClientAsync(string overrideShardKey = null, bool enableLogging = false);
+    Task<IMongoClient> CreateClientAsync(string overrideShardKey = null);
 }
diff --git a/Firebend.AutoCrud.Tests/Core/Services/ClientRequestTransactionManagerTests.cs b/Firebend.AutoCrud.Tests/Core/Services/ClientRequestTransactionManagerTests.cs
@@ -27,7 +27,7 @@ public class ClientRequestTransactionManagerTests
     public void TestSetup()
     {
         _fixture = new Fixture().Customize(new AutoMoqCustomization());
-        _transactions = new List<Mock<TestTransaction>>();
+        _transactions = [];
 
         _efTransactionFactory = _fixture.Create<Mock<IEntityTransactionFactory<Guid, TestClassEf>>>();
         _mongoTransactionFactory = _fixture.Create<Mock<IEntityTransactionFactory<Guid, TestClassMongo>>>();

diff --git a/Firebend.AutoCrud.Web.Sample/appsettings.Development.json b/Firebend.AutoCrud.Web.Sample/appsettings.Development.json
@@ -3,6 +3,7 @@
     "LogLevel": {
       "Default": "Warning",
       "MongoDB": "Warning",
+      "MongoDb.Command": "Warning",
       "Microsoft": "Warning",
       "Microsoft.AspNetCore.Hosting.Diagnostics": "Warning",
       "Microsoft.Hosting.Lifetime": "Warning",

diff --git a/Firebend.AutoCrud.Web/Implementations/Patching/CopyOnPatchPropertyAccessor.cs b/Firebend.AutoCrud.Web/Implementations/Patching/CopyOnPatchPropertyAccessor.cs
@@ -11,7 +11,7 @@ public class CopyOnPatchPropertyAccessor<TEntity, TVersion, TViewModel> : ICopyO
 
     public CopyOnPatchPropertyAccessor(List<string> copyOnPatchPropertyNames)
     {
-        copyOnPatchPropertyNames ??= new List<string>();
+        copyOnPatchPropertyNames ??= [];
         copyOnPatchPropertyNames.Add(nameof(ICustomFieldsEntity<Guid>.CustomFields));
         _copyOnPatchPropertyNames = copyOnPatchPropertyNames;
     }