Bump HIC.RDMP.Plugin and MongoDB.Driver (#1944)

SMI · Sep 27, 2024 · 935dc13 · 935dc13
1 parent 454ad5e
commit 935dc13
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,15 +10,15 @@
     <PackageVersion Include="Equ" Version="2.3.0" />
     <PackageVersion Include="HIC.DicomTypeTranslation" Version="4.1.3" />
     <PackageVersion Include="HIC.FAnsiSql" Version="3.2.6" />
-    <PackageVersion Include="HIC.RDMP.Dicom" Version="7.0.8" />
-    <PackageVersion Include="HIC.RDMP.Plugin" Version="8.2.3" />
+    <PackageVersion Include="HIC.RDMP.Dicom" Version="7.1.0" />
+    <PackageVersion Include="HIC.RDMP.Plugin" Version="8.3.0" />
     <PackageVersion Include="IsIdentifiable" Version="0.4.0" />
     <PackageVersion Include="LibArchive.Net" Version="0.1.5" />
     <PackageVersion Include="LineReader" Version="0.1.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
     <PackageVersion Include="MongoDB.Bson" Version="2.29.0" />
-    <PackageVersion Include="MongoDB.Driver" Version="2.28.0" />
+    <PackageVersion Include="MongoDB.Driver" Version="2.29.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.3.4" />
     <PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />

diff --git a/...ices.IntegrationTests/Microservices/DicomRelationalMapper/MicroservicesIntegrationTest.cs b/...ices.IntegrationTests/Microservices/DicomRelationalMapper/MicroservicesIntegrationTest.cs
@@ -36,6 +36,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+using Rdmp.Core.CommandExecution;
 using Tests.Common;
 using DatabaseType = FAnsi.DatabaseType;
 
@@ -313,7 +314,7 @@ public void IntegrationTest_HappyPath_WithIsolation(DatabaseType databaseType, T
 
             new DicomFile(ds2).Save(Path.Combine(dir.FullName, "def.dcm"));
 
-            var checks = new ProcessTaskChecks(_helper.LoadMetadata);
+            var checks = new ProcessTaskChecks(_helper.LoadMetadata, new ThrowImmediatelyActivator(RepositoryLocator));
             checks.Check(new AcceptAllCheckNotifier());
 
             RunTest(dir, 1);

diff --git a/...roservices/CohortPackager/Execution/ExtractJobStorage/MongoDB/MongoExtractJobStoreTest.cs b/...roservices/CohortPackager/Execution/ExtractJobStorage/MongoDB/MongoExtractJobStoreTest.cs
@@ -142,15 +142,14 @@ private sealed class MockExtractCollection<TKey, TVal> : StubMongoCollection<TKe
                     return mockCursor.Object;
                 }
 
-                BsonDocument rendered = filter.Render(BsonSerializer.SerializerRegistry.GetSerializer<TVal>(), BsonSerializer.SerializerRegistry);
+                var rendered = filter.Render(new RenderArgs<TVal>(BsonSerializer.SerializerRegistry.GetSerializer<TVal>(), BsonSerializer.SerializerRegistry));
+                var key = GetKey(rendered["_id"]);
 
-                TKey key = GetKey(rendered["_id"]);
-
-                if (Documents.TryGetValue(key, out TVal? value))
+                if (Documents.TryGetValue(key, out var value))
                 {
 #pragma warning disable IDE0028 // Simplify collection initialization
                     mockCursor
-                        .Setup(x => x.Current)
+                        .Setup(static x => x.Current)
                         .Returns((IEnumerable<TProjection>)new List<TVal> { Documents[key] });
 #pragma warning restore IDE0028 // Simplify collection initialization
                     return mockCursor.Object;
@@ -201,7 +200,7 @@ public override ReplaceOneResult ReplaceOne(FilterDefinition<TVal> filter, TVal
                 if (RejectChanges)
                     return DeleteResult.Unacknowledged.Instance;
 
-                BsonDocument filterDoc = filter.Render(BsonSerializer.SerializerRegistry.GetSerializer<TVal>(), BsonSerializer.SerializerRegistry);
+                var filterDoc = filter.Render(new RenderArgs<TVal>(BsonSerializer.SerializerRegistry.GetSerializer<TVal>(), BsonSerializer.SerializerRegistry));
                 if (!filterDoc.Contains("_id") || filterDoc.Count() > 1)
                     throw new NotImplementedException("No support for deleting multiple docs");