Task/rdmp 357 cohort clone no association (#2310)

JFriel · web-flow · commit 5eee9b5cc892 · 2026-02-09T14:30:46.000Z
* copy associations when cloning cic

* add changelog

* update params

* Update CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [9.2.0] - Unreleased
 - Add Internal Note to Catalogue
+- Fix issue where project associations were not copied when a CIC was cloned
 - Fix issue with using Internal Catalogues in Cohort Identification Configurations
 
 ## [9.1.2] - Unreleased
diff --git a/Rdmp.Core.Tests/CohortCreation/CohortContainerAndCloningTests.cs b/Rdmp.Core.Tests/CohortCreation/CohortContainerAndCloningTests.cs
@@ -240,7 +240,7 @@ public void CohortIdentificationConfiguration_CloneEntirely()
 
         try
         {
-            var clone = cohortIdentificationConfiguration.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);
+            var clone = cohortIdentificationConfiguration.CreateClone(ThrowImmediatelyCheckNotifier.Quiet,DataExportRepository);
 
             Assert.Multiple(() =>
             {
diff --git a/Rdmp.Core.Tests/CohortCreation/CohortIdentificationConfigurationMergerTests.cs b/Rdmp.Core.Tests/CohortCreation/CohortIdentificationConfigurationMergerTests.cs
@@ -5,6 +5,7 @@
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
 using NUnit.Framework;
+using Rdmp.Core.CommandExecution;
 using Rdmp.Core.Curation.Data.Cohort;
 using System.Linq;
 
@@ -15,7 +16,7 @@ internal class CohortIdentificationConfigurationMergerTests : CohortIdentificati
     [Test]
     public void TestSimpleMerge()
     {
-        var merger = new CohortIdentificationConfigurationMerger(CatalogueRepository);
+        var merger = new CohortIdentificationConfigurationMerger(RepositoryLocator);
 
         var cic1 = new CohortIdentificationConfiguration(CatalogueRepository, "cic1");
         var cic2 = new CohortIdentificationConfiguration(CatalogueRepository, "cic2");
@@ -90,7 +91,7 @@ public void TestSimpleMerge()
     [Test]
     public void TestSimpleUnMerge()
     {
-        var merger = new CohortIdentificationConfigurationMerger(CatalogueRepository);
+        var merger = new CohortIdentificationConfigurationMerger(RepositoryLocator);
 
         var cicInput = new CohortIdentificationConfiguration(CatalogueRepository, "cic99");
 
@@ -153,7 +154,7 @@ public void TestSimpleUnMerge()
     [Test]
     public void TestSimpleImportCic()
     {
-        var merger = new CohortIdentificationConfigurationMerger(CatalogueRepository);
+        var merger = new CohortIdentificationConfigurationMerger(RepositoryLocator);
 
         var cic1 = new CohortIdentificationConfiguration(CatalogueRepository, "cic1");
         var cic2 = new CohortIdentificationConfiguration(CatalogueRepository, "cic2");
diff --git a/Rdmp.Core.Tests/CohortCreation/QueryTests/JoinableCohortConfigurationTests.cs b/Rdmp.Core.Tests/CohortCreation/QueryTests/JoinableCohortConfigurationTests.cs
@@ -402,7 +402,7 @@ public void QueryBuilderTest_JoinableCloning()
 
         try
         {
-            var clone = cohortIdentificationConfiguration.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);
+            var clone = cohortIdentificationConfiguration.CreateClone(ThrowImmediatelyCheckNotifier.Quiet, DataExportRepository);
 
             var cloneBuilder = new CohortQueryBuilder(clone, null);
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateCohortIdentificationConfigurationTemplate.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateCohortIdentificationConfigurationTemplate.cs
@@ -32,7 +32,7 @@ public override void Execute()
             var associations = _activator.RepositoryLocator.DataExportRepository.GetAllObjects<ProjectCohortIdentificationConfigurationAssociation>();
             var projectAssociations = associations.Where(a => a.CohortIdentificationConfiguration_ID == _cic.ID).ToList();
             base.Execute();
-            var clone = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);
+            var clone = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet, _activator.RepositoryLocator.DataExportRepository);
             clone.IsTemplate = true;
             clone.Freeze();
             clone.Name = GenerateTemplateName(clone.Name);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandUseTemplateCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandUseTemplateCohortIdentificationConfiguration.cs
@@ -70,7 +70,7 @@ public override void Execute()
                 }
             }
             base.Execute();
-            var clone = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);
+            var clone = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet, _activator.RepositoryLocator.DataExportRepository);
             clone.IsTemplate = false;
             clone.Name = RenameTemplateForUse(clone.Name);
             clone.SaveToDatabase();
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneCohortIdentificationConfiguration.cs
@@ -98,7 +98,7 @@ public override void Execute()
         if (!_autoConfirm && BasicActivator.IsInteractive && !YesNo(
                 "This will create a 100% copy of the entire CohortIdentificationConfiguration including all datasets, filters, parameters and set operations. Are you sure this is what you want?",
                 "Confirm Cloning")) return;
