update api curate archiving to also use obsolete

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/DatasetPage.java

@@ -3032,10 +3032,7 @@ public String updateCurrentVersion() {
                         }
                     } else if(status.equals(DatasetVersion.ARCHIVAL_STATUS_SUCCESS)) {
                         //Not automatically replacing the old archival copy as creating it is expensive
-                        JsonObject archivalLocation = JsonUtil.getJsonObject(updateVersion.getArchivalCopyLocation());
-                        JsonObjectBuilder job = Json.createObjectBuilder(archivalLocation);
-                        job.add(DatasetVersion.ARCHIVAL_STATUS,DatasetVersion.ARCHIVAL_STATUS_OBSOLETE);
-                        updateVersion.setArchivalCopyLocation(JsonUtil.prettyPrint(job.build()));
+                        updateVersion.setArchivalStatus(DatasetVersion.ARCHIVAL_STATUS_OBSOLETE);
                         datasetVersionService.persistArchivalCopyLocation(updateVersion);
                         datasetVersionService.merge(updateVersion);
                     }

src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java

@@ -414,6 +414,14 @@ public void setArchivalCopyLocation(String location) {
         this.archivalCopyLocation = location;
         populateArchivalStatus(true);
     }
+    
+    public void setArchivalStatus(String status) {
+        populateArchivalStatus(false);
+        JsonObjectBuilder job = Json.createObjectBuilder(archivalStatus);
+        job.add(DatasetVersion.ARCHIVAL_STATUS, status);
+        archivalStatus = job.build();
+        archivalCopyLocation = JsonUtil.prettyPrint(archivalStatus);
+    }
 
     public String getDeaccessionLink() {
         return deaccessionLink;

src/main/java/edu/harvard/iq/dataverse/api/Datasets.java

@@ -1273,24 +1273,32 @@ public Response publishDataset(@Context ContainerRequestContext crc, @PathParam(
                     DatasetVersion updateVersion = ds.getLatestVersion();
                     AbstractSubmitToArchiveCommand archiveCommand = ArchiverUtil.createSubmitToArchiveCommand(className, createDataverseRequest(user), updateVersion);
                     if (archiveCommand != null) {
-                        // Delete the record of any existing copy since it is now out of date/incorrect
-                        dv.setArcivalCopyLocation(null);
-                        datasetVersionSvc.persistArchivalCopyLocation(updateVersion);
-                        /*
-                         * Then try to generate and submit an archival copy. Note that running this
-                         * command within the CuratePublishedDatasetVersionCommand was causing an error:
-                         * "The attribute [id] of class
-                         * [edu.harvard.iq.dataverse.DatasetFieldCompoundValue] is mapped to a primary
-                         * key column in the database. Updates are not allowed." To avoid that, and to
-                         * simplify reporting back to the GUI whether this optional step succeeded, I've
-                         * pulled this out as a separate submit().
-                         */
-                        try {
-                            commandEngine.submitAsync(archiveCommand);
-                            successMsg = BundleUtil.getStringFromBundle("datasetversion.archive.inprogress");
-                        } catch (CommandException ex) {
-                            successMsg = BundleUtil.getStringFromBundle("datasetversion.update.archive.failure") + " - " + ex.toString();
-                            logger.severe(ex.getMessage());
+                        String status = updateVersion.getArchivalCopyLocationStatus();
+                        if((status==null) || status.equals(DatasetVersion.ARCHIVAL_STATUS_FAILURE)){
+                            // Otherwise, delete the record of any existing copy since it is now out of
+                            // date/incorrect
+                            updateVersion.setArchivalCopyLocation(null);
+                            datasetVersionSvc.persistArchivalCopyLocation(updateVersion);
+                            /*
+                             * Then try to generate and submit an archival copy. Note that running this
+                             * command within the CuratePublishedDatasetVersionCommand was causing an error:
+                             * "The attribute [id] of class
+                             * [edu.harvard.iq.dataverse.DatasetFieldCompoundValue] is mapped to a primary
+                             * key column in the database. Updates are not allowed." To avoid that, and to
+                             * simplify reporting back to the GUI whether this optional step succeeded, I've
+                             * pulled this out as a separate submit().
+                             */
+                            try {
+                                commandEngine.submitAsync(archiveCommand);
+                                successMsg = BundleUtil.getStringFromBundle("datasetversion.archive.inprogress");
+                            } catch (CommandException ex) {
+                                successMsg = BundleUtil.getStringFromBundle("datasetversion.update.archive.failure") + " - " + ex.toString();
+                                logger.severe(ex.getMessage());
+                            }
+                        } else  if(status.equals(DatasetVersion.ARCHIVAL_STATUS_SUCCESS)) {
+                            //Not automatically replacing the old archival copy as creating it is expensive
+                            updateVersion.setArchivalStatus(DatasetVersion.ARCHIVAL_STATUS_OBSOLETE);
+                            datasetVersionSvc.persistArchivalCopyLocation(updateVersion);
                         }
                     }
                 } catch (CommandException ex) {