Added: featured items deletion in DeleteDataverseCommand

IQSS · Jan 13, 2025 · bff8e94 · bff8e94
1 parent e265ae8
commit bff8e94
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -358,6 +358,10 @@ public List<DataverseFeaturedItem> getDataverseFeaturedItems() {
         return this.dataverseFeaturedItems;
     }
 
+    public void setDataverseFeaturedItems(List<DataverseFeaturedItem> dataverseFeaturedItems) {
+        this.dataverseFeaturedItems = dataverseFeaturedItems;
+    }
+
     public List<Guestbook> getParentGuestbooks() {
         List<Guestbook> retList = new ArrayList<>();
         Dataverse testDV = this;

diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseCommand.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DataverseFeaturedItem;
 import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevel;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.RoleAssignment;
@@ -78,6 +79,14 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
             ctxt.em().remove(merged);
         }
         doomed.setDataverseFieldTypeInputLevels(new ArrayList<>());
+
+        // Featured Items
+        for (DataverseFeaturedItem featuredItem : doomed.getDataverseFeaturedItems()) {
+            DataverseFeaturedItem merged = ctxt.em().merge(featuredItem);
+            ctxt.em().remove(merged);
+        }
+        doomed.setDataverseFeaturedItems(new ArrayList<>());
+
         // DATAVERSE
         Dataverse doomedAndMerged = ctxt.em().merge(doomed);
         ctxt.em().remove(doomedAndMerged);