Merge branch 'main' of https://github.com/HicServices/HICPlugin into task/RDMP-337-chi-mod-10

Author: JFriel

.github/workflows/dotnet-core.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: HicServices/RDMP
-          ref: v9.1.0-rc1
+          ref: v9.2.0-rc1
           path: RDMP
       - uses: actions/setup-dotnet@v4
         with:

DrsPlugin/Extraction/ImageExtraction.cs

@@ -1,4 +1,5 @@
-using Rdmp.Core.Curation.Data;
+using Rdmp.Core.CommandExecution;
+using Rdmp.Core.Curation.Data;
 using Rdmp.Core.Curation.Data.DataLoad;
 using Rdmp.Core.DataExport.DataExtraction.Commands;
 using Rdmp.Core.DataFlowPipeline;
@@ -46,7 +47,7 @@ protected bool PreProcessingCheck(IDataLoadEventListener listener)
 
     }
 
-    public void PreInitialize(IExtractCommand request, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, IExtractCommand request, IDataLoadEventListener listener)
     {
         Request = request as IExtractDatasetCommand;
 

HICPlugin/BespokeAttachers/MetIDQAttacher.cs

@@ -44,7 +44,7 @@ public ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken token)
                 //Read it all in one go
                 MaxBatchSize = int.MaxValue
             };
-            fromCSV.PreInitialize(new FlatFileToLoad(file),job);
+            fromCSV.PreInitialize(null,new FlatFileToLoad(file),job);
 
             fromCSV.GetChunk(job, new GracefulCancellationToken());
 

HICPlugin/DataFlowComponents/CHIColumnFinder.cs

@@ -471,9 +471,13 @@ public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener
         }
     }
 
-    public void PreInitialize(IBasicActivateItems value, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, IExtractCommand value, IDataLoadEventListener listener)
     {
-        _activator = value;
+        _activator = activator;
     }
 
+    public void PreInitialize(IBasicActivateItems activator, IBasicActivateItems value, IDataLoadEventListener listener)
+    {
+        _activator = activator;
+    }
 }

HICPlugin/DataFlowComponents/ForceHICTableNamingConventionForProjects.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Data;
 using System.Text.RegularExpressions;
+using Rdmp.Core.CommandExecution;
 using Rdmp.Core.Curation.Data;
 using Rdmp.Core.DataFlowPipeline;
 using Rdmp.Core.DataFlowPipeline.Requirements;
@@ -30,19 +31,18 @@ public void Abort(IDataLoadEventListener listener)
 
     }
 
-    public void PreInitialize(TableInfo target,IDataLoadEventListener listener)
-    {
-        if (!NamingConvention.IsMatch(target.GetRuntimeName()))
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error,
-                $"TableInfo {target} does not match hic regex for naming conventions of project/group data ({NamingConvention})"));
-    }
-
-
     public void Check(ICheckNotifier notifier)
     {
 
     }
 
     [GeneratedRegex("tt_\\d*", RegexOptions.Compiled)]
     private static partial Regex TtPrefix();
+
+    public void PreInitialize(IBasicActivateItems activator, TableInfo value, IDataLoadEventListener listener)
+    {
+        if (!NamingConvention.IsMatch(value.GetRuntimeName()))
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
+                $"TableInfo {value} does not match hic regex for naming conventions of project/group data ({NamingConvention})"));
+    }
 }

HICPlugin/DataFlowComponents/HICCohortManagerDestination.cs

@@ -10,6 +10,7 @@
 using Rdmp.Core.DataLoad.Engine.Pipeline.Destinations;
 using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.ReusableLibraryCode.Progress;
+using Rdmp.Core.CommandExecution;
 
 namespace HICPlugin.DataFlowComponents;
 
@@ -87,7 +88,7 @@ public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureEx
             dest.AddExplicitWriteType(_privateIdentifier, "varchar(10)");
 
         dest.AllowResizingColumnsAtUploadTime = true;
