merge master into is-ident-package-use

SMI · Mar 9, 2022 · 4101890 · 4101890
2 parents 9b04e12 + 910da10
commit 4101890
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/news/1089-bugfix.md b/news/1089-bugfix.md
@@ -0,0 +1 @@
+Remove invalid extraction modality check. Fixes #1059
diff --git a/src/common/Smi.Common/Smi.Common.csproj b/src/common/Smi.Common/Smi.Common.csproj
@@ -26,8 +26,8 @@
     <PackageReference Include="coveralls.io" Version="1.4.2" />
     <PackageReference Include="HIC.DicomTypeTranslation" Version="3.0.0" />
     <PackageReference Include="HIC.FAnsiSql" Version="2.0.3" />
-    <PackageReference Include="IsIdentifiable" Version="0.0.3" />
-    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.7" />
+	<PackageReference Include="IsIdentifiable" Version="0.0.3" />
+    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.8" />
     <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NLog" Version="4.7.14" />
@@ -36,7 +36,7 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.IO.Abstractions" Version="16.1.16" />
+    <PackageReference Include="System.IO.Abstractions" Version="16.1.20" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
 </Project>
diff --git a/src/common/com.smi.microservices.parent/pom.xml b/src/common/com.smi.microservices.parent/pom.xml
@@ -199,7 +199,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>4.3.1</version>
+			<version>4.4.0</version>
 		</dependency>
 
 		<dependency>

diff --git a/...microservices/Microservices.CohortPackager/Execution/ExtractJobStorage/ExtractJobStore.cs b/...microservices/Microservices.CohortPackager/Execution/ExtractJobStorage/ExtractJobStore.cs
@@ -25,11 +25,6 @@ protected ExtractJobStore()
             [NotNull] IMessageHeader header)
         {
             Logger.Info($"Received new job info {message}");
-
-            // If KeyTag is StudyInstanceUID then ExtractionModality must be specified
-            if (message.KeyTag == "StudyInstanceUID" && string.IsNullOrWhiteSpace(message.ExtractionModality))
-                throw new ApplicationException($"ExtractionModality must be specified when the extraction key is StudyInstanceUID");
-
             PersistMessageToStoreImpl(message, header);
         }
 

diff --git a/tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj b/tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj
@@ -23,11 +23,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.10" />
-    <PackageReference Include="HIC.RDMP.Plugin.Test" Version="7.0.7" />
+    <PackageReference Include="HIC.RDMP.Plugin.Test" Version="7.0.8" />
     <PackageReference Include="Moq" Version="4.17.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
-    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="16.1.16" />
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="16.1.20" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\common\Smi.Common\Smi.Common.csproj" />