-        CloneCreatedIfAny = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);
+        CloneCreatedIfAny = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet, BasicActivator.RepositoryLocator.DataExportRepository);
         if (CloneCreatedIfAny != null && _version is not null)
         {
             CloneCreatedIfAny.Version = _version;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCohortIdentificationConfiguration.cs
@@ -69,8 +69,7 @@ public override void Execute()
 
 
         var merger =
-            new CohortIdentificationConfigurationMerger(
-                (CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
+            new CohortIdentificationConfigurationMerger(BasicActivator.RepositoryLocator);
         merger.Import(import, IntoContainer);
 
         Publish(IntoContainer);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMergeCohortIdentificationConfigurations.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMergeCohortIdentificationConfigurations.cs
@@ -37,8 +37,7 @@ public override void Execute()
         }
 
         var merger =
-            new CohortIdentificationConfigurationMerger(
-                (CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
+            new CohortIdentificationConfigurationMerger(BasicActivator.RepositoryLocator);
         var result = merger.Merge(toMerge, SetOperation.UNION);
 
         if (result == null) return;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRevertToHistoricalCohortVersion.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRevertToHistoricalCohortVersion.cs
@@ -41,7 +41,7 @@ public override void Execute()
         }
 
         base.Execute();
-        var clone = _historicalConfiguration.CloneIntoExistingConfiguration(ThrowImmediatelyCheckNotifier.Quiet, _configuration,false);
+        var clone = _historicalConfiguration.CloneIntoExistingConfiguration(ThrowImmediatelyCheckNotifier.Quiet, _configuration,_activator.RepositoryLocator.DataExportRepository, false);
         Publish(clone);
         Emphasise(clone);
     }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnMergeCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnMergeCohortIdentificationConfiguration.cs
@@ -62,8 +62,7 @@ public override void Execute()
                 "Confirm UnMerge")) return;
 
         var merger =
