From 3836ea4253f4f3cd156f634634e0b805f6189c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Thu, 31 Jul 2025 09:59:31 -0300
Subject: [PATCH 01/16] feat: add isDefault field to JSON output

---
 .../java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java     | 1 +
 1 file changed, 1 insertion(+)

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 592a893083c..d6772561a5f 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
@@ -1569,6 +1569,7 @@ public static JsonObjectBuilder jsonTemplate(Template template) {
         return jsonObjectBuilder()
                 .add("id", template.getId())
                 .add("name", template.getName())
+                .add("isDefault", template.isIsDefaultForDataverse())
                 .add("usageCount", template.getUsageCount())
                 .add("createTime", template.getCreateTime().toString())
                 .add("createDate", template.getCreateDate())

From 42693d24b77c361c861b6691697e1dad608e070b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Thu, 31 Jul 2025 09:59:49 -0300
Subject: [PATCH 02/16] test: assert isDefault property

---
 src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java | 2 ++
 1 file changed, 2 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 3e1a160c9f2..4f9fbae7ffc 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -2335,6 +2335,7 @@ public void testCreateAndGetTemplates() {
         );
         createTemplateResponse.then().assertThat().statusCode(OK.getStatusCode())
                 .body("data.name", equalTo("Dataverse template"))
+                .body("data.isDefault", equalTo(true))
                 .body("data.usageCount", equalTo(0))
                 .body("data.termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
                 .body("data.datasetFields.citation.fields.size()", equalTo(1))
@@ -2358,6 +2359,7 @@ public void testCreateAndGetTemplates() {
         getTemplateResponse.then().assertThat().statusCode(OK.getStatusCode())
                 .body("data.size()", equalTo(1))
                 .body("data[0].name", equalTo("Dataverse template"))
+                .body("data[0].isDefault", equalTo(true))
                 .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))

From 6d2247974baa31194b4859ad4b02a63b4846e137 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Thu, 28 Aug 2025 15:19:04 +0100
Subject: [PATCH 03/16] Fixed: null check in jsonTermsOfUseAndAccess for
 license

---
 .../java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 561b5e73cce..cf2515596b5 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
@@ -1603,9 +1603,10 @@ public static JsonObjectBuilder jsonTemplate(Template template) {
     }
 
     public static JsonObjectBuilder jsonTermsOfUseAndAccess(TermsOfUseAndAccess termsOfUseAndAccess) {
+        License license = termsOfUseAndAccess.getLicense();
         return jsonObjectBuilder()
                 .add("id", termsOfUseAndAccess.getId())
-                .add("license", json(termsOfUseAndAccess.getLicense()))
+                .add("license", license != null ? json(license) : null)
                 .add("termsOfUse", termsOfUseAndAccess.getTermsOfUse())
                 .add("termsOfAccess", termsOfUseAndAccess.getTermsOfAccess())
                 .add("confidentialityDeclaration", termsOfUseAndAccess.getConfidentialityDeclaration())

From 45dfbc73da9b96c53345c525a28ad5e3ca046a62 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Thu, 28 Aug 2025 15:33:41 +0100
Subject: [PATCH 04/16] Added: unit tests for
 JsonPrinter.jsonTermsOfUseAndAccess

---
 .../dataverse/util/json/JsonPrinterTest.java  | 77 +++++++++++++++++--
 1 file changed, 70 insertions(+), 7 deletions(-)

diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
index 36ff11fe4bb..9728ae907b7 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
@@ -7,6 +7,7 @@
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 import edu.harvard.iq.dataverse.dataset.DatasetType;
 import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItem;
+import edu.harvard.iq.dataverse.license.License;
 import edu.harvard.iq.dataverse.mocks.MockDatasetFieldSvc;
 import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
@@ -16,13 +17,7 @@
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonObject;
@@ -485,6 +480,74 @@ public void testDatasetWithNondefaultType() {
         assertEquals(sut, result);
     }
 
+    @Test
+    public void testJsonTermsOfUseAndAccess() {
+        // Setup a test TermsOfUseAndAccess
+        TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
+        termsOfUseAndAccess.setId(1L);
+        termsOfUseAndAccess.setTermsOfUse("Test Terms of Use");
+        termsOfUseAndAccess.setTermsOfAccess("Test Terms of Access");
+        termsOfUseAndAccess.setConfidentialityDeclaration("Test Confidentiality Declaration");
+        termsOfUseAndAccess.setSpecialPermissions("Test Special Permissions");
+        termsOfUseAndAccess.setRestrictions("Test Restrictions");
+        termsOfUseAndAccess.setCitationRequirements("Test Citation Requirements");
+        termsOfUseAndAccess.setDepositorRequirements("Test Depositor Requirements");
+        termsOfUseAndAccess.setConditions("Test Conditions");
+        termsOfUseAndAccess.setDisclaimer("Test Disclaimer");
+        termsOfUseAndAccess.setDataAccessPlace("Test Data Access Place");
+        termsOfUseAndAccess.setOriginalArchive("Test Original Archive");
+        termsOfUseAndAccess.setAvailabilityStatus("Test Availability Status");
+        termsOfUseAndAccess.setSizeOfCollection("Test Size of Collection");
+        termsOfUseAndAccess.setStudyCompletion("Test Study Completion");
+
+        JsonObjectBuilder job = JsonPrinter.jsonTermsOfUseAndAccess(termsOfUseAndAccess);
+        assertNotNull(job);
+        JsonObject jsonObject = job.build();
+
+        // Assert all fields are present and correct
+        assertEquals(termsOfUseAndAccess.getId().longValue(), jsonObject.getJsonNumber("id").longValue());
+        assertEquals(termsOfUseAndAccess.getTermsOfUse(), jsonObject.getString("termsOfUse"));
+        assertEquals(termsOfUseAndAccess.getTermsOfAccess(), jsonObject.getString("termsOfAccess"));
+        assertEquals(termsOfUseAndAccess.getConfidentialityDeclaration(), jsonObject.getString("confidentialityDeclaration"));
+        assertEquals(termsOfUseAndAccess.getSpecialPermissions(), jsonObject.getString("specialPermissions"));
+        assertEquals(termsOfUseAndAccess.getRestrictions(), jsonObject.getString("restrictions"));
+        assertEquals(termsOfUseAndAccess.getCitationRequirements(), jsonObject.getString("citationRequirements"));
+        assertEquals(termsOfUseAndAccess.getDepositorRequirements(), jsonObject.getString("depositorRequirements"));
+        assertEquals(termsOfUseAndAccess.getConditions(), jsonObject.getString("conditions"));
+        assertEquals(termsOfUseAndAccess.getDisclaimer(), jsonObject.getString("disclaimer"));
+        assertEquals(termsOfUseAndAccess.getDataAccessPlace(), jsonObject.getString("dataAccessPlace"));
+        assertEquals(termsOfUseAndAccess.getOriginalArchive(), jsonObject.getString("originalArchive"));
+        assertEquals(termsOfUseAndAccess.getAvailabilityStatus(), jsonObject.getString("availabilityStatus"));
+        assertEquals(termsOfUseAndAccess.getSizeOfCollection(), jsonObject.getString("sizeOfCollection"));
+        assertEquals(termsOfUseAndAccess.getStudyCompletion(), jsonObject.getString("studyCompletion"));
+
+        // Assert license is null
+        assertNull(jsonObject.getJsonObject("license"));
+
+        // Test with a license
+        long testLicenseId = 1L;
+        termsOfUseAndAccess.setLicense(createLicense(testLicenseId));
+        job = JsonPrinter.jsonTermsOfUseAndAccess(termsOfUseAndAccess);
+        assertNotNull(job);
+        jsonObject = job.build();
+        assertFalse(jsonObject.isNull("license"));
+        assertEquals(testLicenseId, jsonObject.getJsonObject("license").getJsonNumber("id").longValue());
+    }
+
+    private License createLicense(long id) {
+        License license = new License();
+        license.setId(id);
+        license.setName("Test License " + id);
+        license.setShortDescription("Short description for license " + id);
+        try {
+            license.setUri(new java.net.URI("http://test.org/" + id));
+        } catch (java.net.URISyntaxException e) {
+            e.printStackTrace();
+        }
+        license.setActive(true);
+        return license;
+    }
+
     private Dataverse createDataverse(long id) {
         Dataverse dataverse = new Dataverse();
         dataverse.setId(id);

From d744bf777c0a0246e746368b1b0dc9c9a544d6c8 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Thu, 28 Aug 2025 15:53:39 +0100
Subject: [PATCH 05/16] Added: unit tests for JsonPrinter.jsonTemplate

---
 .../dataverse/util/json/JsonPrinterTest.java  | 91 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 4 deletions(-)

diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
index 9728ae907b7..e3dcfadeca5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
@@ -18,11 +18,9 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.*;
+import java.util.stream.Collectors;
 
-import jakarta.json.JsonArrayBuilder;
-import jakarta.json.JsonObject;
-import jakarta.json.JsonObjectBuilder;
-import jakarta.json.JsonString;
+import jakarta.json.*;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import org.assertj.core.util.Lists;
@@ -534,6 +532,91 @@ public void testJsonTermsOfUseAndAccess() {
         assertEquals(testLicenseId, jsonObject.getJsonObject("license").getJsonNumber("id").longValue());
     }
 
+    @Test
+    public void testJsonTemplate() {
+        // Setup a test Template
+        Template template = createTemplateWithEmptyFields();
+        JsonObjectBuilder job = JsonPrinter.jsonTemplate(template);
+        assertNotNull(job);
+        JsonObject jsonObject = job.build();
+
+        // Assert all fields are present and correct, skipping the ID since it is not set.
+        assertEquals(template.getName(), jsonObject.getString("name"));
+        assertEquals(template.isIsDefaultForDataverse(), jsonObject.getBoolean("isDefault"));
+        assertEquals(template.getUsageCount().longValue(), jsonObject.getJsonNumber("usageCount").longValue());
+        assertEquals(template.getCreateTime().toString(), jsonObject.getString("createTime"));
+        assertEquals(template.getCreateDate(), jsonObject.getString("createDate"));
+        assertEquals(template.getDataverse().getAlias(), jsonObject.getString("dataverseAlias"));
+
+        // Verify termsOfUseAndAccess field by checking a sub-field
+        JsonObject termsJson = jsonObject.getJsonObject("termsOfUseAndAccess");
+        assertNotNull(termsJson);
+        assertEquals(template.getTermsOfUseAndAccess().getTermsOfUse(), termsJson.getString("termsOfUse"));
+
+        // Verify datasetFields field is an empty JSON object
+        JsonObject datasetFieldsJson = jsonObject.getJsonObject("datasetFields");
+        assertNotNull(datasetFieldsJson);
+        assertTrue(datasetFieldsJson.isEmpty());
+
+        // Verify instructions map properties are correct regardless of order
+        JsonArray instructionsJson = jsonObject.getJsonArray("instructions");
+        assertEquals(2, instructionsJson.size());
+
+        Map<String, String> instructionsMap = instructionsJson.stream()
+                .map(jsonValue -> (JsonObject) jsonValue)
+                .collect(Collectors.toMap(
+                        obj -> obj.getString("instructionField"),
+                        obj -> obj.getString("instructionText")
+                ));
+
+        assertEquals("Enter the author's name here.", instructionsMap.get("author"));
+        assertEquals("Provide a title for the dataset.", instructionsMap.get("title"));
+    }
+
+    private Template createTemplateWithEmptyFields() {
+        // Setup a test Dataverse
+        Dataverse dataverse = new Dataverse();
+        dataverse.setAlias("test-dataverse");
+
+        // Setup a test TermsOfUseAndAccess
+        TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
+        termsOfUseAndAccess.setId(1L);
+        termsOfUseAndAccess.setTermsOfUse("Test Terms of Use");
+        termsOfUseAndAccess.setTermsOfAccess("Test Terms of Access");
+        termsOfUseAndAccess.setConfidentialityDeclaration("Test Confidentiality Declaration");
+        termsOfUseAndAccess.setSpecialPermissions("Test Special Permissions");
+        termsOfUseAndAccess.setRestrictions("Test Restrictions");
+        termsOfUseAndAccess.setCitationRequirements("Test Citation Requirements");
+        termsOfUseAndAccess.setDepositorRequirements("Test Depositor Requirements");
+        termsOfUseAndAccess.setConditions("Test Conditions");
+        termsOfUseAndAccess.setDisclaimer("Test Disclaimer");
+        termsOfUseAndAccess.setDataAccessPlace("Test Data Access Place");
+        termsOfUseAndAccess.setOriginalArchive("Test Original Archive");
+        termsOfUseAndAccess.setAvailabilityStatus("Test Availability Status");
+        termsOfUseAndAccess.setSizeOfCollection("Test Size of Collection");
+        termsOfUseAndAccess.setStudyCompletion("Test Study Completion");
+
+        // Setup a test Template
+        Template template = new Template();
+        template.setName("Test Template");
+        template.setIsDefaultForDataverse(true);
+        template.setUsageCount(5L);
+        template.setCreateTime(new Timestamp(new Date().getTime()));
+        template.setTermsOfUseAndAccess(termsOfUseAndAccess);
+        template.setDataverse(dataverse);
+
+        // Set an empty list of DatasetFields to avoid the loop in jsonByBlocks
+        template.setDatasetFields(new ArrayList<>());
+
+        // Add test instructions map
+        Map<String, String> instructionsMap = Map.of(
+                "author", "Enter the author's name here.",
+                "title", "Provide a title for the dataset."
+        );
+        template.setInstructionsMap(instructionsMap);
+        return template;
+    }
+
     private License createLicense(long id) {
         License license = new License();
         license.setId(id);

From e3460804ba761ed2b00bb665079a815c84e1c8e6 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 1 Sep 2025 10:53:03 +0100
Subject: [PATCH 06/16] Fixed: marking default template in
 ListDataverseTemplatesCommand

---
 .../impl/ListDataverseTemplatesCommand.java      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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 f1104b5af15..467ae25e93e 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
@@ -26,14 +26,22 @@ public ListDataverseTemplatesCommand(DataverseRequest request, Dataverse dataver
 
     @Override
     public List<Template> execute(CommandContext ctxt) throws CommandException {
-        List<Template> templates = new ArrayList<>();
+        List<Template> availableTemplates = new ArrayList<>(dataverse.getTemplates());
 
         if (dataverse.getOwner() != null) {
-            templates.addAll(dataverse.getParentTemplates());
+            availableTemplates.addAll(dataverse.getParentTemplates());
         }
 
-        templates.addAll(dataverse.getTemplates());
+        setDefaultTemplate(availableTemplates);
 
-        return templates;
+        return availableTemplates;
+    }
+
+    private void setDefaultTemplate(List<Template> availableTemplates) {
+        Optional.ofNullable(dataverse.getDefaultTemplate())
+                .map(Template::getId).flatMap(defaultTemplateId -> availableTemplates.stream()
+                        .filter(template -> template.getId().equals(defaultTemplateId))
+                        .findFirst())
+                .ifPresent(template -> template.setIsDefaultForDataverse(true));
     }
 }

From f5bbe9419f4ce31122d1acd1c95a788b98d61d0a Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 1 Sep 2025 11:14:27 +0100
Subject: [PATCH 07/16] Added: extended ListDataverseTemplatesCommand unit
 tests

---
 .../ListDataverseTemplatesCommandTest.java    | 74 ++++++++++++++-
 .../dataverse/util/json/JsonPrinterTest.java  | 47 +---------
 .../util/template/TemplateBuilder.java        | 94 +++++++++++++++++++
 3 files changed, 166 insertions(+), 49 deletions(-)
 create mode 100644 src/test/java/edu/harvard/iq/dataverse/util/template/TemplateBuilder.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
index 94be775cf4f..1d41edde2c9 100644
--- 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
@@ -5,14 +5,18 @@
 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.template.TemplateBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ListDataverseTemplatesCommandTest {
@@ -28,33 +32,36 @@ public void setUp() {
 
     @Test
     public void execute_shouldReturnTemplates_noParent() throws CommandException {
+        // Arrange
         Dataverse dataverseMock = Mockito.mock(Dataverse.class);
-
         Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(testTemplate));
 
         ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
 
+        // Act
         List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
 
+        // Assert
         assertEquals(1, result.size());
         assertEquals(testTemplate, result.get(0));
     }
 
     @Test
     public void execute_shouldReturnTemplates_parentHasTemplates() throws CommandException {
+        // Arrange
         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);
 
+        // Act
         List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
 
+        // Assert
         assertEquals(2, result.size());
         assertTrue(result.contains(testTemplate));
         assertTrue(result.contains(parentTemplate));
@@ -62,18 +69,77 @@ public void execute_shouldReturnTemplates_parentHasTemplates() throws CommandExc
 
     @Test
     public void execute_shouldReturnTemplates_parentHasNoTemplates() throws CommandException {
+        // Arrange
         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);
 
+        // Act
         List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
 
+        // Assert
         assertEquals(1, result.size());
         assertTrue(result.contains(testTemplate));
     }
+
+
+    @Test
+    public void execute_shouldSetDefaultTemplate_whenDefaultIsPresent() throws CommandException {
+        // Arrange
+        String defaultTplName = "defaultTplName";
+        String otherTplName = "otherTplName";
+
+        Template defaultTpl = TemplateBuilder.aTemplate().withName(defaultTplName).isDefault(true).build();
+        Template otherTpl = TemplateBuilder.aTemplate().withName(otherTplName).isDefault(false).build();
+
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Arrays.asList(defaultTpl, otherTpl));
+        Mockito.when(dataverseMock.getDefaultTemplate()).thenReturn(defaultTpl);
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        // Act
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        // Assert
+        assertEquals(2, result.size());
+
+        Template resultDefault = findTemplateByName(result, defaultTplName);
+        assertNotNull(resultDefault, "Default template should be in the list");
+        assertTrue(resultDefault.isIsDefaultForDataverse(),
+                "The template with name " + defaultTplName + " should be marked as default");
+
+        Template resultOther = findTemplateByName(result, otherTplName);
+        assertNotNull(resultOther, "Other template should be in the list");
+        assertFalse(resultOther.isIsDefaultForDataverse(), "The template with name " + otherTplName + " should NOT be marked as default");
+    }
+
+    @Test
+    public void execute_shouldNotSetDefault_whenNoDefaultTemplateExists() throws CommandException {
+        // Arrange
+        testTemplate = TemplateBuilder.aTemplate().isDefault(false).build();
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(testTemplate));
+        Mockito.when(dataverseMock.getDefaultTemplate()).thenReturn(null);
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        // Act
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        // Assert
+        assertEquals(1, result.size());
+        assertFalse(result.get(0).isIsDefaultForDataverse(), "No template should be marked as default");
+    }
+
+    private Template findTemplateByName(List<Template> templates, String name) {
+        return templates.stream()
+                .filter(t -> name.equals(t.getName()))
+                .findFirst()
+                .orElse(null);
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
index e3dcfadeca5..983a1480112 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
@@ -20,6 +20,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import edu.harvard.iq.dataverse.util.template.TemplateBuilder;
 import jakarta.json.*;
 
 import edu.harvard.iq.dataverse.util.BundleUtil;
@@ -535,7 +536,7 @@ public void testJsonTermsOfUseAndAccess() {
     @Test
     public void testJsonTemplate() {
         // Setup a test Template
-        Template template = createTemplateWithEmptyFields();
+        Template template = TemplateBuilder.aTemplate().build();
         JsonObjectBuilder job = JsonPrinter.jsonTemplate(template);
         assertNotNull(job);
         JsonObject jsonObject = job.build();
@@ -573,50 +574,6 @@ public void testJsonTemplate() {
         assertEquals("Provide a title for the dataset.", instructionsMap.get("title"));
     }
 
-    private Template createTemplateWithEmptyFields() {
-        // Setup a test Dataverse
-        Dataverse dataverse = new Dataverse();
-        dataverse.setAlias("test-dataverse");
-
-        // Setup a test TermsOfUseAndAccess
-        TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
-        termsOfUseAndAccess.setId(1L);
-        termsOfUseAndAccess.setTermsOfUse("Test Terms of Use");
-        termsOfUseAndAccess.setTermsOfAccess("Test Terms of Access");
-        termsOfUseAndAccess.setConfidentialityDeclaration("Test Confidentiality Declaration");
-        termsOfUseAndAccess.setSpecialPermissions("Test Special Permissions");
-        termsOfUseAndAccess.setRestrictions("Test Restrictions");
-        termsOfUseAndAccess.setCitationRequirements("Test Citation Requirements");
-        termsOfUseAndAccess.setDepositorRequirements("Test Depositor Requirements");
-        termsOfUseAndAccess.setConditions("Test Conditions");
-        termsOfUseAndAccess.setDisclaimer("Test Disclaimer");
-        termsOfUseAndAccess.setDataAccessPlace("Test Data Access Place");
-        termsOfUseAndAccess.setOriginalArchive("Test Original Archive");
-        termsOfUseAndAccess.setAvailabilityStatus("Test Availability Status");
-        termsOfUseAndAccess.setSizeOfCollection("Test Size of Collection");
-        termsOfUseAndAccess.setStudyCompletion("Test Study Completion");
-
-        // Setup a test Template
-        Template template = new Template();
-        template.setName("Test Template");
-        template.setIsDefaultForDataverse(true);
-        template.setUsageCount(5L);
-        template.setCreateTime(new Timestamp(new Date().getTime()));
-        template.setTermsOfUseAndAccess(termsOfUseAndAccess);
-        template.setDataverse(dataverse);
-
-        // Set an empty list of DatasetFields to avoid the loop in jsonByBlocks
-        template.setDatasetFields(new ArrayList<>());
-
-        // Add test instructions map
-        Map<String, String> instructionsMap = Map.of(
-                "author", "Enter the author's name here.",
-                "title", "Provide a title for the dataset."
-        );
-        template.setInstructionsMap(instructionsMap);
-        return template;
-    }
-
     private License createLicense(long id) {
         License license = new License();
         license.setId(id);
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/template/TemplateBuilder.java b/src/test/java/edu/harvard/iq/dataverse/util/template/TemplateBuilder.java
new file mode 100644
index 00000000000..3c7f0cc21d2
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/util/template/TemplateBuilder.java
@@ -0,0 +1,94 @@
+package edu.harvard.iq.dataverse.util.template;
+
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.Template;
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A Test Data Builder for the Template entity.
+ * <p>
+ * Usage:
+ * {@code Template template = aTemplate().withName("My Test").build();}
+ * {@code Template defaultTemplate = aTemplate().isDefault(true).build();}
+ */
+public final class TemplateBuilder {
+
+    private String name = "Test Template";
+    private boolean isDefaultForDataverse = false;
+    private final Long usageCount = 5L;
+    private final Timestamp createTime = new Timestamp(new Date().getTime());
+    private final Map<String, String> instructionsMap = new HashMap<>(Map.of(
+            "author", "Enter the author's name here.",
+            "title", "Provide a title for the dataset."
+    ));
+
+    private final String dataverseAlias = "test-dataverse";
+    private final String termsOfUse = "Test Terms of Use";
+    private final String termsOfAccess = "Test Terms of Access";
+
+    /**
+     * Entry point for creating a Template.
+     */
+    public static TemplateBuilder aTemplate() {
+        return new TemplateBuilder();
+    }
+
+    /**
+     * Builds the final Template object from the current builder state.
+     */
+    public Template build() {
+        Dataverse dataverse = new Dataverse();
+        dataverse.setAlias(dataverseAlias);
+
+        TermsOfUseAndAccess terms = buildTermsOfUseAndAccess();
+
+        Template template = new Template();
+        template.setName(name);
+        template.setIsDefaultForDataverse(isDefaultForDataverse);
+        template.setUsageCount(usageCount);
+        template.setCreateTime(createTime);
+        template.setInstructionsMap(instructionsMap);
+        template.setDatasetFields(new ArrayList<>());
+
+        template.setDataverse(dataverse);
+        template.setTermsOfUseAndAccess(terms);
+
+        return template;
+    }
+
+    private TermsOfUseAndAccess buildTermsOfUseAndAccess() {
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setId(1L);
+        terms.setTermsOfUse(termsOfUse);
+        terms.setTermsOfAccess(termsOfAccess);
+        terms.setConfidentialityDeclaration("Test Confidentiality Declaration");
+        terms.setSpecialPermissions("Test Special Permissions");
+        terms.setRestrictions("Test Restrictions");
+        terms.setCitationRequirements("Test Citation Requirements");
+        terms.setDepositorRequirements("Test Depositor Requirements");
+        terms.setConditions("Test Conditions");
+        terms.setDisclaimer("Test Disclaimer");
+        terms.setDataAccessPlace("Test Data Access Place");
+        terms.setOriginalArchive("Test Original Archive");
+        terms.setAvailabilityStatus("Test Availability Status");
+        terms.setSizeOfCollection("Test Size of Collection");
+        terms.setStudyCompletion("Test Study Completion");
+        return terms;
+    }
+
+    public TemplateBuilder withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public TemplateBuilder isDefault(boolean isDefault) {
+        this.isDefaultForDataverse = isDefault;
+        return this;
+    }
+}

From 3f9b7f6f13b9ab6126be41a101a95644b439a5ed Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 1 Sep 2025 11:16:09 +0100
Subject: [PATCH 08/16] Changed: minor code format

---
 .../engine/command/impl/ListDataverseTemplatesCommandTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
index 1d41edde2c9..8386d1b7553 100644
--- 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
@@ -110,8 +110,7 @@ public void execute_shouldSetDefaultTemplate_whenDefaultIsPresent() throws Comma
 
         Template resultDefault = findTemplateByName(result, defaultTplName);
         assertNotNull(resultDefault, "Default template should be in the list");
-        assertTrue(resultDefault.isIsDefaultForDataverse(),
-                "The template with name " + defaultTplName + " should be marked as default");
+        assertTrue(resultDefault.isIsDefaultForDataverse(), "The template with name " + defaultTplName + " should be marked as default");
 
         Template resultOther = findTemplateByName(result, otherTplName);
         assertNotNull(resultOther, "Other template should be in the list");

From 166f5faefcb7c919a89bf496ee64d972310166fc Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 1 Sep 2025 14:43:16 +0100
Subject: [PATCH 09/16] Fixed: isTemplateRoot being checked in
 ListDataverseTemplatesCommand

---
 .../impl/ListDataverseTemplatesCommand.java   |  2 +-
 .../ListDataverseTemplatesCommandTest.java    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

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 467ae25e93e..3e7d4664793 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
@@ -28,7 +28,7 @@ public ListDataverseTemplatesCommand(DataverseRequest request, Dataverse dataver
     public List<Template> execute(CommandContext ctxt) throws CommandException {
         List<Template> availableTemplates = new ArrayList<>(dataverse.getTemplates());
 
-        if (dataverse.getOwner() != null) {
+        if (!dataverse.isTemplateRoot() && dataverse.getOwner() != null) {
             availableTemplates.addAll(dataverse.getParentTemplates());
         }
 
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
index 8386d1b7553..5346ff517a9 100644
--- 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
@@ -67,6 +67,31 @@ public void execute_shouldReturnTemplates_parentHasTemplates() throws CommandExc
         assertTrue(result.contains(parentTemplate));
     }
 
+    @Test
+    public void execute_shouldNotIncludeParentTemplates_whenDataverseIsRoot() throws CommandException {
+        // Arrange
+        String parentTemplateName = "parentTemplate";
+        Template parentTemplate = TemplateBuilder.aTemplate().withName(parentTemplateName).build();
+        String childTemplateName = "childTemplateName";
+        Template childTemplate = TemplateBuilder.aTemplate().withName(childTemplateName).build();
+        Dataverse dataverseMock = Mockito.mock(Dataverse.class);
+        Dataverse parentDataverseMock = Mockito.mock(Dataverse.class);
+        Mockito.when(dataverseMock.getTemplates()).thenReturn(Collections.singletonList(childTemplate));
+        Mockito.when(dataverseMock.getParentTemplates()).thenReturn(Collections.singletonList(parentTemplate));
+        Mockito.when(dataverseMock.getOwner()).thenReturn(parentDataverseMock);
+        Mockito.when(dataverseMock.isTemplateRoot()).thenReturn(true);
+
+        ListDataverseTemplatesCommand sut = new ListDataverseTemplatesCommand(dataverseRequestStub, dataverseMock);
+
+        // Act
+        List<Template> result = sut.execute(Mockito.mock(CommandContext.class));
+
+        // Assert
+        assertEquals(1, result.size());
+        assertTrue(result.get(0).getName().equals(childTemplateName));
+    }
+
+
     @Test
     public void execute_shouldReturnTemplates_parentHasNoTemplates() throws CommandException {
         // Arrange

From 8041907c22d1f0687529f31a684d80df5a742ee8 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 1 Sep 2025 14:48:25 +0100
Subject: [PATCH 10/16] Added: release notes for #11703

---
 doc/release-notes/11703-notifications-api-fixes.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/release-notes/11703-notifications-api-fixes.md

diff --git a/doc/release-notes/11703-notifications-api-fixes.md b/doc/release-notes/11703-notifications-api-fixes.md
new file mode 100644
index 00000000000..46f9c2b83a2
--- /dev/null
+++ b/doc/release-notes/11703-notifications-api-fixes.md
@@ -0,0 +1,9 @@
+# Release Notes
+
+## Fixes
+- Added the missing `isDefault` field to the **Get Dataset Templates** API response.
+- Resolved an API **500 error** that occurred when working with templates containing custom license terms.
+- Updated API behavior so templates are **no longer returned from parent dataverses** when the "Include Templates from Root" option is unchecked in the UI.
+- Corrected an issue where the `isDefault` property was always returned as `false` when retrieving a template via the API, even when it was set as default in the UI.  
+
+See #11704

From eeef6096251f50ba16d94d8748b00297e5e68dfa Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Mon, 1 Sep 2025 14:49:47 +0100
Subject: [PATCH 11/16] Added: release note tweak

---
 doc/release-notes/11703-notifications-api-fixes.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/release-notes/11703-notifications-api-fixes.md b/doc/release-notes/11703-notifications-api-fixes.md
index 46f9c2b83a2..d2509022ca0 100644
--- a/doc/release-notes/11703-notifications-api-fixes.md
+++ b/doc/release-notes/11703-notifications-api-fixes.md
@@ -4,6 +4,5 @@
 - Added the missing `isDefault` field to the **Get Dataset Templates** API response.
 - Resolved an API **500 error** that occurred when working with templates containing custom license terms.
 - Updated API behavior so templates are **no longer returned from parent dataverses** when the "Include Templates from Root" option is unchecked in the UI.
-- Corrected an issue where the `isDefault` property was always returned as `false` when retrieving a template via the API, even when it was set as default in the UI.  
 
 See #11704

From e96f1bd0f0996f88776e7061e5bb3ca3e4d43c62 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Tue, 2 Sep 2025 13:16:20 +0100
Subject: [PATCH 12/16] Added: fileAccessRequest field of terms of use and
 access to JsonPrinter

---
 doc/release-notes/11703-notifications-api-fixes.md             | 1 +
 .../java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java   | 3 ++-
 .../edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java    | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/release-notes/11703-notifications-api-fixes.md b/doc/release-notes/11703-notifications-api-fixes.md
index d2509022ca0..7f8547fdc98 100644
--- a/doc/release-notes/11703-notifications-api-fixes.md
+++ b/doc/release-notes/11703-notifications-api-fixes.md
@@ -2,6 +2,7 @@
 
 ## Fixes
 - Added the missing `isDefault` field to the **Get Dataset Templates** API response.
+- Added the missing `fileAccessRequest` field of terms of use and access to the **Get Dataset Templates** API response.
 - Resolved an API **500 error** that occurred when working with templates containing custom license terms.
 - Updated API behavior so templates are **no longer returned from parent dataverses** when the "Include Templates from Root" option is unchecked in the UI.
 
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 cf2515596b5..ebca48a8e76 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
@@ -1620,7 +1620,8 @@ 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())
+                .add("fileAccessRequest", termsOfUseAndAccess.isFileAccessRequest());
     }
 
     public static JsonArrayBuilder jsonTemplateInstructions(Map<String, String> templateInstructions) {
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
index 983a1480112..75dff87769f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
@@ -498,6 +498,7 @@ public void testJsonTermsOfUseAndAccess() {
         termsOfUseAndAccess.setAvailabilityStatus("Test Availability Status");
         termsOfUseAndAccess.setSizeOfCollection("Test Size of Collection");
         termsOfUseAndAccess.setStudyCompletion("Test Study Completion");
+        termsOfUseAndAccess.setFileAccessRequest(true);
 
         JsonObjectBuilder job = JsonPrinter.jsonTermsOfUseAndAccess(termsOfUseAndAccess);
         assertNotNull(job);
@@ -519,6 +520,7 @@ public void testJsonTermsOfUseAndAccess() {
         assertEquals(termsOfUseAndAccess.getAvailabilityStatus(), jsonObject.getString("availabilityStatus"));
         assertEquals(termsOfUseAndAccess.getSizeOfCollection(), jsonObject.getString("sizeOfCollection"));
         assertEquals(termsOfUseAndAccess.getStudyCompletion(), jsonObject.getString("studyCompletion"));
+        assertEquals(termsOfUseAndAccess.isFileAccessRequest(), jsonObject.getBoolean("fileAccessRequest"));
 
         // Assert license is null
         assertNull(jsonObject.getJsonObject("license"));

From 8adc6e1c91504374c95c574511ed482f24c5f50f Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Tue, 2 Sep 2025 14:44:52 +0100
Subject: [PATCH 13/16] Added: contactForAccess field to terms of use and
 access API payload

---
 doc/release-notes/11703-notifications-api-fixes.md              | 1 +
 .../java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java    | 1 +
 .../edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java     | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/doc/release-notes/11703-notifications-api-fixes.md b/doc/release-notes/11703-notifications-api-fixes.md
index 7f8547fdc98..34d303f0d69 100644
--- a/doc/release-notes/11703-notifications-api-fixes.md
+++ b/doc/release-notes/11703-notifications-api-fixes.md
@@ -3,6 +3,7 @@
 ## Fixes
 - Added the missing `isDefault` field to the **Get Dataset Templates** API response.
 - Added the missing `fileAccessRequest` field of terms of use and access to the **Get Dataset Templates** API response.
+- Added the missing `contactForAccess` field of terms of use and access to the **Get Dataset Templates** API response.
 - Resolved an API **500 error** that occurred when working with templates containing custom license terms.
 - Updated API behavior so templates are **no longer returned from parent dataverses** when the "Include Templates from Root" option is unchecked in the UI.
 
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 ebca48a8e76..47b1f2cc77b 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
@@ -1621,6 +1621,7 @@ public static JsonObjectBuilder jsonTermsOfUseAndAccess(TermsOfUseAndAccess term
                 .add("availabilityStatus", termsOfUseAndAccess.getAvailabilityStatus())
                 .add("sizeOfCollection", termsOfUseAndAccess.getSizeOfCollection())
                 .add("studyCompletion", termsOfUseAndAccess.getStudyCompletion())
+                .add("contactForAccess", termsOfUseAndAccess.getContactForAccess())
                 .add("fileAccessRequest", termsOfUseAndAccess.isFileAccessRequest());
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
index 75dff87769f..b0bb3e453a4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
@@ -498,6 +498,7 @@ public void testJsonTermsOfUseAndAccess() {
         termsOfUseAndAccess.setAvailabilityStatus("Test Availability Status");
         termsOfUseAndAccess.setSizeOfCollection("Test Size of Collection");
         termsOfUseAndAccess.setStudyCompletion("Test Study Completion");
+        termsOfUseAndAccess.setContactForAccess("Test Contact for Access");
         termsOfUseAndAccess.setFileAccessRequest(true);
 
         JsonObjectBuilder job = JsonPrinter.jsonTermsOfUseAndAccess(termsOfUseAndAccess);
@@ -520,6 +521,7 @@ public void testJsonTermsOfUseAndAccess() {
         assertEquals(termsOfUseAndAccess.getAvailabilityStatus(), jsonObject.getString("availabilityStatus"));
         assertEquals(termsOfUseAndAccess.getSizeOfCollection(), jsonObject.getString("sizeOfCollection"));
         assertEquals(termsOfUseAndAccess.getStudyCompletion(), jsonObject.getString("studyCompletion"));
+        assertEquals(termsOfUseAndAccess.getContactForAccess(), jsonObject.getString("contactForAccess"));
         assertEquals(termsOfUseAndAccess.isFileAccessRequest(), jsonObject.getBoolean("fileAccessRequest"));
 
         // Assert license is null

From e5c170bb5e0c019ba43e3b8cd912482e35659216 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Wed, 3 Sep 2025 10:55:08 +0100
Subject: [PATCH 14/16] Fixed: InApp notifications API json printer missing
 null check for requestor

---
 .../json/InAppNotificationsJsonPrinter.java   |  8 +++++---
 .../InAppNotificationsJsonPrinterTest.java    | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java
index 9a98f3b8413..f3c3a0383e0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java
@@ -195,9 +195,11 @@ private void addDatasetCreatedFields(final NullSafeJsonBuilder notificationJson,
     }
 
     private void addRequestorFields(final NullSafeJsonBuilder notificationJson, final AuthenticatedUser requestor) {
-        notificationJson.add(KEY_REQUESTOR_FIRST_NAME, requestor.getFirstName());
-        notificationJson.add(KEY_REQUESTOR_LAST_NAME, requestor.getLastName());
-        notificationJson.add(KEY_REQUESTOR_EMAIL, requestor.getEmail());
+        if (requestor != null) {
+            notificationJson.add(KEY_REQUESTOR_FIRST_NAME, requestor.getFirstName());
+            notificationJson.add(KEY_REQUESTOR_LAST_NAME, requestor.getLastName());
+            notificationJson.add(KEY_REQUESTOR_EMAIL, requestor.getEmail());
+        }
     }
 
     private void addDatasetFields(final NullSafeJsonBuilder notificationJson, final UserNotification userNotification) {
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java
index f0b2b9dc3f9..82c6125f6c1 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java
@@ -229,6 +229,26 @@ public void testAddFieldsByType_requestFileAccess() {
         verify(notificationJson).add(KEY_DATAFILE_DISPLAY_NAME, "Test File");
     }
 
+    @Test
+    public void testAddFieldsByType_requestFileAccess_nullRequestor() {
+        userNotification.setType(UserNotification.Type.REQUESTFILEACCESS);
+        userNotification.setObjectId(1L);
+        userNotification.setRequestor(null);
+
+        DataFile dataFile = mock(DataFile.class);
+        when(dataFile.getId()).thenReturn(1L);
+        when(dataFile.getDisplayName()).thenReturn("Test File");
+        when(dataFileService.find(1L)).thenReturn(dataFile);
+
+        sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
+
+        verify(notificationJson, never()).add(eq(KEY_REQUESTOR_FIRST_NAME), anyString());
+        verify(notificationJson, never()).add(eq(KEY_REQUESTOR_LAST_NAME), anyString());
+        verify(notificationJson, never()).add(eq(KEY_REQUESTOR_EMAIL), anyString());
+        verify(notificationJson).add(KEY_DATAFILE_ID, Long.valueOf("1"));
+        verify(notificationJson).add(KEY_DATAFILE_DISPLAY_NAME, "Test File");
+    }
+
     @Test
     public void testAddFieldsByType_grantFileAccess() {
         userNotification.setType(UserNotification.Type.GRANTFILEACCESS);

From 79b21a459513713fb9ee971332bb0ad9a6da7582 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Wed, 3 Sep 2025 10:57:54 +0100
Subject: [PATCH 15/16] Changed: release notes updated

---
 ...xes.md => 11703-notifications-and-templates-api-fixes.md} | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename doc/release-notes/{11703-notifications-api-fixes.md => 11703-notifications-and-templates-api-fixes.md} (80%)

diff --git a/doc/release-notes/11703-notifications-api-fixes.md b/doc/release-notes/11703-notifications-and-templates-api-fixes.md
similarity index 80%
rename from doc/release-notes/11703-notifications-api-fixes.md
rename to doc/release-notes/11703-notifications-and-templates-api-fixes.md
index 34d303f0d69..27e5484cd12 100644
--- a/doc/release-notes/11703-notifications-api-fixes.md
+++ b/doc/release-notes/11703-notifications-and-templates-api-fixes.md
@@ -1,10 +1,13 @@
 # Release Notes
 
-## Fixes
+## Templates API fixes
 - Added the missing `isDefault` field to the **Get Dataset Templates** API response.
 - Added the missing `fileAccessRequest` field of terms of use and access to the **Get Dataset Templates** API response.
 - Added the missing `contactForAccess` field of terms of use and access to the **Get Dataset Templates** API response.
 - Resolved an API **500 error** that occurred when working with templates containing custom license terms.
 - Updated API behavior so templates are **no longer returned from parent dataverses** when the "Include Templates from Root" option is unchecked in the UI.
 
+## Notifications API fixes
+- Fixed API errors caused by NullPointerException when retrieving notifications without a requestor.
+
 See #11704

From 541fd21a2a18254bb720926bee201552f8c5bc31 Mon Sep 17 00:00:00 2001
From: GPortas <hey@gportas.me>
Date: Wed, 3 Sep 2025 12:37:23 +0100
Subject: [PATCH 16/16] Fixed: setting default template in
 CreateTemplateCommand

---
 .../edu/harvard/iq/dataverse/api/dto/NewTemplateDTO.java | 1 +
 .../engine/command/impl/CreateTemplateCommand.java       | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

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 28e21ffc6c0..31adc30f2b9 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
@@ -38,6 +38,7 @@ public Template toTemplate() {
         template.updateInstructions();
         template.setCreateTime(new Timestamp(new Date().getTime()));
         template.setUsageCount(0L);
+        template.setIsDefaultForDataverse(isDefault);
 
         return template;
     }
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 32c63e55cb4..fb5e3534f0e 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
@@ -48,7 +48,14 @@ public Template execute(CommandContext ctxt) throws CommandException {
             DatasetFieldUtil.tidyUpFields(template.getDatasetFields(), false);
         }
 
-        return ctxt.templates().save(template);
+        Template createdTemplate = ctxt.templates().save(template);
+
+        if (initialize && template.isIsDefaultForDataverse()) {
+            dataverse.setDefaultTemplate(createdTemplate);
+            ctxt.em().merge(dataverse);
+        }
+
+        return template;
     }
 
     private static void updateTermsOfUseAndAccess(CommandContext ctxt, Template template) {