Fixed: delete featured item inconsistencies

IQSS · Jan 10, 2025 · b8853b7 · b8853b7
1 parent d1c7a04
commit b8853b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFeaturedItem.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFeaturedItem.java
@@ -6,6 +6,10 @@
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.Size;
 
+@NamedQueries({
+        @NamedQuery(name = "DataverseFeaturedItem.deleteById",
+                query = "DELETE FROM DataverseFeaturedItem item WHERE item.id=:id")
+})
 @Entity
 public class DataverseFeaturedItem {
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFeaturedItemServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFeaturedItemServiceBean.java
@@ -44,6 +44,12 @@ public DataverseFeaturedItem save(DataverseFeaturedItem dataverseFeaturedItem) {
         return dataverseFeaturedItem;
     }
 
+    public void delete(Long id) {
+        em.createNamedQuery("DataverseFeaturedItem.deleteById", DataverseFeaturedItem.class)
+                .setParameter("id", id)
+                .executeUpdate();
+    }
+
     public InputStream getImageFileAsInputStream(DataverseFeaturedItem dataverseFeaturedItem) throws IOException {
         Path imagePath = Path.of(JvmSettings.DOCROOT_DIRECTORY.lookup(),
                 JvmSettings.FEATURED_ITEMS_IMAGE_UPLOADS_DIRECTORY.lookup(),

diff --git a/...java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseFeaturedItemCommand.java b/...java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataverseFeaturedItemCommand.java
@@ -21,8 +21,6 @@ public DeleteDataverseFeaturedItemCommand(DataverseRequest request, DataverseFea
 
     @Override
     protected void executeImpl(CommandContext ctxt) throws CommandException {
-        ctxt.em().merge(doomed.getDataverse());
-        DataverseFeaturedItem doomedAndMerged = ctxt.em().merge(doomed);
-        ctxt.em().remove(doomedAndMerged);
+        ctxt.dataverseFeaturedItems().delete(doomed.getId());
     }
 }