-            new CohortIdentificationConfigurationMerger(
-                (CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
+            new CohortIdentificationConfigurationMerger(BasicActivator.RepositoryLocator);
         var results = merger.UnMerge(_target);
 
         if (results?.Any() == true)
diff --git a/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfiguration.cs b/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfiguration.cs
@@ -4,16 +4,13 @@
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Linq;
 using Rdmp.Core.Curation.Data.Aggregation;
 using Rdmp.Core.Curation.Data.Cohort.Joinables;
 using Rdmp.Core.Curation.Data.Defaults;
 using Rdmp.Core.Curation.FilterImporting;
 using Rdmp.Core.Curation.FilterImporting.Construction;
 using Rdmp.Core.Databases;
+using Rdmp.Core.DataExport.Data;
 using Rdmp.Core.MapsDirectlyToDatabaseTable;
 using Rdmp.Core.MapsDirectlyToDatabaseTable.Attributes;
 using Rdmp.Core.QueryBuilding;
@@ -22,6 +19,10 @@
 using Rdmp.Core.ReusableLibraryCode.Annotations;
 using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.Ticketing;
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Linq;
 
 namespace Rdmp.Core.Curation.Data.Cohort;
 
@@ -362,21 +363,23 @@ public void EnsureNamingConvention(AggregateConfiguration aggregate)
     /// <para>This is done in a transaction so that if it fails halfway through you won't end up with half a clone configuration</para>
     /// </summary>
     /// <param name="notifier">Event listener for reporting cloning progress and any problems</param>
+    /// <param name="dataExportRepository">Existing data export repository for use to connect to linked projects</param>
     /// <returns></returns>
-    public CohortIdentificationConfiguration CreateClone(ICheckNotifier notifier)
+    public CohortIdentificationConfiguration CreateClone(ICheckNotifier notifier, IDataExportRepository dataExportRepository)
     {
         var clone = new CohortIdentificationConfiguration((ICatalogueRepository)Repository, $"{Name} (Clone)");
-        return CloneIntoExistingConfiguration(notifier, clone);
+        return CloneIntoExistingConfiguration(notifier, clone, dataExportRepository);
     }
 
     /// <summary>
     /// Clones the CohortIdentificationConfiguration into an existing CohortIdentificationConfiguration
     /// </summary>
     /// <param name="notifier"></param>
     /// <param name="cloneTarget"></param>
+    /// <param name="dataExportRepository"></param>
     /// <param name="IncludeClonedFrom"></param>
     /// <returns></returns>
-    public CohortIdentificationConfiguration CloneIntoExistingConfiguration(ICheckNotifier notifier, CohortIdentificationConfiguration cloneTarget, bool IncludeClonedFrom = true)
+    public CohortIdentificationConfiguration CloneIntoExistingConfiguration(ICheckNotifier notifier, CohortIdentificationConfiguration cloneTarget, IDataExportRepository dataExportRepository, bool IncludeClonedFrom = true)
     {
         //todo this would be nice if it was ICatalogueRepository but transaction is super SQLy
         var cataRepo = (ICatalogueRepository)Repository;
@@ -414,8 +417,19 @@ public CohortIdentificationConfiguration CloneIntoExistingConfiguration(ICheckNo
                     cloneTarget.ClonedFrom_ID = ID;
                 cloneTarget.RootCohortAggregateContainer_ID = RootCohortAggregateContainer
                     .CloneEntireTreeRecursively(notifier, this, cloneTarget, parentToCloneJoinablesDictionary).ID;
+
                 cloneTarget.SaveToDatabase();
 
+
+                var associatedProjects = dataExportRepository.GetAllObjectsWhere<ProjectCohortIdentificationConfigurationAssociation>("CohortIdentificationConfiguration_ID", ID);
+                foreach(var proj in associatedProjects)
+                {
+                    var projassociation = new ProjectCohortIdentificationConfigurationAssociation(dataExportRepository, (Project)proj.Project, cloneTarget);
+                    projassociation.SaveToDatabase();
+                }
+                
+
+
                 notifier.OnCheckPerformed(
                     new CheckEventArgs("Clone creation successful, about to commit Super Transaction",
                         CheckResult.Success));
diff --git a/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfigurationMerger.cs b/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfigurationMerger.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Rdmp.Core.CommandExecution;
 using Rdmp.Core.Curation.Data.Aggregation;
 using Rdmp.Core.Repositories;
 using Rdmp.Core.ReusableLibraryCode.Checks;
@@ -20,10 +21,12 @@ namespace Rdmp.Core.Curation.Data.Cohort;
 public class CohortIdentificationConfigurationMerger
 {
     private readonly ICatalogueRepository _repository;
+    private readonly IRDMPPlatformRepositoryServiceLocator _repositoryLocator;
 
-    public CohortIdentificationConfigurationMerger(ICatalogueRepository repository)
+    public CohortIdentificationConfigurationMerger(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
-        _repository = repository;
+        _repositoryLocator = repositoryLocator;
+        _repository = repositoryLocator.CatalogueRepository;
     }
 
     /// <summary>
@@ -42,7 +45,7 @@ public CohortIdentificationConfiguration Merge(CohortIdentificationConfiguration
         try
         {
             for (var i = 0; i < cics.Length; i++)
-                cicClones[i] = cics[i].CreateClone(ThrowImmediatelyCheckNotifier.Quiet);
+                cicClones[i] = cics[i].CreateClone(ThrowImmediatelyCheckNotifier.Quiet, _repositoryLocator.DataExportRepository);
         }
         catch (Exception ex)
         {
@@ -103,7 +106,7 @@ public void Import(CohortIdentificationConfiguration[] cics, CohortAggregateCont
         try
         {
             for (var i = 0; i < cics.Length; i++)
-                cicClones[i] = cics[i].CreateClone(ThrowImmediatelyCheckNotifier.Quiet);
+                cicClones[i] = cics[i].CreateClone(ThrowImmediatelyCheckNotifier.Quiet, _repositoryLocator.DataExportRepository);
         }
         catch (Exception ex)
         {
@@ -173,7 +176,7 @@ public CohortIdentificationConfiguration[] UnMerge(CohortAggregateContainer root
         try
         {
             // clone the input cic
-            cic = cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);
+            cic = cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet, _repositoryLocator.DataExportRepository);
 
             // grab the new clone root container
             rootContainer = cic.RootCohortAggregateContainer;
diff --git a/Rdmp.UI/NavigationTrack.cs b/Rdmp.UI/NavigationTrack.cs
@@ -64,7 +64,7 @@ public NavigationTrack(Func<T, bool> aliveDelegate, Action<T> activate)
     public void Prune()
     {
         _navigationStack = new Stack<T>(_navigationStack.ToArray().Take(MaxHistory + 1).Reverse().Where(_isAlive));
-        _forward = new Stack<T>(_forward.ToArray().AsEnumerable().Reverse().Where(_isAlive));
+        _forward = new Stack<T>(_forward.AsEnumerable().ToArray().AsEnumerable().Reverse().Where(_isAlive));
     }
 
     /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ public void CohortIdentificationConfiguration_CloneEntirely()`
`240`	`240`
`241`	`241`	`try`
`242`	`242`	`{`
`243`		`- var clone = cohortIdentificationConfiguration.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);`
	`243`	`+ var clone = cohortIdentificationConfiguration.CreateClone(ThrowImmediatelyCheckNotifier.Quiet,DataExportRepository);`
`244`	`244`
`245`	`245`	`Assert.Multiple(() =>`
`246`	`246`	`{`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public void QueryBuilderTest_JoinableCloning()`
`402`	`402`
`403`	`403`	`try`
`404`	`404`	`{`
`405`		`- var clone = cohortIdentificationConfiguration.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);`
	`405`	`+ var clone = cohortIdentificationConfiguration.CreateClone(ThrowImmediatelyCheckNotifier.Quiet, DataExportRepository);`
`406`	`406`
`407`	`407`	`var cloneBuilder = new CohortQueryBuilder(clone, null);`
`408`	`408`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public override void Execute()`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`base.Execute();`
`73`		`- var clone = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);`
	`73`	`+ var clone = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet, _activator.RepositoryLocator.DataExportRepository);`
`74`	`74`	`clone.IsTemplate = false;`
`75`	`75`	`clone.Name = RenameTemplateForUse(clone.Name);`
`76`	`76`	`clone.SaveToDatabase();`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public override void Execute()`
`98`	`98`	`if (!_autoConfirm && BasicActivator.IsInteractive && !YesNo(`
`99`	`99`	`"This will create a 100% copy of the entire CohortIdentificationConfiguration including all datasets, filters, parameters and set operations. Are you sure this is what you want?",`
`100`	`100`	`"Confirm Cloning")) return;`
`101`		`- CloneCreatedIfAny = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet);`
	`101`	`+ CloneCreatedIfAny = _cic.CreateClone(ThrowImmediatelyCheckNotifier.Quiet, BasicActivator.RepositoryLocator.DataExportRepository);`
`102`	`102`	`if (CloneCreatedIfAny != null && _version is not null)`
`103`	`103`	`{`
`104`	`104`	`CloneCreatedIfAny.Version = _version;`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ public override void Execute()`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`var merger =`
`40`		`- new CohortIdentificationConfigurationMerger(`
`41`		`- (CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);`
	`40`	`+ new CohortIdentificationConfigurationMerger(BasicActivator.RepositoryLocator);`
`42`	`41`	`var result = merger.Merge(toMerge, SetOperation.UNION);`
`43`	`42`
`44`	`43`	`if (result == null) return;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public override void Execute()`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`base.Execute();`
`44`		`- var clone = _historicalConfiguration.CloneIntoExistingConfiguration(ThrowImmediatelyCheckNotifier.Quiet, _configuration,false);`
	`44`	`+ var clone = _historicalConfiguration.CloneIntoExistingConfiguration(ThrowImmediatelyCheckNotifier.Quiet, _configuration,_activator.RepositoryLocator.DataExportRepository, false);`
`45`	`45`	`Publish(clone);`
`46`	`46`	`Emphasise(clone);`
`47`	`47`	`}`