From b4ca7999659e30694d71dd1d8f4d5d35b9c0f4f1 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 9 Jun 2025 19:06:22 +0100
Subject: [PATCH 01/17] Stash: ListDataverseTemplatesCommand and endpoint WIP

---
 .../harvard/iq/dataverse/api/Dataverses.java  | 12 ++++++
 .../impl/ListDataverseTemplatesCommand.java   | 39 +++++++++++++++++++
 .../iq/dataverse/util/json/JsonPrinter.java   | 14 +++++++
 3 files changed, 65 insertions(+)
 create mode 100644 src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.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 dcab1519d77..2ec8cac68fc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -1931,4 +1931,16 @@ public Response deleteFeaturedItems(@Context ContainerRequestContext crc, @PathP
             return e.getResponse();
         }
     }
+
+    @GET
+    @AuthRequired
+    @Path("{identifier}/templates")
+    public Response getTemplates(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            return ok(json(execCommand(new ListDataverseTemplatesCommand(createDataverseRequest(getRequestUser(crc)), dataverse))));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java
new file mode 100644
index 00000000000..54061f241a6
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java
@@ -0,0 +1,39 @@
+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.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.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Lists the templates {@link Template} of a {@link Dataverse}.
+ */
+public class ListDataverseTemplatesCommand extends AbstractCommand<List<Template>> {
+
+    private final Dataverse dataverse;
+
+    public ListDataverseTemplatesCommand(DataverseRequest request, Dataverse dataverse) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+    }
+
+    @Override
+    public List<Template> execute(CommandContext ctxt) throws CommandException {
+        return ctxt.templates().findAll();
+    }
+
+    @Override
+    public Map<String, Set<Permission>> getRequiredPermissions() {
+        return Collections.singletonMap("",
+                dataverse.isReleased() ? Collections.emptySet()
+                        : Collections.singleton(Permission.ViewUnpublishedDataverse));
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index 9d3d1ceae20..115b6933c34 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -1502,4 +1502,18 @@ public static JsonObjectBuilder json(DataverseFeaturedItem dataverseFeaturedItem
                 .add("type", dataverseFeaturedItem.getType())
                 .add("dvObject", (dataverseFeaturedItem.getDvObject() != null) ? dataverseFeaturedItem.getDvObject().getId() : null);
     }
+
+    public static JsonArrayBuilder json(List<Template> templates) {
+        JsonArrayBuilder templatesArrayBuilder = Json.createArrayBuilder();
+        for (Template template : templates) {
+            templatesArrayBuilder.add(json(template));
+        }
+        return templatesArrayBuilder;
+    }
+
+    public static JsonObjectBuilder json(Template template) {
+        // TODO: Complete params
+        return jsonObjectBuilder()
+                .add("id", template.getId());
+    }
 }

From 16fce32e1f5852ffc020549c52c2c02daaa766b1 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 9 Jun 2025 21:22:20 +0100
Subject: [PATCH 02/17] Added: ListDataverseTemplatesCommand.execute logic

---
 .../harvard/iq/dataverse/api/Dataverses.java  |  2 +-
 .../impl/ListDataverseTemplatesCommand.java   | 22 +++++++++----------
 .../iq/dataverse/util/json/JsonPrinter.java   |  3 ++-
 3 files changed, 14 insertions(+), 13 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 2ec8cac68fc..aed4f812bfb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -1938,7 +1938,7 @@ public Response deleteFeaturedItems(@Context ContainerRequestContext crc, @PathP
     public Response getTemplates(@Context ContainerRequestContext crc, @PathParam("identifier") String dvIdtf) {
         try {
             Dataverse dataverse = findDataverseOrDie(dvIdtf);
-            return ok(json(execCommand(new ListDataverseTemplatesCommand(createDataverseRequest(getRequestUser(crc)), dataverse))));
+            return ok(jsonTemplates(execCommand(new ListDataverseTemplatesCommand(createDataverseRequest(getRequestUser(crc)), dataverse))));
         } catch (WrappedResponse e) {
             return e.getResponse();
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java
index 54061f241a6..f1104b5af15 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommand.java
@@ -6,16 +6,15 @@
 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.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Lists the templates {@link Template} of a {@link Dataverse}.
  */
+@RequiredPermissions(Permission.EditDataverse)
 public class ListDataverseTemplatesCommand extends AbstractCommand<List<Template>> {
 
     private final Dataverse dataverse;
@@ -27,13 +26,14 @@ public ListDataverseTemplatesCommand(DataverseRequest request, Dataverse dataver
 
     @Override
     public List<Template> execute(CommandContext ctxt) throws CommandException {
-        return ctxt.templates().findAll();
-    }
+        List<Template> templates = new ArrayList<>();
 
-    @Override
-    public Map<String, Set<Permission>> getRequiredPermissions() {
-        return Collections.singletonMap("",
-                dataverse.isReleased() ? Collections.emptySet()
-                        : Collections.singleton(Permission.ViewUnpublishedDataverse));
+        if (dataverse.getOwner() != null) {
+            templates.addAll(dataverse.getParentTemplates());
+        }
+
+        templates.addAll(dataverse.getTemplates());
+
+        return templates;
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index 115b6933c34..b33c75855e3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -1503,7 +1503,7 @@ public static JsonObjectBuilder json(DataverseFeaturedItem dataverseFeaturedItem
                 .add("dvObject", (dataverseFeaturedItem.getDvObject() != null) ? dataverseFeaturedItem.getDvObject().getId() : null);
     }
 
-    public static JsonArrayBuilder json(List<Template> templates) {
+    public static JsonArrayBuilder jsonTemplates(List<Template> templates) {
         JsonArrayBuilder templatesArrayBuilder = Json.createArrayBuilder();
         for (Template template : templates) {
             templatesArrayBuilder.add(json(template));
@@ -1514,6 +1514,7 @@ public static JsonArrayBuilder json(List<Template> templates) {
     public static JsonObjectBuilder json(Template template) {
         // TODO: Complete params
         return jsonObjectBuilder()
+                .add("name", template.getName())
                 .add("id", template.getId());
     }
 }

From 3b6bf341c00d25179b618bff7545c98e69ecdfa8 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Thu, 19 Jun 2025 15:45:16 +0100
Subject: [PATCH 03/17] Added: dataverse template API payload params

---
 .../iq/dataverse/util/json/JsonPrinter.java   | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index b33c75855e3..a3ecf7d68ad 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -1506,15 +1506,37 @@ public static JsonObjectBuilder json(DataverseFeaturedItem dataverseFeaturedItem
     public static JsonArrayBuilder jsonTemplates(List<Template> templates) {
         JsonArrayBuilder templatesArrayBuilder = Json.createArrayBuilder();
         for (Template template : templates) {
-            templatesArrayBuilder.add(json(template));
+            templatesArrayBuilder.add(jsonTemplate(template));
         }
         return templatesArrayBuilder;
     }
 
-    public static JsonObjectBuilder json(Template template) {
+    public static JsonObjectBuilder jsonTemplate(Template template) {
         // TODO: Complete params
         return jsonObjectBuilder()
+                .add("id", template.getId())
                 .add("name", template.getName())
-                .add("id", template.getId());
+                .add("usageCount", template.getUsageCount())
+                .add("createTime", template.getCreateTime().toString())
+                .add("createDate", template.getCreateDate())
+                // TODO
+                .add("termsOfUseAndAccess", "TODO")
+                .add("datasetFields", jsonByBlocks(template.getDatasetFields()))
+                .add("instructions", jsonTemplateInstructions(template))
+                .add("dataverseAlias", template.getDataverse().getAlias());
+    }
+
+    public static JsonArrayBuilder jsonTemplateInstructions(Template template) {
+        JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
+        Map<String, String> templateInstructions = template.getInstructionsMap();
+
+        for (Map.Entry<String, String> entry : templateInstructions.entrySet()) {
+            JsonObjectBuilder instructionObject = Json.createObjectBuilder()
+                    .add("instructionField", entry.getKey())
+                    .add("instructionText", entry.getValue());
+            jsonArrayBuilder.add(instructionObject);
+        }
+
+        return jsonArrayBuilder;
     }
 }

From bf1cf66ba8fb9e5e2466ace71fda57d7d4bd3078 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Thu, 19 Jun 2025 16:01:10 +0100
Subject: [PATCH 04/17] Added: termsOfUseAndAccess to template payload

---
 .../iq/dataverse/util/json/JsonPrinter.java   | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index a3ecf7d68ad..6f8a8cadde1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -1512,23 +1512,41 @@ public static JsonArrayBuilder jsonTemplates(List<Template> templates) {
     }
 
     public static JsonObjectBuilder jsonTemplate(Template template) {
-        // TODO: Complete params
         return jsonObjectBuilder()
                 .add("id", template.getId())
                 .add("name", template.getName())
                 .add("usageCount", template.getUsageCount())
                 .add("createTime", template.getCreateTime().toString())
                 .add("createDate", template.getCreateDate())
-                // TODO
-                .add("termsOfUseAndAccess", "TODO")
+                .add("termsOfUseAndAccess", jsonTermsOfUseAndAccess(template.getTermsOfUseAndAccess()))
                 .add("datasetFields", jsonByBlocks(template.getDatasetFields()))
-                .add("instructions", jsonTemplateInstructions(template))
+                .add("instructions", jsonTemplateInstructions(template.getInstructionsMap()))
                 .add("dataverseAlias", template.getDataverse().getAlias());
     }
 
-    public static JsonArrayBuilder jsonTemplateInstructions(Template template) {
+    public static JsonObjectBuilder jsonTermsOfUseAndAccess(TermsOfUseAndAccess termsOfUseAndAccess) {
+        return jsonObjectBuilder()
+                .add("id", termsOfUseAndAccess.getId())
+                .add("datasetVersion", json(termsOfUseAndAccess.getDatasetVersion(), false)
+                .add("license", json(termsOfUseAndAccess.getLicense()))
+                .add("termsOfUse", termsOfUseAndAccess.getTermsOfUse())
+                .add("termsOfAccess", termsOfUseAndAccess.getTermsOfAccess())
+                .add("confidentialityDeclaration", termsOfUseAndAccess.getConfidentialityDeclaration())
+                .add("specialPermissions", termsOfUseAndAccess.getSpecialPermissions())
+                .add("restrictions", termsOfUseAndAccess.getRestrictions())
+                .add("citationRequirements", termsOfUseAndAccess.getCitationRequirements())
+                .add("depositorRequirements", termsOfUseAndAccess.getDepositorRequirements())
+                .add("conditions", termsOfUseAndAccess.getConditions())
+                .add("disclaimer", termsOfUseAndAccess.getDisclaimer())
+                .add("dataAccessPlace", termsOfUseAndAccess.getDataAccessPlace())
+                .add("originalArchive", termsOfUseAndAccess.getOriginalArchive())
+                .add("availabilityStatus", termsOfUseAndAccess.getAvailabilityStatus())
+                .add("sizeOfCollection", termsOfUseAndAccess.getSizeOfCollection())
+                .add("studyCompletion", termsOfUseAndAccess.getStudyCompletion()));
+    }
+
+    public static JsonArrayBuilder jsonTemplateInstructions(Map<String, String> templateInstructions) {
         JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
-        Map<String, String> templateInstructions = template.getInstructionsMap();
 
         for (Map.Entry<String, String> entry : templateInstructions.entrySet()) {
             JsonObjectBuilder instructionObject = Json.createObjectBuilder()

From 1cb7813e908f07103a593b0b8b83c245e3121e01 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Fri, 20 Jun 2025 14:03:37 +0100
Subject: [PATCH 05/17] Added: ListDataverseTemplatesCommandTest

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

diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommandTest.java
new file mode 100644
index 00000000000..94be775cf4f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseTemplatesCommandTest.java
@@ -0,0 +1,79 @@
+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 edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ListDataverseTemplatesCommandTest {
+
+    private DataverseRequest dataverseRequestStub;
+    private Template testTemplate;
+
+    @BeforeEach
+    public void setUp() {
+        dataverseRequestStub = Mockito.mock(DataverseRequest.class);
+        testTemplate = new Template();
+    }
+
+    @Test
+    public void execute_shouldReturnTemplates_noParent() throws CommandException {
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(testTemplate));
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        assertEquals(1, result.size());
+        assertEquals(testTemplate, result.get(0));
+    }
+
+    @Test
+    public void execute_shouldReturnTemplates_parentHasTemplates() throws CommandException {
+        Template parentTemplate = new Template();
+
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+        Dataverse parentDataverseMock = Mockito.mock(Dataverse.class);
+
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(testTemplate));
+        Mockito.when(dataverseMock.getParentTemplates()).thenReturn(Collections.singletonList(parentTemplate));
+        Mockito.when(dataverseMock.getOwner()).thenReturn(parentDataverseMock);
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        assertEquals(2, result.size());
+        assertTrue(result.contains(testTemplate));
+        assertTrue(result.contains(parentTemplate));
+    }
+
+    @Test
+    public void execute_shouldReturnTemplates_parentHasNoTemplates() throws CommandException {
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+        Dataverse parentDataverseStub = Mockito.mock(Dataverse.class);
+
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(testTemplate));
+        Mockito.when(dataverseMock.getOwner()).thenReturn(parentDataverseStub);
+        Mockito.when(dataverseMock.getParentTemplates()).thenReturn(Collections.emptyList());
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        assertEquals(1, result.size());
+        assertTrue(result.contains(testTemplate));
+    }
+}

From ad0910db599e4cfbac1be252698ec95c98e6b39e Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Fri, 20 Jun 2025 14:41:55 +0100
Subject: [PATCH 06/17] Stash: createTemplate API WIP

---
 .../edu/harvard/iq/dataverse/api/Dataverses.java    | 13 +++++++++++++
 .../harvard/iq/dataverse/api/dto/TemplateDTO.java   |  8 ++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 src/main/java/edu/harvard/iq/dataverse/api/dto/TemplateDTO.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 aed4f812bfb..d9044dd9137 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -1943,4 +1943,17 @@ public Response getTemplates(@Context ContainerRequestContext crc, @PathParam("i
             return e.getResponse();
         }
     }
+
+    @POST
+    @AuthRequired
+    @Path("{identifier}/templates")
+    public Response createTemplate(@Context ContainerRequestContext crc, String body, @PathParam("identifier") String dvIdtf) {
+        try {
+            Dataverse dataverse = findDataverseOrDie(dvIdtf);
+            TemplateDTO templateDTO = TemplateDTO.fromRequestBody(body);
+            return ok(jsonTemplate(execCommand(new CreateDataverseTemplateCommand(createDataverseRequest(getRequestUser(crc)), dataverse, templateDTO))));
+        } catch (WrappedResponse e) {
+            return e.getResponse();
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/TemplateDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/TemplateDTO.java
new file mode 100644
index 00000000000..96913b81e23
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/TemplateDTO.java
@@ -0,0 +1,8 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+public class TemplateDTO {
+
+    public static TemplateDTO fromRequestBody(String requestBody) {
+        return new TemplateDTO();
+    }
+}

From 891bd6c1737d19cbf469a1c96c44a259f1e687da Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 23 Jun 2025 20:45:53 +0100
Subject: [PATCH 07/17] Stash: create template endpoint WIP
 (CreateInitializedTemplateCommand initial version)

---
 .../iq/dataverse/EjbDataverseEngine.java      |  9 ++
 .../edu/harvard/iq/dataverse/Template.java    |  6 +-
 .../harvard/iq/dataverse/api/Dataverses.java  |  9 +-
 .../iq/dataverse/api/dto/NewTemplateDTO.java  | 60 ++++++++++++
 .../iq/dataverse/api/dto/TemplateDTO.java     |  8 --
 .../api/dto/TermsOfUseAndAccessDTO.java       |  2 +
 .../engine/command/CommandContext.java        |  3 +
 .../CreateInitializedTemplateCommand.java     | 94 +++++++++++++++++++
 src/main/java/propertyFiles/Bundle.properties |  1 +
 .../dataverse/engine/TestCommandContext.java  |  6 ++
 10 files changed, 187 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java
 delete mode 100644 src/main/java/edu/harvard/iq/dataverse/api/dto/TemplateDTO.java
 create mode 100644 src/main/java/edu/harvard/iq/dataverse/api/dto/TermsOfUseAndAccessDTO.java
 create mode 100644 src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateInitializedTemplateCommand.java

diff --git a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java
index 5e9d60308ae..8c16df1f79d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java
@@ -6,6 +6,7 @@
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
 import edu.harvard.iq.dataverse.engine.DataverseEngine;
 import edu.harvard.iq.dataverse.authorization.Permission;
@@ -191,6 +192,9 @@ public class EjbDataverseEngine {
     @EJB
     DataverseFeaturedItemServiceBean dataverseFeaturedItemServiceBean;
 
+    @EJB
+    LicenseServiceBean licenseServiceBean;
+
     @EJB
     DatasetFieldsValidator datasetFieldsValidator;
     
@@ -540,6 +544,11 @@ public DatasetFieldsValidator datasetFieldsValidator() {
                     return datasetFieldsValidator;
                 }
 
+                @Override
+                public LicenseServiceBean licenses() {
+                    return licenseServiceBean;
+                }
+
                 @Override
                 public StorageUseServiceBean storageUse() {
                     return storageUseService;
diff --git a/src/main/java/edu/harvard/iq/dataverse/Template.java b/src/main/java/edu/harvard/iq/dataverse/Template.java
index 05c6df51197..2768cf417a4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Template.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Template.java
@@ -137,7 +137,11 @@ public List<DatasetField> getDatasetFields() {
 
     @Transient
     private Map<String, String> instructionsMap = null;
-    
+
+    public void setInstructionsMap(Map<String, String> instructionsMap) {
+        this.instructionsMap = instructionsMap;
+    }
+
     @Transient
     private TreeMap<MetadataBlock, List<DatasetField>> metadataBlocksForView = new TreeMap<>();
     @Transient
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 d9044dd9137..7126bca5c33 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -1950,8 +1950,13 @@ public Response getTemplates(@Context ContainerRequestContext crc, @PathParam("i
     public Response createTemplate(@Context ContainerRequestContext crc, String body, @PathParam("identifier") String dvIdtf) {
         try {
             Dataverse dataverse = findDataverseOrDie(dvIdtf);
-            TemplateDTO templateDTO = TemplateDTO.fromRequestBody(body);
-            return ok(jsonTemplate(execCommand(new CreateDataverseTemplateCommand(createDataverseRequest(getRequestUser(crc)), dataverse, templateDTO))));
+            NewTemplateDTO newTemplateDTO;
+            try {
+                newTemplateDTO = NewTemplateDTO.fromRequestBody(body, jsonParser());
+            } catch (JsonParseException ex) {
+                return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.createTemplate.error.jsonParseMetadataFields"), ex.getMessage()));
+            }
+            return ok(jsonTemplate(execCommand(new CreateInitializedTemplateCommand(createDataverseRequest(getRequestUser(crc)), dataverse, newTemplateDTO))));
         } catch (WrappedResponse e) {
             return e.getResponse();
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java
new file mode 100644
index 00000000000..a11e1aefad9
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java
@@ -0,0 +1,60 @@
+package edu.harvard.iq.dataverse.api.dto;
+
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.util.json.JsonParseException;
+import edu.harvard.iq.dataverse.util.json.JsonParser;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
+import jakarta.json.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class NewTemplateDTO {
+
+    private String name;
+    private List<DatasetField> datasetFields;
+    private Map<String, String> instructionsMap;
+    private boolean isDefault;
+
+    public static NewTemplateDTO fromRequestBody(String requestBody, JsonParser jsonParser) throws JsonParseException {
+        NewTemplateDTO newTemplateDTO = new NewTemplateDTO();
+
+        JsonObject jsonObject = JsonUtil.getJsonObject(requestBody);
+
+        newTemplateDTO.name = jsonObject.getString("name");
+        newTemplateDTO.datasetFields = jsonParser.parseMultipleFields(jsonObject);
+        newTemplateDTO.instructionsMap = parseInstructionsMap(jsonObject);
+        newTemplateDTO.isDefault = jsonObject.getBoolean("isDefault");
+
+        return newTemplateDTO;
+    }
+
+    private static Map<String, String> parseInstructionsMap(JsonObject jsonObject) {
+        Map<String, String> instructionsMap = new HashMap<>();
+        JsonArray instructionsJsonArray = jsonObject.getJsonArray("instructions");
+        for (JsonObject instructionJsonObject : instructionsJsonArray.getValuesAs(JsonObject.class)) {
+            instructionsMap.put(
+                    instructionJsonObject.getString("instructionField"),
+                    instructionJsonObject.getString("instructionText")
+            );
+        }
+        return instructionsMap;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<DatasetField> getDatasetFields() {
+        return datasetFields;
+    }
+
+    public Map<String, String> getInstructionsMap() {
+        return instructionsMap;
+    }
+
+    public boolean isDefault() {
+        return isDefault;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/TemplateDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/TemplateDTO.java
deleted file mode 100644
index 96913b81e23..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/dto/TemplateDTO.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.harvard.iq.dataverse.api.dto;
-
-public class TemplateDTO {
-
-    public static TemplateDTO fromRequestBody(String requestBody) {
-        return new TemplateDTO();
-    }
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/TermsOfUseAndAccessDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/TermsOfUseAndAccessDTO.java
new file mode 100644
index 00000000000..94cc09a414f
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/TermsOfUseAndAccessDTO.java
@@ -0,0 +1,2 @@
+package edu.harvard.iq.dataverse.api.dto;public class TermsOfUseAndAccessDTO {
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
index a074c4147cb..f9cbe33fa72 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
@@ -4,6 +4,7 @@
 import edu.harvard.iq.dataverse.dataset.DatasetFieldsValidator;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.search.SearchServiceBean;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
@@ -139,4 +140,6 @@ public interface CommandContext {
     public DataverseFeaturedItemServiceBean dataverseFeaturedItems();
 
     public DatasetFieldsValidator datasetFieldsValidator();
+
+    public LicenseServiceBean licenses();
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateInitializedTemplateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateInitializedTemplateCommand.java
new file mode 100644
index 00000000000..a58bf9fc4fb
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateInitializedTemplateCommand.java
@@ -0,0 +1,94 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.api.dto.NewTemplateDTO;
+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.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Creates a template {@link Template} for a {@link Dataverse}.
+ * TODO: Proper docs
+ */
+@RequiredPermissions(Permission.EditDataverse)
+public class CreateInitializedTemplateCommand extends AbstractCommand<Template> {
+
+    private final Dataverse dataverse;
+    private final NewTemplateDTO newTemplateDTO;
+
+    public CreateInitializedTemplateCommand(DataverseRequest request,
+                                            Dataverse dataverse,
+                                            NewTemplateDTO newTemplateDTO) {
+        super(request, dataverse);
+        this.dataverse = dataverse;
+        this.newTemplateDTO = newTemplateDTO;
+    }
+
+    @Override
+    public Template execute(CommandContext ctxt) throws CommandException {
+        Template template = new Template();
+
+        template.setDataverse(dataverse);
+        template.setDatasetFields(newTemplateDTO.getDatasetFields());
+        template.setMetadataValueBlocks(getSystemMetadataBlocks(ctxt));
+        template.setName(newTemplateDTO.getName());
+        template.setInstructionsMap(newTemplateDTO.getInstructionsMap());
+        template.updateInstructions();
+        template.setCreateTime(new Timestamp(new Date().getTime()));
+        template.setUsageCount(0L);
+
+        updateTermsOfUseAndAccess(ctxt, template);
+        updateDatasetFieldInputLevels(template, ctxt);
+
+        DatasetFieldUtil.tidyUpFields(template.getDatasetFields(), false);
+
+        dataverse.getTemplates().add(template);
+
+        return ctxt.engine().submit(new CreateTemplateCommand(template, getRequest(), dataverse));
+    }
+
+    private static void updateTermsOfUseAndAccess(CommandContext ctxt, Template template) {
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setFileAccessRequest(true);
+        terms.setTemplate(template);
+        terms.setLicense(ctxt.licenses().getDefault());
+        template.setTermsOfUseAndAccess(terms);
+    }
+
+    private void updateDatasetFieldInputLevels(Template template, CommandContext ctxt) {
+        Long dvIdForInputLevel = this.dataverse.getId();
+        if (!this.dataverse.isMetadataBlockRoot()) {
+            dvIdForInputLevel = this.dataverse.getMetadataRootId();
+        }
+
+        for (DatasetField dsf : template.getFlatDatasetFields()) {
+            DataverseFieldTypeInputLevel inputLevel = ctxt.fieldTypeInputLevels().findByDataverseIdDatasetFieldTypeId(
+                    dvIdForInputLevel,
+                    dsf.getDatasetFieldType().getId()
+            );
+            if (inputLevel != null) {
+                dsf.setInclude(inputLevel.isInclude());
+            } else {
+                dsf.setInclude(true);
+            }
+        }
+    }
+
+    private static List<MetadataBlock> getSystemMetadataBlocks(CommandContext ctxt) {
+        List<MetadataBlock> systemMetadataBlocks = new ArrayList<>();
+        for (MetadataBlock mdb : ctxt.metadataBlocks().listMetadataBlocks()) {
+            JvmSettings.MDB_SYSTEM_KEY_FOR.lookupOptional(mdb.getName()).ifPresent(smdbString -> systemMetadataBlocks.add(mdb));
+        }
+        return systemMetadataBlocks;
+    }
+}
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 94cceaf7433..d1ff627d2b7 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1029,6 +1029,7 @@ dataverse.update.featuredItems.error.invalidTypeAndDvObject=Invalid type and DvO
 dataverse.update.featuredItems.error.invalidType=Unknown 'type' must be one of {0}
 dataverse.update.featuredItems.error.typeAndDvObjectMismatch=The 'type' passed does not match the dvObject type.
 dataverse.delete.featuredItems.success=All featured items of this Dataverse have been successfully deleted.
+dataverse.createTemplate.error.jsonParseMetadataFields=Error parsing the POSTed template dataset fields: {0}
 # rolesAndPermissionsFragment.xhtml
 
 # advanced.xhtml
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
index e00dbccf262..f753d3bb6ad 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
@@ -14,6 +14,7 @@
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.search.IndexBatchServiceBean;
@@ -258,6 +259,11 @@ public DatasetFieldsValidator datasetFieldsValidator() {
         return null;
     }
 
+    @Override
+    public LicenseServiceBean licenses() {
+        return null;
+    }
+
     @Override
     public void beginCommandSequence() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.

From 855efb18b8ab9938570040f532ddfd9e0c7654a6 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Sun, 29 Jun 2025 15:50:15 +0100
Subject: [PATCH 08/17] Refactor: using CreateTemplateCommand instead of
 separate command for initializing the template

---
 .../harvard/iq/dataverse/api/Dataverses.java  |  2 +-
 .../iq/dataverse/api/dto/NewTemplateDTO.java  | 47 ++++++----
 .../api/dto/TermsOfUseAndAccessDTO.java       |  2 -
 .../CreateInitializedTemplateCommand.java     | 94 -------------------
 .../command/impl/CreateTemplateCommand.java   | 94 +++++++++++++++----
 5 files changed, 106 insertions(+), 133 deletions(-)
 delete mode 100644 src/main/java/edu/harvard/iq/dataverse/api/dto/TermsOfUseAndAccessDTO.java
 delete mode 100644 src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateInitializedTemplateCommand.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 7126bca5c33..c892c6bc33a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -1956,7 +1956,7 @@ public Response createTemplate(@Context ContainerRequestContext crc, String body
             } catch (JsonParseException ex) {
                 return error(Status.BAD_REQUEST, MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.createTemplate.error.jsonParseMetadataFields"), ex.getMessage()));
             }
-            return ok(jsonTemplate(execCommand(new CreateInitializedTemplateCommand(createDataverseRequest(getRequestUser(crc)), dataverse, newTemplateDTO))));
+            return ok(jsonTemplate(execCommand(new CreateTemplateCommand(newTemplateDTO.toTemplate(), createDataverseRequest(getRequestUser(crc)), dataverse))));
         } catch (WrappedResponse e) {
             return e.getResponse();
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java
index a11e1aefad9..28e21ffc6c0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java
@@ -1,14 +1,13 @@
 package edu.harvard.iq.dataverse.api.dto;
 
-import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.util.json.JsonParser;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import jakarta.json.*;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.sql.Timestamp;
+import java.util.*;
 
 public class NewTemplateDTO {
 
@@ -24,22 +23,23 @@ public static NewTemplateDTO fromRequestBody(String requestBody, JsonParser json
 
         newTemplateDTO.name = jsonObject.getString("name");
         newTemplateDTO.datasetFields = jsonParser.parseMultipleFields(jsonObject);
-        newTemplateDTO.instructionsMap = parseInstructionsMap(jsonObject);
-        newTemplateDTO.isDefault = jsonObject.getBoolean("isDefault");
+        newTemplateDTO.instructionsMap = parseRequestBodyInstructionsMap(jsonObject);
+        newTemplateDTO.isDefault = jsonObject.getBoolean("isDefault", false);
 
         return newTemplateDTO;
     }
 
-    private static Map<String, String> parseInstructionsMap(JsonObject jsonObject) {
-        Map<String, String> instructionsMap = new HashMap<>();
-        JsonArray instructionsJsonArray = jsonObject.getJsonArray("instructions");
-        for (JsonObject instructionJsonObject : instructionsJsonArray.getValuesAs(JsonObject.class)) {
-            instructionsMap.put(
-                    instructionJsonObject.getString("instructionField"),
-                    instructionJsonObject.getString("instructionText")
-            );
-        }
-        return instructionsMap;
+    public Template toTemplate() {
+        Template template = new Template();
+
+        template.setDatasetFields(getDatasetFields());
+        template.setName(getName());
+        template.setInstructionsMap(getInstructionsMap());
+        template.updateInstructions();
+        template.setCreateTime(new Timestamp(new Date().getTime()));
+        template.setUsageCount(0L);
+
+        return template;
     }
 
     public String getName() {
@@ -57,4 +57,19 @@ public Map<String, String> getInstructionsMap() {
     public boolean isDefault() {
         return isDefault;
     }
+
+    private static Map<String, String> parseRequestBodyInstructionsMap(JsonObject jsonObject) {
+        Map<String, String> instructionsMap = new HashMap<>();
+        JsonArray instructionsJsonArray = jsonObject.getJsonArray("instructions");
+        if (instructionsJsonArray == null) {
+            return null;
+        }
+        for (JsonObject instructionJsonObject : instructionsJsonArray.getValuesAs(JsonObject.class)) {
+            instructionsMap.put(
+                    instructionJsonObject.getString("instructionField"),
+                    instructionJsonObject.getString("instructionText")
+            );
+        }
+        return instructionsMap;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/dto/TermsOfUseAndAccessDTO.java b/src/main/java/edu/harvard/iq/dataverse/api/dto/TermsOfUseAndAccessDTO.java
deleted file mode 100644
index 94cc09a414f..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/api/dto/TermsOfUseAndAccessDTO.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package edu.harvard.iq.dataverse.api.dto;public class TermsOfUseAndAccessDTO {
-}
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateInitializedTemplateCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateInitializedTemplateCommand.java
deleted file mode 100644
index a58bf9fc4fb..00000000000
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateInitializedTemplateCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package edu.harvard.iq.dataverse.engine.command.impl;
-
-import edu.harvard.iq.dataverse.*;
-import edu.harvard.iq.dataverse.api.dto.NewTemplateDTO;
-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.RequiredPermissions;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.settings.JvmSettings;
-import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Creates a template {@link Template} for a {@link Dataverse}.
- * TODO: Proper docs
- */
-@RequiredPermissions(Permission.EditDataverse)
-public class CreateInitializedTemplateCommand extends AbstractCommand<Template> {
-
-    private final Dataverse dataverse;
-    private final NewTemplateDTO newTemplateDTO;
-
-    public CreateInitializedTemplateCommand(DataverseRequest request,
-                                            Dataverse dataverse,
-                                            NewTemplateDTO newTemplateDTO) {
-        super(request, dataverse);
-        this.dataverse = dataverse;
-        this.newTemplateDTO = newTemplateDTO;
-    }
-
-    @Override
-    public Template execute(CommandContext ctxt) throws CommandException {
-        Template template = new Template();
-
-        template.setDataverse(dataverse);
-        template.setDatasetFields(newTemplateDTO.getDatasetFields());
-        template.setMetadataValueBlocks(getSystemMetadataBlocks(ctxt));
-        template.setName(newTemplateDTO.getName());
-        template.setInstructionsMap(newTemplateDTO.getInstructionsMap());
-        template.updateInstructions();
-        template.setCreateTime(new Timestamp(new Date().getTime()));
-        template.setUsageCount(0L);
-
-        updateTermsOfUseAndAccess(ctxt, template);
-        updateDatasetFieldInputLevels(template, ctxt);
-
-        DatasetFieldUtil.tidyUpFields(template.getDatasetFields(), false);
-
-        dataverse.getTemplates().add(template);
-
-        return ctxt.engine().submit(new CreateTemplateCommand(template, getRequest(), dataverse));
-    }
-
-    private static void updateTermsOfUseAndAccess(CommandContext ctxt, Template template) {
-        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-        terms.setFileAccessRequest(true);
-        terms.setTemplate(template);
-        terms.setLicense(ctxt.licenses().getDefault());
-        template.setTermsOfUseAndAccess(terms);
-    }
-
-    private void updateDatasetFieldInputLevels(Template template, CommandContext ctxt) {
-        Long dvIdForInputLevel = this.dataverse.getId();
-        if (!this.dataverse.isMetadataBlockRoot()) {
-            dvIdForInputLevel = this.dataverse.getMetadataRootId();
-        }
-
-        for (DatasetField dsf : template.getFlatDatasetFields()) {
-            DataverseFieldTypeInputLevel inputLevel = ctxt.fieldTypeInputLevels().findByDataverseIdDatasetFieldTypeId(
-                    dvIdForInputLevel,
-                    dsf.getDatasetFieldType().getId()
-            );
-            if (inputLevel != null) {
-                dsf.setInclude(inputLevel.isInclude());
-            } else {
-                dsf.setInclude(true);
-            }
-        }
-    }
-
-    private static List<MetadataBlock> getSystemMetadataBlocks(CommandContext ctxt) {
-        List<MetadataBlock> systemMetadataBlocks = new ArrayList<>();
-        for (MetadataBlock mdb : ctxt.metadataBlocks().listMetadataBlocks()) {
-            JvmSettings.MDB_SYSTEM_KEY_FOR.lookupOptional(mdb.getName()).ifPresent(smdbString -> systemMetadataBlocks.add(mdb));
-        }
-        return systemMetadataBlocks;
-    }
-}
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 03177ee8c1f..7ef117c1b0b 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
@@ -1,7 +1,6 @@
-
 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.*;
 import edu.harvard.iq.dataverse.authorization.Permission;
 
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
@@ -9,25 +8,80 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- *
  * @author skraffmiller
+ * Creates a template {@link Template} for a {@link Dataverse}.
  */
-@RequiredPermissions( Permission.EditDataverse )
+@RequiredPermissions(Permission.EditDataverse)
 public class CreateTemplateCommand extends AbstractCommand<Template> {
-    	private final Template created;
-	private final Dataverse dv;
-	
-	public CreateTemplateCommand(Template template, DataverseRequest aRequest, Dataverse anAffectedDataverse) {
-		super(aRequest, anAffectedDataverse);
-		created = template;
-		dv = anAffectedDataverse;
-	}
-
-	@Override
-	public Template execute(CommandContext ctxt) throws CommandException {
-                
-		return ctxt.templates().save(created);
-	}
-    
+    private final Template template;
+    private final Dataverse dataverse;
+
+    private boolean initialize = false;
+
+    public CreateTemplateCommand(Template template, DataverseRequest request, Dataverse dataverse) {
+        this(template, request, dataverse, false);
+    }
+
+    public CreateTemplateCommand(Template template, DataverseRequest request, Dataverse dataverse, boolean initialize) {
+        super(request, dataverse);
+        this.template = template;
+        this.dataverse = dataverse;
+        this.initialize = initialize;
+    }
+
+    @Override
+    public Template execute(CommandContext ctxt) throws CommandException {
+        if (initialize) {
+            template.setMetadataValueBlocks(getSystemMetadataBlocks(ctxt));
+
+            updateTermsOfUseAndAccess(ctxt, template);
+            updateDatasetFieldInputLevels(template, ctxt);
+
+            DatasetFieldUtil.tidyUpFields(template.getDatasetFields(), false);
+        }
+
+        return ctxt.templates().save(template);
+    }
+
+    private static void updateTermsOfUseAndAccess(CommandContext ctxt, Template template) {
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setFileAccessRequest(true);
+        terms.setTemplate(template);
+        terms.setLicense(ctxt.licenses().getDefault());
+        template.setTermsOfUseAndAccess(terms);
+    }
+
+    private void updateDatasetFieldInputLevels(Template template, CommandContext ctxt) {
+        Long dvIdForInputLevel = this.dataverse.getId();
+        if (!this.dataverse.isMetadataBlockRoot()) {
+            dvIdForInputLevel = this.dataverse.getMetadataRootId();
+        }
+
+        for (DatasetField dsf : template.getFlatDatasetFields()) {
+            DataverseFieldTypeInputLevel inputLevel = ctxt.fieldTypeInputLevels().findByDataverseIdDatasetFieldTypeId(
+                    dvIdForInputLevel,
+                    dsf.getDatasetFieldType().getId()
+            );
+            if (inputLevel != null) {
+                dsf.setInclude(inputLevel.isInclude());
+            } else {
+                dsf.setInclude(true);
+            }
+        }
+    }
+
+    private static List<MetadataBlock> getSystemMetadataBlocks(CommandContext ctxt) {
+        List<MetadataBlock> systemMetadataBlocks = new ArrayList<>();
+        for (MetadataBlock mdb : ctxt.metadataBlocks().listMetadataBlocks()) {
+            JvmSettings.MDB_SYSTEM_KEY_FOR.lookupOptional(mdb.getName()).ifPresent(smdbString -> systemMetadataBlocks.add(mdb));
+        }
+        return systemMetadataBlocks;
+    }
 }

From 59d1d2b5b7a7c4426e82cf0bf67c0bfe490c5b40 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Sun, 29 Jun 2025 23:37:32 +0100
Subject: [PATCH 09/17] Refactor: use final variable

---
 .../iq/dataverse/engine/command/impl/CreateTemplateCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7ef117c1b0b..cf6673e6b3f 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
@@ -23,7 +23,7 @@ public class CreateTemplateCommand extends AbstractCommand<Template> {
     private final Template template;
     private final Dataverse dataverse;
 
-    private boolean initialize = false;
+    private final boolean initialize;
 
     public CreateTemplateCommand(Template template, DataverseRequest request, Dataverse dataverse) {
         this(template, request, dataverse, false);

From 058c5bec0f9eb8931601be6e31d98b218306c720 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 30 Jun 2025 00:41:01 +0100
Subject: [PATCH 10/17] Added: tweaks to CreateTemplateCommand to support
 working initialization

---
 .../java/edu/harvard/iq/dataverse/api/Dataverses.java     | 2 +-
 .../engine/command/impl/CreateTemplateCommand.java        | 1 +
 .../edu/harvard/iq/dataverse/util/json/JsonPrinter.java   | 3 +--
 src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java    | 8 ++++++++
 4 files changed, 11 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 c892c6bc33a..e43b2484b63 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -1956,7 +1956,7 @@ public Response createTemplate(@Context ContainerRequestContext crc, String body
             } 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))));
+            return ok(jsonTemplate(execCommand(new CreateTemplateCommand(newTemplateDTO.toTemplate(), createDataverseRequest(getRequestUser(crc)), dataverse, true))));
         } catch (WrappedResponse e) {
             return e.getResponse();
         }
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 cf6673e6b3f..32c63e55cb4 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
@@ -39,6 +39,7 @@ public CreateTemplateCommand(Template template, DataverseRequest request, Datave
     @Override
     public Template execute(CommandContext ctxt) throws CommandException {
         if (initialize) {
+            template.setDataverse(dataverse);
             template.setMetadataValueBlocks(getSystemMetadataBlocks(ctxt));
 
             updateTermsOfUseAndAccess(ctxt, template);
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index 6f8a8cadde1..b8ab81aa90b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -1527,7 +1527,6 @@ public static JsonObjectBuilder jsonTemplate(Template template) {
     public static JsonObjectBuilder jsonTermsOfUseAndAccess(TermsOfUseAndAccess termsOfUseAndAccess) {
         return jsonObjectBuilder()
                 .add("id", termsOfUseAndAccess.getId())
-                .add("datasetVersion", json(termsOfUseAndAccess.getDatasetVersion(), false)
                 .add("license", json(termsOfUseAndAccess.getLicense()))
                 .add("termsOfUse", termsOfUseAndAccess.getTermsOfUse())
                 .add("termsOfAccess", termsOfUseAndAccess.getTermsOfAccess())
@@ -1542,7 +1541,7 @@ public static JsonObjectBuilder jsonTermsOfUseAndAccess(TermsOfUseAndAccess term
                 .add("originalArchive", termsOfUseAndAccess.getOriginalArchive())
                 .add("availabilityStatus", termsOfUseAndAccess.getAvailabilityStatus())
                 .add("sizeOfCollection", termsOfUseAndAccess.getSizeOfCollection())
-                .add("studyCompletion", termsOfUseAndAccess.getStudyCompletion()));
+                .add("studyCompletion", termsOfUseAndAccess.getStudyCompletion());
     }
 
     public static JsonArrayBuilder jsonTemplateInstructions(Map<String, String> templateInstructions) {
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 979a305af7a..3780b178313 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -4815,4 +4815,12 @@ public static Response updateDatasetFilesMetadata(String datasetIdOrPersistentId
         return given().header(API_TOKEN_HTTP_HEADER, apiToken).contentType(ContentType.JSON).body(jsonArray.toString())
                 .post("/api/datasets/" + idInPath + "/files/metadata" + optionalQueryParam);
     }
+
+    public static Response createTemplate(String dataverseAlias, String jsonString, String apiToken) {
+        return given()
+                .contentType(ContentType.JSON)
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(jsonString)
+                .post("/api/dataverses/" + dataverseAlias + "/templates");
+    }
 }

From 5b18882dd88c964868b0fe496a76242b5308a2c9 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 30 Jun 2025 01:01:36 +0100
Subject: [PATCH 11/17] Added: IT for creating and getting templates

---
 .../iq/dataverse/api/DataversesIT.java        | 87 +++++++++++++++++++
 .../edu/harvard/iq/dataverse/api/UtilIT.java  |  7 ++
 2 files changed, 94 insertions(+)

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 1094935182f..9d9dc788b8f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -2236,4 +2236,91 @@ public void testUpdateInputLevelDisplayOnCreateOverride() {
                 .body("data.inputLevels[0].datasetFieldTypeName", equalTo("subtitle"));
         
     }
+
+    @Test
+    public void testCreateAndGetTemplates() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+
+        Response createSecondUserResponse = UtilIT.createRandomUser();
+        String secondApiToken = UtilIT.getApiTokenFromResponse(createSecondUserResponse);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        // Create a template
+
+        String jsonString = """
+                {
+                  "name": "Dataverse template",
+                  "isDefault": true,
+                  "fields": [
+                    {
+                      "typeName": "author",
+                      "value": [
+                        {
+                          "authorName": {
+                            "typeName": "authorName",
+                            "value": "Belicheck, Bill"
+                          },
+                          "authorAffiliation": {
+                            "typeName": "authorIdentifierScheme",
+                            "value": "ORCID"
+                          }
+                        }
+                      ]
+                    }
+                  ],
+                  "instructions": [
+                    {
+                        "instructionField": "authorName",
+                        "instructionText": "The author name"
+                    }
+                  ]
+                }
+                """;
+
+        Response createTemplateResponse = UtilIT.createTemplate(
+                dataverseAlias,
+                jsonString,
+                apiToken
+        );
+        createTemplateResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.name", equalTo("Dataverse template"))
+                .body("data.usageCount", equalTo(0))
+                .body("data.termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
+                .body("data.datasetFields.citation.fields.size()", equalTo(1))
+                .body("data.instructions.size()", equalTo(1))
+                .body("data.instructions[0].instructionField", equalTo("authorName"))
+                .body("data.instructions[0].instructionText", equalTo("The author name"))
+                .body("data.dataverseAlias", equalTo(dataverseAlias));
+
+        // Template creation should fail if the user lacks dataverse edit permissions
+
+        createTemplateResponse = UtilIT.createTemplate(
+                dataverseAlias,
+                jsonString,
+                secondApiToken
+        );
+        createTemplateResponse.then().assertThat().statusCode(UNAUTHORIZED.getStatusCode());
+
+        // Get templates
+
+        Response getTemplateResponse = UtilIT.getTemplates(dataverseAlias, apiToken);
+        getTemplateResponse.then().assertThat().statusCode(OK.getStatusCode())
+                .body("data.size()", equalTo(1))
+                .body("data[0].name", equalTo("Dataverse template"))
+                .body("data[0].usageCount", equalTo(0))
+                .body("data[0].termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
+                .body("data[0].datasetFields.citation.fields.size()", equalTo(1))
+                .body("data[0].instructions.size()", equalTo(1))
+                .body("data[0].instructions[0].instructionField", equalTo("authorName"))
+                .body("data[0].instructions[0].instructionText", equalTo("The author name"))
+                .body("data[0].dataverseAlias", equalTo(dataverseAlias));
+
+        // Templates retrieval should fail if the user lacks dataverse edit permissions
+        getTemplateResponse = UtilIT.getTemplates(dataverseAlias, secondApiToken);
+        getTemplateResponse.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 3780b178313..79c2b40d910 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -4823,4 +4823,11 @@ public static Response createTemplate(String dataverseAlias, String jsonString,
                 .body(jsonString)
                 .post("/api/dataverses/" + dataverseAlias + "/templates");
     }
+
+    public static Response getTemplates(String dataverseAlias, String apiToken) {
+        return given()
+                .contentType(ContentType.JSON)
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/dataverses/" + dataverseAlias + "/templates");
+    }
 }

From 3a2bc4055530237122d818f1c17cc99b4307be6f Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 30 Jun 2025 02:12:05 +0100
Subject: [PATCH 12/17] Added: CreateTemplateCommandTest

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

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
new file mode 100644
index 00000000000..bf3daa6c593
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/CreateTemplateCommandTest.java
@@ -0,0 +1,142 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.*;
+import edu.harvard.iq.dataverse.license.License;
+import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.settings.JvmSettings;
+import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
+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 edu.harvard.iq.dataverse.util.testing.JvmSetting;
+import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+@LocalJvmSettings
+public class CreateTemplateCommandTest {
+
+    private DataverseRequest dataverseRequestStub;
+
+    @Mock
+    private CommandContext contextMock;
+    @Mock
+    private TemplateServiceBean templateServiceBeanStub;
+    @Mock
+    private MetadataBlockServiceBean metadataBlockServiceBeanMock;
+    @Mock
+    private LicenseServiceBean licenseServiceBeanMock;
+    @Mock
+    private DataverseFieldTypeInputLevelServiceBean fieldTypeInputLevelServiceBeanMock;
+
+    @Spy
+    private Template templateSpy;
+
+    @Mock
+    private Dataverse dataverseMock;
+
+    @BeforeEach
+    public void setUp() {
+        dataverseRequestStub = Mockito.mock(DataverseRequest.class);
+        when(contextMock.templates()).thenReturn(templateServiceBeanStub);
+    }
+
+    @Test
+    public void execute_shouldSaveTemplate_noInitialization() throws CommandException {
+        // Create the command with initialization set to false
+
+        CreateTemplateCommand sut = new CreateTemplateCommand(templateSpy, dataverseRequestStub, dataverseMock, false);
+
+        // Act
+
+        sut.execute(contextMock);
+
+        // Assert
+
+        // Verify that only save was called, and no initialization methods were touched.
+        verify(templateServiceBeanStub).save(templateSpy);
+        verify(templateSpy, never()).setDataverse(any(Dataverse.class));
+        verify(templateSpy, never()).setMetadataValueBlocks(any());
+        verify(templateSpy, never()).setTermsOfUseAndAccess(any());
+    }
+
+    @Test
+    @JvmSetting(key = JvmSettings.MDB_SYSTEM_KEY_FOR, value = "something", varArgs = "citation")
+    public void execute_shouldInitializeAndSaveTemplate_withInitialization() throws CommandException {
+        when(contextMock.metadataBlocks()).thenReturn(metadataBlockServiceBeanMock);
+        when(contextMock.licenses()).thenReturn(licenseServiceBeanMock);
+        when(contextMock.fieldTypeInputLevels()).thenReturn(fieldTypeInputLevelServiceBeanMock);
+
+        when(dataverseMock.getId()).thenReturn(42L);
+        when(dataverseMock.isMetadataBlockRoot()).thenReturn(true);
+
+        // Mock system metadata blocks
+
+        MetadataBlock citationBlock = new MetadataBlock();
+        citationBlock.setName("citation");
+        when(metadataBlockServiceBeanMock.listMetadataBlocks()).thenReturn(List.of(citationBlock));
+
+        // Mock license
+
+        License defaultLicense = new License();
+        defaultLicense.setName("CC0");
+        when(licenseServiceBeanMock.getDefault()).thenReturn(defaultLicense);
+
+        // Mock DatasetFields for input level testing
+
+        DatasetFieldType fieldTypeMock = Mockito.mock(DatasetFieldType.class);
+        Mockito.when(fieldTypeMock.getId()).thenReturn(101L);
+        DatasetField dsf = Mockito.mock(DatasetField.class);
+        Mockito.when(dsf.getDatasetFieldType()).thenReturn(fieldTypeMock);
+        when(templateSpy.getFlatDatasetFields()).thenReturn(Collections.singletonList(dsf));
+
+        // Create the command with initialization set to true
+
+        CreateTemplateCommand sut = new CreateTemplateCommand(templateSpy, dataverseRequestStub, dataverseMock, true);
+
+        // Act
+
+        sut.execute(contextMock);
+
+        // Assert
+
+        // 1. Verify dataverse was set on the template
+        verify(templateSpy).setDataverse(dataverseMock);
+
+        // 2. Verify system metadata blocks were set
+        ArgumentCaptor<List<MetadataBlock>> mdbCaptor = ArgumentCaptor.forClass(List.class);
+        verify(templateSpy).setMetadataValueBlocks(mdbCaptor.capture());
+        assertEquals(1, mdbCaptor.getValue().size());
+        assertEquals("citation", mdbCaptor.getValue().get(0).getName());
+
+        // 3. Verify TermsOfUseAndAccess were created and set correctly
+        ArgumentCaptor<TermsOfUseAndAccess> termsCaptor = ArgumentCaptor.forClass(TermsOfUseAndAccess.class);
+        verify(templateSpy).setTermsOfUseAndAccess(termsCaptor.capture());
+        TermsOfUseAndAccess capturedTerms = termsCaptor.getValue();
+        assertTrue(capturedTerms.isFileAccessRequest());
+        assertEquals("CC0", capturedTerms.getLicense().getName());
+
+        // 4. Verify DatasetFieldInputLevels were checked
+        verify(fieldTypeInputLevelServiceBeanMock).findByDataverseIdDatasetFieldTypeId(42L, 101L);
+
+        // 5. Verify fields were tidied up
+        DatasetFieldUtil.tidyUpFields(templateSpy.getDatasetFields(), false);
+
+        // 6. Finally, verify the fully initialized template was saved
+        verify(templateServiceBeanStub).save(templateSpy);
+    }
+}

From 1efcc34094876f6b295a28169fd948414d1783b6 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 30 Jun 2025 02:16:55 +0100
Subject: [PATCH 13/17] Fixed: IT testCreateAndGetTemplates params

---
 .../edu/harvard/iq/dataverse/api/DataversesIT.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 41f01ec1c4e..859f949209c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -2320,8 +2320,8 @@ public void testCreateAndGetTemplates() {
                   ],
                   "instructions": [
                     {
-                        "instructionField": "authorName",
-                        "instructionText": "The author name"
+                        "instructionField": "author",
+                        "instructionText": "The author data"
                     }
                   ]
                 }
@@ -2338,8 +2338,8 @@ public void testCreateAndGetTemplates() {
                 .body("data.termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
                 .body("data.datasetFields.citation.fields.size()", equalTo(1))
                 .body("data.instructions.size()", equalTo(1))
-                .body("data.instructions[0].instructionField", equalTo("authorName"))
-                .body("data.instructions[0].instructionText", equalTo("The author name"))
+                .body("data.instructions[0].instructionField", equalTo("author"))
+                .body("data.instructions[0].instructionText", equalTo("The author data"))
                 .body("data.dataverseAlias", equalTo(dataverseAlias));
 
         // Template creation should fail if the user lacks dataverse edit permissions
@@ -2361,8 +2361,8 @@ public void testCreateAndGetTemplates() {
                 .body("data[0].termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
                 .body("data[0].datasetFields.citation.fields.size()", equalTo(1))
                 .body("data[0].instructions.size()", equalTo(1))
-                .body("data[0].instructions[0].instructionField", equalTo("authorName"))
-                .body("data[0].instructions[0].instructionText", equalTo("The author name"))
+                .body("data[0].instructions[0].instructionField", equalTo("author"))
+                .body("data[0].instructions[0].instructionText", equalTo("The author data"))
                 .body("data[0].dataverseAlias", equalTo(dataverseAlias));
 
         // Templates retrieval should fail if the user lacks dataverse edit permissions

From 12c9ba36c75807241afc4d7747e70ba2ebb3929f Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Tue, 1 Jul 2025 00:28:31 +0100
Subject: [PATCH 14/17] Added: docs for listing templates

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

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 93be046b83b..8741d17aa99 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -1400,6 +1400,25 @@ 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/access/dataverseFeaturedItemImage/1"
 
+List Templates of a Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Lists the templates for a given Dataverse collection ``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}/templates"
+
+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/templates"
+
 Datasets
 --------
 

From ca526ad660ef4cc1a047f3b09d3ae3b78a0d751f Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Tue, 1 Jul 2025 00:41:24 +0100
Subject: [PATCH 15/17] Added: docs for dataverse template creation

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

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 8741d17aa99..e702f9091c2 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -1419,6 +1419,27 @@ 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"
 
+Create a Template for a Collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Creates a template for a given Dataverse collection ``id``.
+
+To create the template, you must send a JSON file. Your JSON file might look like :download:`dataverse-template.json <../_static/api/dataverse-template.json>` which you would send to the Dataverse installation like this:
+
+.. 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 POST "$SERVER_URL/api/dataverses/{ID}/templates" --upload-file dataverse-template.json
+
+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 POST "https://demo.dataverse.org/api/dataverses/1/templates" --upload-file dataverse-template.json
+
 Datasets
 --------
 

From 80f7afbf9ed9664e6af28269cda88d468229783a Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Tue, 1 Jul 2025 00:42:03 +0100
Subject: [PATCH 16/17] Added: dataverse template json payload file example

---
 .../_static/api/dataverse-template.json       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 doc/sphinx-guides/source/_static/api/dataverse-template.json

diff --git a/doc/sphinx-guides/source/_static/api/dataverse-template.json b/doc/sphinx-guides/source/_static/api/dataverse-template.json
new file mode 100644
index 00000000000..373d3edefa7
--- /dev/null
+++ b/doc/sphinx-guides/source/_static/api/dataverse-template.json
@@ -0,0 +1,27 @@
+{
+  "name": "Dataverse template",
+  "isDefault": true,
+  "fields": [
+    {
+      "typeName": "author",
+      "value": [
+        {
+          "authorName": {
+            "typeName": "authorName",
+            "value": "Belicheck, Bill"
+          },
+          "authorAffiliation": {
+            "typeName": "authorIdentifierScheme",
+            "value": "ORCID"
+          }
+        }
+      ]
+    }
+  ],
+  "instructions": [
+    {
+      "instructionField": "author",
+      "instructionText": "The author data"
+    }
+  ]
+}

From 970e9542289a4e77acba8b829b5de43eb717beab Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Tue, 1 Jul 2025 00:44:43 +0100
Subject: [PATCH 17/17] Added: release notes for #11562

---
 doc/release-notes/11562-templates-api.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/release-notes/11562-templates-api.md

diff --git a/doc/release-notes/11562-templates-api.md b/doc/release-notes/11562-templates-api.md
new file mode 100644
index 00000000000..30e35687a33
--- /dev/null
+++ b/doc/release-notes/11562-templates-api.md
@@ -0,0 +1,4 @@
+New endpoints have been implemented in the Dataverses API for the management of dataverse templates:
+
+- POST `/dataverses/{id}/templates`: Creates a template for a given Dataverse collection ``id``.
+- GET `/dataverses/{id}/templates`: Lists the templates for a given Dataverse collection ``id``.