use merged dataset everywhere

QualitativeDataRepository · May 15, 2024 · 189e43a · 189e43a
1 parent 7338068
commit 189e43a
Showing 1 changed file with 25 additions and 22 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DestroyDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DestroyDatasetCommand.java
@@ -70,11 +70,30 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         doomed.setThumbnailFile(null);
         final Dataset managedDoomed = ctxt.em().merge(doomed);
 
+
+        if (!managedDoomed.isHarvested()) {
+            GlobalId pid = managedDoomed.getGlobalId();
+            if (pid != null) {
+                PidProvider pidProvider = PidUtil.getPidProvider(pid.getProviderId());
+                try {
+                    if (pidProvider.alreadyRegistered(managedDoomed)) {
+                        pidProvider.deleteIdentifier(managedDoomed);
+                        for (DataFile df : managedDoomed.getFiles()) {
+                            pidProvider.deleteIdentifier(df);
+                        }
+                    }
+                } catch (Exception e) {
+                    logger.log(Level.WARNING, "Identifier deletion was not successful:", e.getMessage());
+                }
+            }
+        }
+        logger.info("After PIDs");
+
         // files need to iterate through and remove 'by hand' to avoid
         // optimistic lock issues... (plus the physical files need to be 
         // deleted too!)
 
-        Iterator <DataFile> dfIt = doomed.getFiles().iterator();
+        Iterator <DataFile> dfIt = managedDoomed.getFiles().iterator();
         while (dfIt.hasNext()){
             DataFile df = dfIt.next();
             // Gather potential Solr IDs of files. As of this writing deaccessioned files are never indexed.
@@ -91,40 +110,24 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         }
 
         //also, lets delete the uploaded thumbnails!
-        if (!doomed.isHarvested()) {
-            deleteDatasetLogo(doomed);
+        if (!managedDoomed.isHarvested()) {
+            deleteDatasetLogo(managedDoomed);
         }
 
         logger.info("Before getting RAs");
         // ASSIGNMENTS
-        for (RoleAssignment ra : ctxt.roles().directRoleAssignments(doomed)) {
+        for (RoleAssignment ra : ctxt.roles().directRoleAssignments(managedDoomed)) {
             ctxt.em().remove(ra);
         }
         logger.info("After getting RAs");
 
         // ROLES
-        for (DataverseRole ra : ctxt.roles().findByOwnerId(doomed.getId())) {
+        for (DataverseRole ra : ctxt.roles().findByOwnerId(managedDoomed.getId())) {
             ctxt.em().remove(ra);
         }   
         logger.info("After getting DRs");
 
-        if (!doomed.isHarvested()) {
-            GlobalId pid = doomed.getGlobalId();
-            if (pid != null) {
-                PidProvider pidProvider = PidUtil.getPidProvider(pid.getProviderId());
-                try {
-                    if (pidProvider.alreadyRegistered(doomed)) {
-                        pidProvider.deleteIdentifier(doomed);
-                        for (DataFile df : doomed.getFiles()) {
-                            pidProvider.deleteIdentifier(df);
-                        }
-                    }
-                } catch (Exception e) {
-                    logger.log(Level.WARNING, "Identifier deletion was not successful:", e.getMessage());
-                }
-            }
-        }
-        logger.info("After PIDs");
+
 
         toReIndex = managedDoomed.getOwner();
         logger.info("Removing dataset");