From 0eeac9793448544eb8fe2f1e0dbf48675ff3f089 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 27 Oct 2025 16:51:43 -0400
Subject: [PATCH 01/13] #11918 prelim check in

---
 .../iq/dataverse/TemplateServiceBean.java     |  3 +-
 .../harvard/iq/dataverse/api/Dataverses.java  | 36 ++++++++++++++++++-
 .../command/impl/CreateTemplateCommand.java   | 10 +++---
 .../iq/dataverse/api/DataversesIT.java        | 23 ++++++++++--
 .../edu/harvard/iq/dataverse/api/UtilIT.java  | 14 ++++++++
 5 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
index 46382fc2588..7093f610979 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
@@ -30,7 +30,8 @@ public Template find(Object pk) {
     }
 
     public Template save(Template template) {
-        return em.merge(template);
+        Template merged = em.merge(template);
+        return merged;
     }
     
     public List<Template> findByOwnerId(Long ownerId) {              
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index a5a336e1c9f..7d0f0e10fa0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import com.google.api.client.util.ArrayMap;
 import edu.harvard.iq.dataverse.*;
+import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
 import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.api.datadeposit.SwordServiceBean;
 import edu.harvard.iq.dataverse.api.dto.*;
@@ -23,6 +24,7 @@
 import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
 import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.*;
 import edu.harvard.iq.dataverse.pidproviders.PidProvider;
 import edu.harvard.iq.dataverse.pidproviders.PidUtil;
@@ -118,6 +120,9 @@ public class Dataverses extends AbstractApiBean {
 
     @EJB
     PermissionServiceBean permissionService;
+    
+    @EJB
+    TemplateServiceBean templateService;
 
     @EJB
     DataverseFeaturedItemServiceBean dataverseFeaturedItemServiceBean;
@@ -1993,15 +1998,44 @@ public Response createTemplate(@Context ContainerRequestContext crc, String body
             NewTemplateDTO newTemplateDTO;
             try {
                 newTemplateDTO = NewTemplateDTO.fromRequestBody(body, jsonParser());
+                System.out.print("newTemplateDTO.isDefault():" + newTemplateDTO.isDefault());
             } catch (JsonParseException ex) {
                 return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.createTemplate.error.jsonParseMetadataFields"), ex.getMessage()));
             }
-            return ok(jsonTemplate(execCommand(new CreateTemplateCommand(newTemplateDTO.toTemplate(), createDataverseRequest(getRequestUser(crc)), dataverse, true))));
+            Template created = execCommand(new CreateTemplateCommand(newTemplateDTO.toTemplate(), createDataverseRequest(getRequestUser(crc)), dataverse, true));
+            
+            return created("/dataverses/template" + created.getId(), jsonTemplate(created));
+        
         } catch (WrappedResponse e) {
             return e.getResponse();
         }
     }
     
+    @Path("template/{id}")
+    @DELETE
+    public Response deleteTemplate(@PathParam("id") long id) {
+        
+        AuthenticatedUser user = authSvc.getAdminUser();
+
+
+        Template doomed = templateService.find(id);
+        if (doomed == null) {
+            return error(Response.Status.NOT_FOUND, "Template with id " + id + " -  not found.");
+        }
+
+        Dataverse dv = doomed.getDataverse();
+        List <Dataverse> dataverseWDefaultTemplate = templateService.findDataversesByDefaultTemplateId(doomed.getId());
+
+        try {
+            execCommand(new DeleteTemplateCommand(createDataverseRequest(user), dv, doomed, dataverseWDefaultTemplate));
+
+        } catch (WrappedResponse wr) {
+                return handleWrappedResponse(wr);
+            }
+
+        return ok("Template " + doomed.getName() + " deleted.");
+    }
+    
     @GET
     @AuthRequired
     @Path("{identifier}/assignments/history")
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommand.java
index fb5e3534f0e..96773f24ca9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommand.java
@@ -49,13 +49,15 @@ public Template execute(CommandContext ctxt) throws CommandException {
         }
 
         Template createdTemplate = ctxt.templates().save(template);
-
-        if (initialize && template.isIsDefaultForDataverse()) {
+        createdTemplate.setIsDefaultForDataverse(template.isIsDefaultForDataverse());
+        if (initialize && createdTemplate.isIsDefaultForDataverse()) {
             dataverse.setDefaultTemplate(createdTemplate);
             ctxt.em().merge(dataverse);
         }
-
-        return template;
+        
+        //Flush so that api response can include the id
+        ctxt.em().flush();
+        return createdTemplate;
     }
 
     private static void updateTermsOfUseAndAccess(CommandContext ctxt, Template template) {
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
index 307af623120..b9cdb12bb1a 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -2595,6 +2595,10 @@ public void testUpdateInputLevelDisplayOnCreateOverride() {
 
     @Test
     public void testCreateAndGetTemplates() throws JsonParseException  {
+        /*
+          Also Delete...
+        */
+        
         Response createUserResponse = UtilIT.createRandomUser();
         String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
         String username = UtilIT.getUsernameFromResponse(createUserResponse);
@@ -2609,9 +2613,13 @@ public void testCreateAndGetTemplates() throws JsonParseException  {
          */
         
         Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
         createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
-
+        Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverseResponse);
+        
+        System.out.print("dataverseId: " + dataverseId);
+        
         String newName = "New Test Dataverse Name";
         String newAffiliation = "New Test Dataverse Affiliation";
         String newDataverseType = Dataverse.DataverseType.TEACHING_COURSES.toString();
@@ -2667,8 +2675,11 @@ public void testCreateAndGetTemplates() throws JsonParseException  {
                 jsonString,
                 apiToken
         );
+
+        createTemplateResponse.prettyPrint();
+        Long templateId = UtilIT.getTemplateIdFromResponse(createTemplateResponse);
         
-        createTemplateResponse.then().assertThat().statusCode(OK.getStatusCode())
+        createTemplateResponse.then().assertThat().statusCode(CREATED.getStatusCode())
                 .body("data.name", equalTo("Dataverse template"))
                 .body("data.isDefault", equalTo(true))
                 .body("data.usageCount", equalTo(0))
@@ -2710,12 +2721,20 @@ public void testCreateAndGetTemplates() throws JsonParseException  {
 
         // Templates retrieval should succeed if the secondary user has dataset creation permissions
 
+        
+        
         UtilIT.setSuperuserStatus(username, true);
         Response grantRoleResponse = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, "@" + secondUsername, apiToken);
         grantRoleResponse.then().assertThat().statusCode(OK.getStatusCode());
 
         getTemplateResponse = UtilIT.getTemplates(dataverseAlias, secondApiToken);
         getTemplateResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        Response deleteTemplateResponse = UtilIT.deleteTemplate(templateId.toString(), secondApiToken);
+        deleteTemplateResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        
+        
     }
 
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index 9724efb2d32..5da929d70d3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -337,6 +337,13 @@ static Integer getDataverseIdFromResponse(Response createDataverseResponse) {
         logger.info("Id found in create dataverse response: " + dataverseId);
         return dataverseId;
     }
+    
+    static Long getTemplateIdFromResponse(Response createTemplateResponse) {
+        JsonPath createdTemplate = JsonPath.from(createTemplateResponse.body().asString());
+        Long templateId = createdTemplate.getLong("data.id");
+        logger.info("Id found in create template response: " + templateId);
+        return templateId;
+    }
 
     static Integer getDatasetIdFromResponse(Response createDatasetResponse) {
         JsonPath createdDataset = JsonPath.from(createDatasetResponse.body().asString());
@@ -5047,6 +5054,13 @@ public static Response createTemplate(String dataverseAlias, String jsonString,
                 .body(jsonString)
                 .post("/api/dataverses/" + dataverseAlias + "/templates");
     }
+    
+    public static Response deleteTemplate(String id,  String apiToken) {
+        return given()
+                .contentType(ContentType.JSON)
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("/api/dataverses/template/"+id);
+    }
 
     public static Response getTemplates(String dataverseAlias, String apiToken) {
         return given()

From f74a9cd32fc3e12ceccab67ea3aafc6e08c68b62 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Tue, 28 Oct 2025 16:34:01 -0400
Subject: [PATCH 02/13] #11918 fix perms and test

---
 .../harvard/iq/dataverse/api/Dataverses.java  | 12 ++----
 .../iq/dataverse/api/DataversesIT.java        | 38 ++++++++++++++++++-
 .../edu/harvard/iq/dataverse/api/UtilIT.java  |  3 +-
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index 7d0f0e10fa0..88d79f91117 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -2011,12 +2011,10 @@ public Response createTemplate(@Context ContainerRequestContext crc, String body
         }
     }
     
-    @Path("template/{id}")
+    @Path("{id}/template")
+    @AuthRequired
     @DELETE
-    public Response deleteTemplate(@PathParam("id") long id) {
-        
-        AuthenticatedUser user = authSvc.getAdminUser();
-
+    public Response deleteTemplate(@Context ContainerRequestContext crc, @PathParam("id") long id) {
 
         Template doomed = templateService.find(id);
         if (doomed == null) {
@@ -2025,10 +2023,8 @@ public Response deleteTemplate(@PathParam("id") long id) {
 
         Dataverse dv = doomed.getDataverse();
         List <Dataverse> dataverseWDefaultTemplate = templateService.findDataversesByDefaultTemplateId(doomed.getId());
-
         try {
-            execCommand(new DeleteTemplateCommand(createDataverseRequest(user), dv, doomed, dataverseWDefaultTemplate));
-
+            execCommand(new DeleteTemplateCommand(createDataverseRequest(getRequestUser(crc)), dv, doomed, dataverseWDefaultTemplate));
         } catch (WrappedResponse wr) {
                 return handleWrappedResponse(wr);
             }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
index b9cdb12bb1a..63802c15b40 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -2638,6 +2638,10 @@ public void testCreateAndGetTemplates() throws JsonParseException  {
         updateDataverseResponse.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+        assertTrue(publishDataverse.prettyPrint().contains("isReleased\": true"));
+        
         // Create a template
 
         String jsonString = """
@@ -2722,17 +2726,47 @@ public void testCreateAndGetTemplates() throws JsonParseException  {
         // Templates retrieval should succeed if the secondary user has dataset creation permissions
 
         
-        
+        //set to super to update role 
         UtilIT.setSuperuserStatus(username, true);
+
         Response grantRoleResponse = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, "@" + secondUsername, apiToken);
+        grantRoleResponse.prettyPrint();
         grantRoleResponse.then().assertThat().statusCode(OK.getStatusCode());
 
         getTemplateResponse = UtilIT.getTemplates(dataverseAlias, secondApiToken);
         getTemplateResponse.then().assertThat().statusCode(OK.getStatusCode());
-        
+      
         Response deleteTemplateResponse = UtilIT.deleteTemplate(templateId.toString(), secondApiToken);
+        deleteTemplateResponse.prettyPrint();
+        deleteTemplateResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+        
+        //set back to show super not needed for delete - just Edit Dataverse
+        UtilIT.setSuperuserStatus(username, false);
+        
+        String badId = "8675309";
+        
+        deleteTemplateResponse = UtilIT.deleteTemplate(badId, apiToken);
+        deleteTemplateResponse.prettyPrint();
+        deleteTemplateResponse.then().assertThat().statusCode(NOT_FOUND.getStatusCode());
+        
+        deleteTemplateResponse = UtilIT.deleteTemplate(templateId.toString(), apiToken);
+        deleteTemplateResponse.prettyPrint();
         deleteTemplateResponse.then().assertThat().statusCode(OK.getStatusCode());
+        // back to super for cleanup
         
+        UtilIT.setSuperuserStatus(username, true);
+        
+        Response deleteDataverse1Response = UtilIT.deleteDataverse(dataverseAlias, apiToken);
+        deleteDataverse1Response.prettyPrint();
+        assertEquals(200, deleteDataverse1Response.getStatusCode());
+        
+        Response deleteUserResponse = UtilIT.deleteUser(secondUsername);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
+        
+        deleteUserResponse = UtilIT.deleteUser(username);
+        deleteUserResponse.prettyPrint();
+        assertEquals(200, deleteUserResponse.getStatusCode());
         
         
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index 5da929d70d3..8ba5f7ed4d3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -5057,9 +5057,8 @@ public static Response createTemplate(String dataverseAlias, String jsonString,
     
     public static Response deleteTemplate(String id,  String apiToken) {
         return given()
-                .contentType(ContentType.JSON)
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
-                .delete("/api/dataverses/template/"+id);
+                .delete("/api/dataverses/"+id+"/template");
     }
 
     public static Response getTemplates(String dataverseAlias, String apiToken) {

From e21f007764cb5af2f72866dbc836ed8d08d59ee3 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Wed, 29 Oct 2025 16:15:04 -0400
Subject: [PATCH 03/13] #11918 add unit tests for command

---
 .../impl/DeleteTemplateCommandTest.java       | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommandTest.java

diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommandTest.java
new file mode 100644
index 00000000000..bdbcbb3a1aa
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteTemplateCommandTest.java
@@ -0,0 +1,93 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.Template;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.*;
+import jakarta.persistence.EntityManager;
+import java.util.*;
+
+import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+class DeleteTemplateCommandTest {
+
+    @Mock
+    private CommandContext ctxt;
+
+    @Mock
+    private EntityManager em;
+
+    @Mock
+    private Dataverse editedDv;
+
+    @Mock
+    private Dataverse otherDv;
+
+    @Mock
+    private Template doomed;
+    
+    @Mock
+    private DataverseRequest dataverseRequest;
+
+
+
+    @BeforeEach
+    void setup() {
+        MockitoAnnotations.openMocks(this);
+        when(ctxt.em()).thenReturn(em);
+
+        List<Dataverse> dvWDefaultTemplate = new ArrayList<>();
+        DeleteTemplateCommand sut = new DeleteTemplateCommand(dataverseRequest, editedDv,doomed, dvWDefaultTemplate);
+        // Simulate that dvWDefaultTemplate has one dataverse with a template
+
+    }
+
+    @Test
+    void testExecute_MergesAndRemovesCorrectly() throws Exception {
+        // Arrange
+        Dataverse mergedDv = mock(Dataverse.class);
+        Template mergedTemplate = mock(Template.class);
+        List<Dataverse> dvWDefaultTemplate = new ArrayList<>();
+        dvWDefaultTemplate.add(otherDv);
+
+        when(em.merge(editedDv)).thenReturn(mergedDv);
+        when(em.merge(doomed)).thenReturn(mergedTemplate);
+        DeleteTemplateCommand sut = new DeleteTemplateCommand(dataverseRequest, editedDv, doomed, dvWDefaultTemplate);
+ 
+        // Act
+        Dataverse result = sut.execute(ctxt);
+
+        // Assert
+        verify(em).merge(editedDv);          // should merge edited dataverse
+        verify(em).merge(otherDv);           // should merge dvWDefaultTemplate items after clearing default template
+        verify(otherDv).setDefaultTemplate(null);
+        verify(em).merge(doomed);            // should merge doomed template
+        verify(em).remove(mergedTemplate);   // should remove merged template
+        assertEquals(mergedDv, result);      // return value is the merged dataverse
+    }
+
+    @Test
+    void testExecute_WhenEditedDvIsNull() throws Exception {
+        // Arrange
+        Dataverse nullDv = null;
+        List<Dataverse> dvWDefaultTemplate = new ArrayList<>();
+        DeleteTemplateCommand sut = new DeleteTemplateCommand(dataverseRequest, nullDv, doomed, dvWDefaultTemplate);
+ 
+        Template mergedTemplate = mock(Template.class);
+        when(em.merge(doomed)).thenReturn(mergedTemplate);
+
+        // Act
+        Dataverse result = sut.execute(ctxt);
+
+        // Assert
+        verify(em, never()).merge(any(Dataverse.class));
+        verify(em).merge(doomed);
+        verify(em).remove(mergedTemplate);
+        assertNull(result);
+    }
+}
+

From 8888d00e58c867a0efaf15d75028a4b1631a8cd9 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 30 Oct 2025 10:27:26 -0400
Subject: [PATCH 04/13] #11918 fix create test for flush/new template

---
 .../engine/command/impl/CreateTemplateCommandTest.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
index bf3daa6c593..474a271e5c9 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
@@ -6,6 +6,7 @@
 import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import jakarta.persistence.EntityManager;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.util.testing.JvmSetting;
@@ -31,6 +32,9 @@
 public class CreateTemplateCommandTest {
 
     private DataverseRequest dataverseRequestStub;
+    
+    @Mock
+    private EntityManager em;
 
     @Mock
     private CommandContext contextMock;
@@ -53,11 +57,15 @@ public class CreateTemplateCommandTest {
     public void setUp() {
         dataverseRequestStub = Mockito.mock(DataverseRequest.class);
         when(contextMock.templates()).thenReturn(templateServiceBeanStub);
+        when(contextMock.em()).thenReturn(em);
     }
 
     @Test
     public void execute_shouldSaveTemplate_noInitialization() throws CommandException {
         // Create the command with initialization set to false
+        
+        Template savedTemplate = mock(Template.class);
+        when(templateServiceBeanStub.save(templateSpy)).thenReturn(savedTemplate);
 
         CreateTemplateCommand sut = new CreateTemplateCommand(templateSpy, dataverseRequestStub, dataverseMock, false);
 
@@ -80,7 +88,9 @@ public void execute_shouldInitializeAndSaveTemplate_withInitialization() throws
         when(contextMock.metadataBlocks()).thenReturn(metadataBlockServiceBeanMock);
         when(contextMock.licenses()).thenReturn(licenseServiceBeanMock);
         when(contextMock.fieldTypeInputLevels()).thenReturn(fieldTypeInputLevelServiceBeanMock);
+        Template savedTemplate = mock(Template.class);
 
+        when(templateServiceBeanStub.save(templateSpy)).thenReturn(savedTemplate);
         when(dataverseMock.getId()).thenReturn(42L);
         when(dataverseMock.isMetadataBlockRoot()).thenReturn(true);
 

From 4775c27fd47890a4ba4cc5d9dbe55a3720889ec9 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 31 Oct 2025 09:48:34 -0400
Subject: [PATCH 05/13] #11918 add get template by id

---
 .../harvard/iq/dataverse/api/Dataverses.java  | 15 ++++++
 .../command/impl/GetTemplateCommand.java      | 52 +++++++++++++++++++
 .../iq/dataverse/api/DataversesIT.java        | 13 ++++-
 .../edu/harvard/iq/dataverse/api/UtilIT.java  | 13 +++++
 4 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetTemplateCommand.java

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index 88d79f91117..26d3452bebe 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -1988,6 +1988,21 @@ public Response getTemplates(@Context ContainerRequestContext crc, @PathParam("i
             return e.getResponse();
         }
     }
+    
+    @GET
+    @AuthRequired
+    @Path("/template/{id}")
+    public Response getTemplate(@Context ContainerRequestContext crc, @PathParam("id") Long templateId) {
+        try {
+            Template template = templateService.find(templateId);
+            if (template == null){
+                return error(Response.Status.NOT_FOUND, "Template with id " + templateId + " -  not found.");
+            }
+            return ok(jsonTemplate(execCommand(new GetTemplateCommand(createDataverseRequest(getRequestUser(crc)), template))));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
 
     @POST
     @AuthRequired
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetTemplateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetTemplateCommand.java
new file mode 100644
index 00000000000..828a5e1bdf6
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetTemplateCommand.java
@@ -0,0 +1,52 @@
+
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.Template;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ *
+ * @author stephenkraffmiller
+ */
+public class GetTemplateCommand extends AbstractCommand<Template>  {
+    
+    private final Template template;
+    
+    public GetTemplateCommand (DataverseRequest aRequest, Template template){
+        super(aRequest, template.getDataverse());
+        this.template = template;
+    }
+
+
+    
+    @Override
+    public Template execute(CommandContext ctxt) throws CommandException {
+        return template;
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        //at least need add dataset if not published also - view unpublished
+        Set<Permission> requiredPermissions = new HashSet<Permission>();
+
+        requiredPermissions.add(Permission.AddDataset);
+        if (!template.getDataverse().isReleased()) {
+            requiredPermissions.add(Permission.ViewUnpublishedDataverse);
+        }
+
+        return Collections.singletonMap("", requiredPermissions);
+
+    }
+    
+    
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
index 63802c15b40..2734ce864dd 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -2596,7 +2596,7 @@ public void testUpdateInputLevelDisplayOnCreateOverride() {
     @Test
     public void testCreateAndGetTemplates() throws JsonParseException  {
         /*
-          Also Delete...
+          Also Delete...and get single template
         */
         
         Response createUserResponse = UtilIT.createRandomUser();
@@ -2735,7 +2735,16 @@ public void testCreateAndGetTemplates() throws JsonParseException  {
 
         getTemplateResponse = UtilIT.getTemplates(dataverseAlias, secondApiToken);
         getTemplateResponse.then().assertThat().statusCode(OK.getStatusCode());
-      
+        
+        Response getTemplateByIdResponse = UtilIT.getTemplate(templateId.toString(), apiToken);
+        getTemplateByIdResponse.prettyPrint();
+        getTemplateByIdResponse.then().assertThat().statusCode(OK.getStatusCode());
+        
+        //guest user shouldn't get it
+        getTemplateByIdResponse = UtilIT.getTemplate(templateId.toString());
+        getTemplateByIdResponse.prettyPrint();
+        getTemplateByIdResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+        
         Response deleteTemplateResponse = UtilIT.deleteTemplate(templateId.toString(), secondApiToken);
         deleteTemplateResponse.prettyPrint();
         deleteTemplateResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index 8ba5f7ed4d3..8d1aca4634c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -5068,6 +5068,19 @@ public static Response getTemplates(String dataverseAlias, String apiToken) {
                 .get("/api/dataverses/" + dataverseAlias + "/templates");
     }
     
+    public static Response getTemplate(String templateId) {
+        return given()
+                .contentType(ContentType.JSON)
+                .get("/api/dataverses/template/" + templateId);
+    }
+    
+    public static Response getTemplate(String templateId, String apiToken) {
+        return given()
+                .contentType(ContentType.JSON)
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/template/" + templateId);
+    }
+    
     /**
      * Gets the tool URL for a dataset with optional parameters
      * @param datasetId The ID of the dataset

From 7585924aa4c8f494bf52d3eefea5ed72912a46c4 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 7 Nov 2025 15:00:21 -0500
Subject: [PATCH 06/13] #11918 unused code

---
 src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java    | 1 -
 .../iq/dataverse/engine/command/impl/GetTemplateCommand.java  | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index 26d3452bebe..ec3cf5f8981 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -2013,7 +2013,6 @@ public Response createTemplate(@Context ContainerRequestContext crc, String body
             NewTemplateDTO newTemplateDTO;
             try {
                 newTemplateDTO = NewTemplateDTO.fromRequestBody(body, jsonParser());
-                System.out.print("newTemplateDTO.isDefault():" + newTemplateDTO.isDefault());
             } catch (JsonParseException ex) {
                 return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.createTemplate.error.jsonParseMetadataFields"), ex.getMessage()));
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetTemplateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetTemplateCommand.java
index 828a5e1bdf6..9ac4128a151 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetTemplateCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetTemplateCommand.java
@@ -1,8 +1,6 @@
 
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.Template;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
@@ -37,7 +35,7 @@ public Template execute(CommandContext ctxt) throws CommandException {
     @Override
     public Map<String, Set<Permission>> getRequiredPermissions() {
         //at least need add dataset if not published also - view unpublished
-        Set<Permission> requiredPermissions = new HashSet<Permission>();
+        Set<Permission> requiredPermissions = new HashSet<>();
 
         requiredPermissions.add(Permission.AddDataset);
         if (!template.getDataverse().isReleased()) {

From 09e4a28736e21af8b2261c13460f109e44c91454 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 10 Nov 2025 11:03:31 -0500
Subject: [PATCH 07/13] #11918 add release notes

---
 doc/release-notes/11918-template-apis.md | 25 ++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 doc/release-notes/11918-template-apis.md

diff --git a/doc/release-notes/11918-template-apis.md b/doc/release-notes/11918-template-apis.md
new file mode 100644
index 00000000000..4de33334bf7
--- /dev/null
+++ b/doc/release-notes/11918-template-apis.md
@@ -0,0 +1,25 @@
+## New Endpoint: `/dataverses/{id}/template`
+
+A new endpoint has been implemented to manage templates belonging to a given dataverse collection.
+
+### Functionality
+- Returns the template of the given {id} in json format.
+- You must have add dataset permission in the collection in order to use this endpoint.
+
+## New Endpoint: `/dataverses/{id}/templates`
+
+A new endpoint has been implemented to manage templates belonging to a given dataverse collection.
+
+### Functionality
+- Returns a list of templates for the given {id} (or alias) of the dataverse collection in json format.
+- You must have add dataset permission in the collection in order to use this endpoint.
+
+## New Endpoint: `/dataverses/{id}/template`
+
+A new endpoint has been implemented to manage templates belonging to a given dataverse collection.
+
+### Functionality
+- Deletes the template of the given {id}.
+- You must have Edit Dataverse permission in order to use this endpoint.
+
+

From 5a06245054172e37160149f8a1647bc49a7725ef Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 10 Nov 2025 14:37:08 -0500
Subject: [PATCH 08/13] #11918 update release note

---
 doc/release-notes/11918-template-apis.md | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/doc/release-notes/11918-template-apis.md b/doc/release-notes/11918-template-apis.md
index 4de33334bf7..b970fd02c70 100644
--- a/doc/release-notes/11918-template-apis.md
+++ b/doc/release-notes/11918-template-apis.md
@@ -1,4 +1,4 @@
-## New Endpoint: `/dataverses/{id}/template`
+## New Endpoint: GET `/dataverses/{id}/template`
 
 A new endpoint has been implemented to manage templates belonging to a given dataverse collection.
 
@@ -6,15 +6,7 @@ A new endpoint has been implemented to manage templates belonging to a given dat
 - Returns the template of the given {id} in json format.
 - You must have add dataset permission in the collection in order to use this endpoint.
 
-## New Endpoint: `/dataverses/{id}/templates`
-
-A new endpoint has been implemented to manage templates belonging to a given dataverse collection.
-
-### Functionality
-- Returns a list of templates for the given {id} (or alias) of the dataverse collection in json format.
-- You must have add dataset permission in the collection in order to use this endpoint.
-
-## New Endpoint: `/dataverses/{id}/template`
+## New Endpoint: DELETE `/dataverses/{id}/template`
 
 A new endpoint has been implemented to manage templates belonging to a given dataverse collection.
 

From 9a5454e9243d78ac04154de22f18f13a1d56d0ed Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 10 Nov 2025 15:37:55 -0500
Subject: [PATCH 09/13] Update native-api.rst

---
 doc/sphinx-guides/source/api/native-api.rst | 42 +++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index c3870372614..bb16f46b19c 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -1464,6 +1464,48 @@ The fully expanded example above (without environment variables) looks like this
 
   curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/dataverses/1/templates"
 
+List Single Template by its Identifier
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Gets the json representation of a template by its ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/dataverses/{ID}/template"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X GET "https://demo.dataverse.org/api/dataverses/1/template"
+
+You must have Create Dataset permission within the given dataverse collection to invoke this api.
+
+Delete a Template by its Identifier
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Deletes a template by its ``id``:
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=1
+
+  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/dataverses/{ID}/template"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/dataverses/1/template"
+
+You must have Edit Dataverse permission within the given dataverse collection to invoke this api.
+
 Create a Template for a Collection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From a62265d697974f5ace1e5268fd0dad6b324f21f4 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Wed, 12 Nov 2025 10:42:21 -0500
Subject: [PATCH 10/13] #11918 code format

---
 src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index ec3cf5f8981..4f3755c09b3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -2036,12 +2036,12 @@ public Response deleteTemplate(@Context ContainerRequestContext crc, @PathParam(
         }
 
         Dataverse dv = doomed.getDataverse();
-        List <Dataverse> dataverseWDefaultTemplate = templateService.findDataversesByDefaultTemplateId(doomed.getId());
+        List<Dataverse> dataverseWDefaultTemplate = templateService.findDataversesByDefaultTemplateId(doomed.getId());
         try {
             execCommand(new DeleteTemplateCommand(createDataverseRequest(getRequestUser(crc)), dv, doomed, dataverseWDefaultTemplate));
         } catch (WrappedResponse wr) {
-                return handleWrappedResponse(wr);
-            }
+            return handleWrappedResponse(wr);
+        }
 
         return ok("Template " + doomed.getName() + " deleted.");
     }

From 7fce175904b64232d83947cecb6682faabebad12 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 13 Nov 2025 14:05:53 -0500
Subject: [PATCH 11/13] #11918 CR fixes

---
 .../java/edu/harvard/iq/dataverse/TemplateServiceBean.java     | 3 +--
 src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
index 7093f610979..46382fc2588 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
@@ -30,8 +30,7 @@ public Template find(Object pk) {
     }
 
     public Template save(Template template) {
-        Template merged = em.merge(template);
-        return merged;
+        return em.merge(template);
     }
     
     public List<Template> findByOwnerId(Long ownerId) {              
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index 4f3755c09b3..d119e120c10 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -2018,7 +2018,7 @@ public Response createTemplate(@Context ContainerRequestContext crc, String body
             }
             Template created = execCommand(new CreateTemplateCommand(newTemplateDTO.toTemplate(), createDataverseRequest(getRequestUser(crc)), dataverse, true));
             
-            return created("/dataverses/template" + created.getId(), jsonTemplate(created));
+            return created("/dataverses/template/" + created.getId(), jsonTemplate(created));
         
         } catch (WrappedResponse e) {
             return e.getResponse();

From 656b0b65947e13020071379816128f36ddc67db2 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 13 Nov 2025 14:09:49 -0500
Subject: [PATCH 12/13] Update native-api.rst

---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index bb16f46b19c..9dc7aad9b72 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -1496,7 +1496,7 @@ Deletes a template by its ``id``:
   export SERVER_URL=https://demo.dataverse.org
   export ID=1
 
-  curl -H "X-Dataverse-key:$API_TOKEN" -X GET "$SERVER_URL/api/dataverses/{ID}/template"
+  curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE "$SERVER_URL/api/dataverses/{ID}/template"
 
 The fully expanded example above (without environment variables) looks like this:
 

From 7b9a1060d3054dbde3b29cff1c6bdf83419f881d Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 12 Dec 2025 13:43:00 -0500
Subject: [PATCH 13/13] Update CreateTemplateCommandTest.java

---
 .../engine/command/impl/CreateTemplateCommandTest.java        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
index 97ba409fd5f..baac3187fd8 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
@@ -47,8 +47,6 @@ public class CreateTemplateCommandTest {
     private LicenseServiceBean licenseServiceBeanMock;
     @Mock
     private DataverseFieldTypeInputLevelServiceBean fieldTypeInputLevelServiceBeanMock;
-    @Mock
-    private EntityManager em;
 
     @Spy
     private Template templateSpy;
@@ -71,7 +69,6 @@ public void execute_shouldSaveTemplate_noInitialization() throws CommandExceptio
         when(templateServiceBeanStub.save(templateSpy)).thenReturn(savedTemplate);
 
         CreateTemplateCommand sut = new CreateTemplateCommand(templateSpy, dataverseRequestStub, dataverseMock, false);
-        Template savedTemplate = mock(Template.class);
         when(templateServiceBeanStub.save(templateSpy)).thenReturn(savedTemplate);
         // Act
         
@@ -99,7 +96,6 @@ public void execute_shouldInitializeAndSaveTemplate_withInitialization() throws
         when(dataverseMock.getId()).thenReturn(42L);
         when(dataverseMock.isMetadataBlockRoot()).thenReturn(true);
                 
-        Template savedTemplate = mock(Template.class);
         when(templateServiceBeanStub.save(templateSpy)).thenReturn(savedTemplate);
 
         // Mock system metadata blocks