Merge pull request #2253 from HicServices/task/RDMP-341-harden-project-specific

Task/rdmp 341 harden project specific

Author: rdteviotdale

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [9.0.3] - 2025-11-03
 - Improve checking for default pipelines
 - Improve confluence catalogue metadata extraction
+- Improve project specific catalogue error handling
 
 ## [9.0.2] - 2025-10-21
 - Add ability to view logs as a flat list. Default settings can be updated via user settings

Rdmp.Core.Tests/Curation/ProjectspecificCatalogueTests.cs

@@ -51,14 +51,14 @@ public void SetupTests(int projectCount = 0, int projectSpecificCount = 0, int e
             _activator.Publish(_extractionInfo1);
             if (projectCount > 0)
             {
-                _project1 = new Project(DataExportRepository, "Project1");
+                _project1 = new Project(DataExportRepository, $"Project{projectCount}");
                 _project1.SaveToDatabase();
                 _activator.Publish(_project1);
 
             }
             if (projectCount > 1)
             {
-                _project2 = new Project(DataExportRepository, "Project1");
+                _project2 = new Project(DataExportRepository, $"Project{projectCount}");
                 _project2.SaveToDatabase();
                 _activator.Publish(_project2);
 
@@ -204,7 +204,7 @@ public void MakeSingleCatalogueProjectSpecificWhenAlreadyInOtherProjectExtractio
         public void MakeSingleCatalogueProjectSpecificWhenAlreadyInOtherProjectAllowExtractionTest()
         {
             SetupTests(2, 0, 1);
-            MakeProjectSpecific(_catalogue, _project1, new List<int>() { _project2.ID });
+            MakeProjectSpecific(_catalogue, _project1, new List<int>() { _project1.ID });
             MakeProjectSpecific(_catalogue, _project2, new List<int>() { _project1.ID });
             Assert.That(_activator.RepositoryLocator.CatalogueRepository.GetObjectByID<Catalogue>(_catalogue.ID).IsProjectSpecific(_activator.RepositoryLocator.DataExportRepository), Is.True);
             Assert.That(_activator.RepositoryLocator.DataExportRepository.GetAllObjectsWhere<ExtractableDataSet>("Catalogue_ID", _catalogue.ID).First().Projects.Count, Is.EqualTo(2));

Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueProjectSpecific.cs

@@ -9,6 +9,7 @@
 using Rdmp.Core.Icons.IconProvision;
 using Rdmp.Core.Providers;
 using Rdmp.Core.Repositories.Construction;
+using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
@@ -29,7 +30,7 @@ public class ExecuteCommandMakeCatalogueProjectSpecific : BasicCommandExecution,
 
     [UseWithObjectConstructor]
     public ExecuteCommandMakeCatalogueProjectSpecific(IBasicActivateItems itemActivator, ICatalogue catalogue,
-        IProject project, [DemandsInitialization("Ignore Validation",DemandType.Unspecified,defaultValue:false)]bool force) : this(itemActivator)
+        IProject project, [DemandsInitialization("Ignore Validation", DemandType.Unspecified, defaultValue: false)] bool force) : this(itemActivator)
     {
         _catalogue = catalogue;
         _project = project;
@@ -49,14 +50,28 @@ public override string GetCommandHelp() =>
     public override void Execute()
     {
         if (_catalogue == null)
-            SetCatalogue(SelectOne(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().ToList()));
+        {
+            var catalogues = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().ToList();
+            if (!catalogues.Any())
+            {
+                Show($"No valid catalogues found to make project specific.");
+                return;
+            }
+            SetCatalogue(SelectOne(catalogues));
+        }
         if (!_hasRanCatalogueValidation)
         {
             SetCatalogue(_catalogue);
         }
-        if(_existingProjectIDs is null)
+        if (_existingProjectIDs is null)
             GetExistingProjectIDs();
 
+        var projects = GetListOfValidProjects();
+        if (!projects.Any())
+        {
+            Show($"No valid projects found to make {_catalogue.Name} project specific.");
+            return;
+        }
         _project ??= SelectOne<Project>(GetListOfValidProjects());
 
         if (_project == null || _catalogue == null)
@@ -90,15 +105,17 @@ public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     private List<Project> GetListOfValidProjects()
     {
         var dataExportChildProvider = ((DataExportChildProvider)_activator.CoreChildProvider);
-
-        var availableProjects = dataExportChildProvider.Projects.Where(p => !dataExportChildProvider.ExtractableDataSetProjects.Where(edsp => edsp.Project_ID == p.ID).Select(edsp => edsp.DataSet.Catalogue).Contains(_catalogue));
-        return availableProjects.Where(p => ProjectSpecificCatalogueManager.CanMakeCatalogueProjectSpecific(_activator.RepositoryLocator.DataExportRepository, _catalogue, p, _existingProjectIDs)).ToList();
+        var eds = _activator.RepositoryLocator.DataExportRepository.GetAllObjectsWithParent<ExtractableDataSet>(_catalogue);
+        var edsp = _activator.RepositoryLocator.DataExportRepository.GetAllObjects<ExtractableDataSetProject>().Where(edsp => eds.Contains(edsp.DataSet));
+        var pti = edsp.Select(e => e.Project_ID).ToList();
+        var validProjects = dataExportChildProvider.Projects.Where(p => _force ||(!pti.Contains(p.ID) && ProjectSpecificCatalogueManager.CanMakeCatalogueProjectSpecific(_activator.RepositoryLocator.DataExportRepository, _catalogue, p, pti)));
+        return validProjects.ToList();
     }
 
     private void GetExistingProjectIDs()
-    {  
+    {
         var dataExportChildProvider = ((DataExportChildProvider)_activator.CoreChildProvider);
-        var existingProjects = dataExportChildProvider.Projects.Where(p => dataExportChildProvider.ExtractableDataSetProjects.Where(edsp => edsp.Project_ID==p.ID).Select(edsp => edsp.DataSet.Catalogue).Contains(_catalogue));
+        var existingProjects = dataExportChildProvider.Projects.Where(p => dataExportChildProvider.ExtractableDataSetProjects.Where(edsp => edsp.Project_ID == p.ID).Select(edsp => edsp.DataSet.Catalogue).Contains(_catalogue));
         _existingProjectIDs = existingProjects.Select(p => p.ID).ToList();
     }
 
@@ -113,7 +130,7 @@ private void SetCatalogue(ICatalogue catalogue)
             return;
         }
         var status = _catalogue.GetExtractabilityStatus(BasicActivator.RepositoryLocator.DataExportRepository);
-       if (!GetListOfValidProjects().Any() && !_force)
+        if (!GetListOfValidProjects().Any() && !_force)
         {
             SetImpossible("No valid Projects available");
         }