Merge pull request #105 from wemogy/fix/mongodb-issues

Fix/mongodb issues
wemogy · Jul 19, 2023 · 23dffd0 · 23dffd0
2 parents 39dd089 + 50a5e1c
commit 23dffd0
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/...ogy.Infrastructure.Database.Core.UnitTests/Repositories/RepositoryTestBase.DeleteAsync.cs b/...ogy.Infrastructure.Database.Core.UnitTests/Repositories/RepositoryTestBase.DeleteAsync.cs
@@ -32,6 +32,26 @@ await MicrosoftUserRepository.DeleteAsync(
         userExistsAfterDeletion.Should().BeFalse();
     }
 
+    [Fact]
+    public async Task DeleteAsyncWithIdOnlyShouldWork()
+    {
+        // Arrange
+        var user = User.Faker.Generate();
+        await MicrosoftUserRepository.CreateAsync(user);
+
+        // Act
+        var userExistsBeforeDeletion = await MicrosoftUserRepository.ExistsAsync(
+            user.Id);
+        await MicrosoftUserRepository.DeleteAsync(
+            user.Id);
+        var userExistsAfterDeletion = await MicrosoftUserRepository.ExistsAsync(
+            user.Id);
+
+        // Assert
+        userExistsBeforeDeletion.Should().BeTrue();
+        userExistsAfterDeletion.Should().BeFalse();
+    }
+
     [Fact]
     public async Task DeleteAsyncShouldThrowForNonExistingEntities()
     {

diff --git a/src/core/Wemogy.Infrastructure.Database.Core/Repositories/DatabaseRepository`1.Delete.cs b/src/core/Wemogy.Infrastructure.Database.Core/Repositories/DatabaseRepository`1.Delete.cs
@@ -10,7 +10,7 @@ public partial class DatabaseRepository<TEntity>
 {
     public Task DeleteAsync(string id)
     {
-        return _database.DeleteAsync(x => id == x.Id.ToString());
+        return _database.DeleteAsync(x => id == x.Id);
     }
 
     public Task DeleteAsync(string id, string partitionKey)

diff --git a/src/core/Wemogy.Infrastructure.Database.Core/Repositories/DatabaseRepository`1.Get.cs b/src/core/Wemogy.Infrastructure.Database.Core/Repositories/DatabaseRepository`1.Get.cs
@@ -52,7 +52,7 @@ public async Task<TEntity> GetAsync(string id, CancellationToken cancellationTok
         try
         {
             return await GetAsync(
-                x => x.Id.ToString() == id,
+                x => x.Id == id,
                 cancellationToken);
         }
         catch (NotFoundErrorException)

diff --git a/src/mongo/Wemogy.Infrastructure.Database.Mongo/Factories/MongoDatabaseClientFactory.cs b/src/mongo/Wemogy.Infrastructure.Database.Mongo/Factories/MongoDatabaseClientFactory.cs
@@ -1,6 +1,8 @@
 using Microsoft.Extensions.Logging;
+using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Conventions;
 using MongoDB.Driver;
+using MongoDB.Driver.Core.Events;
 using Wemogy.Infrastructure.Database.Core.Abstractions;
 using Wemogy.Infrastructure.Database.Core.Models;
 using Wemogy.Infrastructure.Database.Mongo.Client;
@@ -24,7 +26,7 @@ public MongoDatabaseClientFactory(
             var pack = new ConventionPack { new CamelCaseElementNameConvention() };
             ConventionRegistry.Register(nameof(CamelCaseElementNameConvention), pack, x => true);
 
-            _mongoClient = new MongoClient(connectionString);
+            var settings = MongoClientSettings.FromConnectionString(connectionString);
 
             if (enableLogging)
             {
@@ -33,7 +35,20 @@ public MongoDatabaseClientFactory(
                     builder.AddConsole();
                 });
                 _logger = loggerFactory.CreateLogger(nameof(MongoDatabaseClientFactory));
+
+                settings.ClusterConfigurator = cb =>
+                {
+                    cb.Subscribe<CommandStartedEvent>(e =>
+                    {
+                        _logger.LogInformation(
+                            "{CommandName} - {Json}",
+                            e.CommandName,
+                            e.Command.ToJson());
+                    });
+                };
             }
+
+            _mongoClient = new MongoClient(settings);
         }
 
         public IDatabaseClient<TEntity> CreateClient<TEntity>(DatabaseRepositoryOptions databaseRepositoryOptions)