-        dest.PreInitialize(cohortDatabase,listener);
+        dest.PreInitialize(null,cohortDatabase,listener);
         dest.ProcessPipelineData(AllAtOnceDataTable, listener, new GracefulCancellationToken());
         dest.Dispose(listener,null);
 
@@ -167,13 +168,6 @@ public void Abort(IDataLoadEventListener listener)
 
     }
 
-    public void PreInitialize(ICohortCreationRequest value, IDataLoadEventListener listener)
-    {
-        Request = value;
-        var syntaxHelper = value.NewCohortDefinition.LocationOfCohort.GetQuerySyntaxHelper();
-        _privateIdentifier = syntaxHelper.GetRuntimeName(Request.NewCohortDefinition.LocationOfCohort.PrivateIdentifierField);
-    }
-
     public void Check(ICheckNotifier notifier)
     {
 
@@ -211,4 +205,11 @@ public void Check(ICheckNotifier notifier)
 
 
     }
+
+    public void PreInitialize(IBasicActivateItems activator, ICohortCreationRequest value, IDataLoadEventListener listener)
+    {
+        Request = value;
+        var syntaxHelper = value.NewCohortDefinition.LocationOfCohort.GetQuerySyntaxHelper();
+        _privateIdentifier = syntaxHelper.GetRuntimeName(Request.NewCohortDefinition.LocationOfCohort.PrivateIdentifierField);
+    }
 }

HICPluginTests/ExtractionTests.cs

@@ -87,7 +87,7 @@ public void ExtractionTestWithZipArchive()
                 AppendIndexCountToFileName = false
             };
 
-            extractionComponent.PreInitialize(request, listener);
+            extractionComponent.PreInitialize(null,request, listener);
 
             var cts = new GracefulCancellationTokenSource();
             var dt = extractionComponent.ProcessPipelineData(dataset, listener, cts.Token);
@@ -165,7 +165,7 @@ public void ExtractionTestWithTarArchive()
                 AppendIndexCountToFileName = false
             };
 
-            extractionComponent.PreInitialize(request, listener);
+            extractionComponent.PreInitialize(null,request, listener);
 
             var cts = new GracefulCancellationTokenSource();
             var dt = extractionComponent.ProcessPipelineData(dataset, listener, cts.Token);
@@ -227,7 +227,7 @@ public void ExtractionTestWithNullImageFilename()
                 PathToImageArchive = rootDir.FullName
             };
 
-            extractionComponent.PreInitialize(request, listener);
+            extractionComponent.PreInitialize(null,request, listener);
 
             var cts = new GracefulCancellationTokenSource();
             Assert.DoesNotThrow(() => extractionComponent.ProcessPipelineData(dataset, listener, cts.Token));

HICPluginTests/HICPluginTests.csproj

@@ -59,4 +59,4 @@
       <LastGenOutput>TestReports.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
+</Project>

HICPluginTests/Integration/ChrisHallSpecialExplicitSourceTests.cs

@@ -19,7 +19,7 @@ public void TestUse()
             Collation = "Latin1_General_Bin"
         };
 
-        source.PreInitialize(_request,ThrowImmediatelyDataLoadEventListener.Quiet);
+        source.PreInitialize(null, _request,ThrowImmediatelyDataLoadEventListener.Quiet);
 
         var chunk = source.GetChunk(ThrowImmediatelyDataLoadEventListener.Quiet, new GracefulCancellationToken());
         Assert.That(chunk, Is.Not.Null);

HICPluginTests/Integration/HICCohortDestinationTest.cs

@@ -55,7 +55,7 @@ @description varchar(10)
             NewCohortsStoredProcedure = "fishfishfishproc1",
             ExistingCohortsStoredProcedure = "fishfishfishproc2"
         };
-        d.PreInitialize(request,ThrowImmediatelyDataLoadEventListener.Quiet);
+        d.PreInitialize(null,request,ThrowImmediatelyDataLoadEventListener.Quiet);
         d.CreateExternalCohort = true;
 
         var dt = new DataTable("mytbl");