From f7d410846a87b24a8e0763b324c33ece917848b0 Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Sat, 2 Nov 2024 07:30:29 +0100 Subject: [PATCH 1/4] Updated MongoDB Driver to 3.0.0 --- src/Mongo/Mongo.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mongo/Mongo.csproj b/src/Mongo/Mongo.csproj index 8756035..695cb3a 100644 --- a/src/Mongo/Mongo.csproj +++ b/src/Mongo/Mongo.csproj @@ -6,7 +6,7 @@ - + From f80309481f294b699ee25e4e6b2cc634b5d0f406 Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Sun, 3 Nov 2024 12:47:27 +0100 Subject: [PATCH 2/4] Updated Packages --- src/AzureStorage/AzureStorage.csproj | 4 ++-- src/Core/Core.csproj | 2 +- src/Mongo/MongoResource.cs | 2 +- src/Nats.Tests/Nats.Tests.csproj | 2 +- src/PostgreSql/PostgreSql.csproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AzureStorage/AzureStorage.csproj b/src/AzureStorage/AzureStorage.csproj index b5766f5..bb50238 100644 --- a/src/AzureStorage/AzureStorage.csproj +++ b/src/AzureStorage/AzureStorage.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index afd27f7..fdfb62e 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/Mongo/MongoResource.cs b/src/Mongo/MongoResource.cs index 227cf67..d0150dd 100644 --- a/src/Mongo/MongoResource.cs +++ b/src/Mongo/MongoResource.cs @@ -43,7 +43,7 @@ private MongoClient GetClient() { return new MongoClient(new MongoClientSettings { - ConnectionMode = ConnectionMode.Direct, + DirectConnection = true, ReadConcern = ReadConcern.Majority, WriteConcern = WriteConcern.Acknowledged, Server = new MongoServerAddress(Manager.Instance.Address, Manager.Instance.HostPort), diff --git a/src/Nats.Tests/Nats.Tests.csproj b/src/Nats.Tests/Nats.Tests.csproj index 0c64e29..e50be3b 100644 --- a/src/Nats.Tests/Nats.Tests.csproj +++ b/src/Nats.Tests/Nats.Tests.csproj @@ -12,7 +12,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/PostgreSql/PostgreSql.csproj b/src/PostgreSql/PostgreSql.csproj index 3c1cbb1..970958e 100644 --- a/src/PostgreSql/PostgreSql.csproj +++ b/src/PostgreSql/PostgreSql.csproj @@ -4,7 +4,7 @@ Squadron.PostgreSql - + From 228c64f2eb679116a73ea375258efdf0b5685777 Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Sun, 3 Nov 2024 12:55:16 +0100 Subject: [PATCH 3/4] Fixed MongoDB Samples --- samples/MongoDb/UserRepository.cs | 1 + samples/MongoDb/UserRepositoryTests.cs | 5 +++-- samples/MongoDb/UserRepositoryWithTransaction.cs | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/MongoDb/UserRepository.cs b/samples/MongoDb/UserRepository.cs index c253e40..b40dc7d 100644 --- a/samples/MongoDb/UserRepository.cs +++ b/samples/MongoDb/UserRepository.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; +using MongoDB.Driver.Linq; using Squadron.Samples.Shared; namespace Squadron.Samples.Mongo diff --git a/samples/MongoDb/UserRepositoryTests.cs b/samples/MongoDb/UserRepositoryTests.cs index 235394d..c522a78 100644 --- a/samples/MongoDb/UserRepositoryTests.cs +++ b/samples/MongoDb/UserRepositoryTests.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.IO; +using System.Linq; using System.Threading.Tasks; using FluentAssertions; using MongoDB.Driver; @@ -10,7 +11,7 @@ namespace Squadron.Samples.Mongo { - public class UserRepositoryTests : IClassFixture + public class UserRepositoryTests : IClassFixture { private readonly MongoResource _mongoResource; @@ -49,7 +50,7 @@ public async Task GetAll_MatchSnapshot() File = new FileInfo("users.json") }; - IMongoCollection col = await _mongoResource + IMongoCollection col = await _mongoResource .CreateCollectionFromFileAsync(db, options); var repo = new UserRepository(db); diff --git a/samples/MongoDb/UserRepositoryWithTransaction.cs b/samples/MongoDb/UserRepositoryWithTransaction.cs index cd4be11..98aa421 100644 --- a/samples/MongoDb/UserRepositoryWithTransaction.cs +++ b/samples/MongoDb/UserRepositoryWithTransaction.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; +using MongoDB.Driver.Linq; using Squadron.Samples.Shared; namespace Squadron.Samples.Mongo @@ -31,8 +32,5 @@ public async Task> GetAllAsync() IMongoCollection col = _mongoDatabase.GetCollection("users"); return await col.AsQueryable().ToListAsync(); } - - - } } From f7a5bf98119b99a4cc857dbf3f47d630faee6038 Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Sun, 3 Nov 2024 13:07:22 +0100 Subject: [PATCH 4/4] cleanup --- .../MongoReplicaSetResourceTests.cs | 15 ++++++------- src/Mongo/MongoReplicaSetResource.cs | 21 ++++++++++--------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/Mongo.Tests/MongoReplicaSetResourceTests.cs b/src/Mongo.Tests/MongoReplicaSetResourceTests.cs index ea0c167..a16349c 100644 --- a/src/Mongo.Tests/MongoReplicaSetResourceTests.cs +++ b/src/Mongo.Tests/MongoReplicaSetResourceTests.cs @@ -9,8 +9,7 @@ namespace Squadron { - public class MongoReplicaSetResourceTests - : IClassFixture + public class MongoReplicaSetResourceTests : IClassFixture { private readonly MongoReplicaSetResource _mongoRsResource; @@ -25,13 +24,11 @@ public void CommitTransaction_NoError() //Act Action action = () => { - using (IClientSessionHandle session = _mongoRsResource.Client.StartSession()) - { - IMongoCollection collection = _mongoRsResource.CreateCollection("bar"); - session.StartTransaction(); - collection.InsertOne(session, new BsonDocument("name", "test")); - session.CommitTransaction(); - } + using IClientSessionHandle session = _mongoRsResource.Client.StartSession(); + IMongoCollection collection = _mongoRsResource.CreateCollection("bar"); + session.StartTransaction(); + collection.InsertOne(session, new BsonDocument("name", "test")); + session.CommitTransaction(); }; //Assert diff --git a/src/Mongo/MongoReplicaSetResource.cs b/src/Mongo/MongoReplicaSetResource.cs index 2281b01..4f559c5 100644 --- a/src/Mongo/MongoReplicaSetResource.cs +++ b/src/Mongo/MongoReplicaSetResource.cs @@ -1,33 +1,34 @@ -using System; +using System; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; namespace Squadron { - /// + /// public class MongoReplicaSetResource : MongoReplicaSetResource { } /// /// Represents a mongo database replica set resource that can be used by unit tests. /// /// - public class MongoReplicaSetResource : - MongoResource + public class MongoReplicaSetResource : MongoResource where TOptions : MongoReplicaSetDefaultOptions, new() { public override async Task InitializeAsync() { await base.InitializeAsync(); + var client = new MongoClient(ConnectionString + "/?connect=direct"); BsonDocument rsConfig = CreateReplicaSetConfiguration(); - var command = new BsonDocumentCommand(new BsonDocument - { - {"replSetInitiate", rsConfig} - }); + + var command = new BsonDocumentCommand( + new BsonDocument + { + {"replSetInitiate", rsConfig} + }); - await client.GetDatabase("admin") - .RunCommandAsync(command); + await client.GetDatabase("admin").RunCommandAsync(command); await Initializer.WaitAsync(new MongoReplicaSetStatus(ConnectionString)); }