#8600 fix clone template add delete api

IQSS · May 13, 2022 · dcf7d31 · dcf7d31
1 parent dd7060c
commit dcf7d31
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 8 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java
@@ -118,11 +118,13 @@ public String cloneTemplate(Template templateIn) {
         newOne.setName(name);
         newOne.setUsageCount(new Long(0));
         newOne.setCreateTime(new Timestamp(new Date().getTime()));
-        dataverse.getTemplates().add(newOne);
-        templates.add(newOne);
+        newOne.setDataverse(dataverse);
+
         Template created;
         try {
             created = engineService.submit(new CreateTemplateCommand(newOne, dvRequestService.getDataverseRequest(), dataverse));
+            dataverse.getTemplates().add(created);
+            templates.add(created);
             saveDataverse("");
             String msg =  BundleUtil.getStringFromBundle("template.clone");//"The template has been copied";
             JsfHelper.addFlashMessage(msg);

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -16,6 +16,8 @@
 import edu.harvard.iq.dataverse.validation.EMailValidator;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.Template;
+import edu.harvard.iq.dataverse.TemplateServiceBean;
 import edu.harvard.iq.dataverse.UserServiceBean;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
 import edu.harvard.iq.dataverse.api.dto.RoleDTO;
@@ -85,6 +87,7 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.DeactivateUserCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteRoleCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.DeleteTemplateCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RegisterDvObjectCommand;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
@@ -156,6 +159,8 @@ public class Admin extends AbstractApiBean {
         ExplicitGroupServiceBean explicitGroupService;
         @EJB
         BannerMessageServiceBean bannerMessageService;
+        @EJB
+        TemplateServiceBean templateService;
 
 	// Make the session available
 	@Inject
@@ -208,6 +213,26 @@ public Response deleteSetting(@PathParam("name") String name, @PathParam("lang")
 		settingsSvc.delete(name, lang);
 		return ok("Setting " + name + " - " + lang + " deleted.");
 	}
+
+    @Path("template/{id}")
+    @DELETE
+    public Response deleteTemplate(@PathParam("id") long id) {
+
+        Template doomed = templateService.find(id);
+        if (doomed == null) {
+            return error(Response.Status.NOT_FOUND, "Template with id " + id + " -  not found.");
+        }
+        Dataverse dv = doomed.getDataverse();
+
+        try {
+            commandEngine.submit(new DeleteTemplateCommand(dvRequestService.getDataverseRequest(), dv, doomed, null));
+        } catch (CommandException ex) {
+            Logger.getLogger(Admin.class.getName()).log(Level.SEVERE, null, ex);
+            return error(Response.Status.BAD_REQUEST, ex.getLocalizedMessage());
+        }
+
+        return ok("Template " + doomed.getName() + " deleted.");
+    }
 
 	@Path("authenticationProviderFactories")
 	@GET

diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommand.java
@@ -35,13 +35,17 @@ public DeleteTemplateCommand(DataverseRequest aRequest, Dataverse editedDv , Tem
 
     @Override
     public Dataverse execute(CommandContext ctxt) throws CommandException {
-        Dataverse merged = ctxt.em().merge(editedDv);
-        if (!dvWDefaultTemplate.isEmpty()){
-            for (Dataverse remove: dvWDefaultTemplate){
-                remove.setDefaultTemplate(null);
-                ctxt.em().merge(remove);
-            }                
+        Dataverse merged = null;
+        if (editedDv != null) {
+            merged = ctxt.em().merge(editedDv);
+            if (!dvWDefaultTemplate.isEmpty()) {
+                for (Dataverse remove : dvWDefaultTemplate) {
+                    remove.setDefaultTemplate(null);
+                    ctxt.em().merge(remove);
+                }
+            }
         }
+
         Template doomedAndMerged = ctxt.em().merge(doomed);
         ctxt.em().remove(doomedAndMerged);
         return merged;