#11912 fix tests for name only update

Author: sekmiller

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

@@ -2040,15 +2040,16 @@ public Response updateTemplateMetadata(@Context ContainerRequestContext crc, Str
         try {
             Template template = findTemplateOrDie(templateId);
             Dataverse dataverse = template.getDataverse();
-      
+            boolean nameOnly = false;
             JsonObject json = JsonUtil.getJsonObject(body);
 
             /*
             You can also set a new name for your template in the json
             */
 
             if (json.containsKey("name") && !json.getString("name").isBlank()) {
-                 template.setName(json.getString("name"));                
+                 template.setName(json.getString("name"));
+                 nameOnly=true;
             }
 
 
@@ -2061,10 +2062,21 @@ public Response updateTemplateMetadata(@Context ContainerRequestContext crc, Str
                 }
             } else {
                 updatedFields = jsonParser().parseMultipleFields(json, replaceData);
-            }
+            }          
 
             Map<String, String> instructionsMap = jsonParser().parseRequestBodyInstructionsMap(json);
 
+            
+            //if we're only updating the name then return the metadata and instructions to previous            
+            nameOnly = nameOnly && updatedFields.isEmpty() && instructionsMap==null;
+            
+            if (nameOnly){
+                updatedFields = template.getDatasetFields();
+                instructionsMap = template.getInstructionsMap();
+            }
+            
+
+            
             Template updated = execCommand(new UpdateTemplateFieldsCommand(template, dataverse,  updatedFields, instructionsMap, replaceData, createDataverseRequest(getRequestUser(crc))));
 
             return created("/dataverses/template/" + updated.getId(), jsonTemplate(updated));

src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateTemplateFieldsCommand.java

@@ -69,6 +69,12 @@ public Template execute(CommandContext ctxt) throws CommandException {
      * @param template The template to update with the new fields.
      */
     private void updateTemplateFields(Template template) {
+        
+        //if it's empty then empty out the list
+        if (updatedFields.isEmpty()) {
+            template.setDatasetFields(updatedFields);
+        }
+        
         for (DatasetField updatedField : updatedFields) {
             boolean found = false;
 
@@ -168,12 +174,17 @@ private void updateInstructions(Template template){
             template.updateInstructions();
         } else {
             Map <String, String> currentInstructionsMap = template.getInstructionsMap();            
-            Map<String, String> merged = new HashMap<>(currentInstructionsMap);
-            if(instructions != null){
+            Map <String, String> merged = new HashMap<>(currentInstructionsMap);
+            if (instructions != null) {
                 merged.putAll(instructions);
+                template.setInstructionsMap(merged);
+
+            } else {
+                template.getInstructionsMap().clear();
             }
-            template.setInstructionsMap(merged);
-            template.updateInstructions();           
+            
+            template.updateInstructions();
+          
         }       
     }
 

src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java

@@ -2903,6 +2903,27 @@ public void testUpdateTemplates() throws JsonParseException  {
                             }
                             """;
 
+                String jsonStringForFieldsOnly = """
+                            {
+                              "fields": [
+                                {
+                                  "typeName": "author",
+                                  "value": [
+                                    {
+                                        "authorName": {
+                                            "typeName": "authorName",
+                                            "value": "Brady, Tom"
+                                        },
+                                        "authorAffiliation": {
+                                            "typeName": "authorIdentifierScheme",
+                                            "value": "ORCID"
+                                        }
+                                    }
+                                  ]
+                                }
+                              ]
+                            }
+                            """;
 
         String jsonStringForUpdateReplaceData = """
                             {
@@ -3037,7 +3058,7 @@ public void testUpdateTemplates() throws JsonParseException  {
                 .body("data.name", equalTo("Dataverse template - edited"))
                 .body("data.usageCount", equalTo(0))
                 .body("data.termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
-                .body("data.datasetFields.citation.fields.size()", equalTo(1))
+                .body("data.datasetFields.size()", equalTo(0))
                 .body("data.instructions.flatten().size()", equalTo(2))
                 .body("data.dataverseAlias", equalTo(dataverseAlias));
 
@@ -3049,10 +3070,22 @@ public void testUpdateTemplates() throws JsonParseException  {
                 .body("data.name", equalTo("Template - Just Name"))
                 .body("data.usageCount", equalTo(0))
                 .body("data.termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
-                .body("data.datasetFields.citation.fields.size()", equalTo(1))
+                .body("data.datasetFields.size()", equalTo(0))
                 .body("data.instructions.flatten().size()", equalTo(2))
                 .body("data.dataverseAlias", equalTo(dataverseAlias));
 
+        Response updateTemplateUpdateFieldsOnly = UtilIT.updateTemplateMetadata(templateId.toString(), jsonStringForFieldsOnly, apiToken, true);
+        
+        updateTemplateUpdateFieldsOnly.prettyPrint();
+
+        updateTemplateUpdateFieldsOnly.then().assertThat().statusCode(CREATED.getStatusCode())
+                .body("data.name", equalTo("Template - Just Name"))
+                .body("data.usageCount", equalTo(0))
+                .body("data.termsOfUseAndAccess.license.name", equalTo("CC0 1.0"))
+                .body("data.datasetFields.size()", equalTo(1))
+                .body("data.instructions.flatten().size()", equalTo(2))
+                .body("data.dataverseAlias", equalTo(dataverseAlias));        
+        
         //Update Template License
                 // Test case 1: Update to a valid, predefined license (CC BY 4.0).
         Response updateLicenseResponse = UtilIT.updateTemplateLicenseTerms(templateId.toString(), "{ \"name\": \"CC BY 4.0\" }", apiToken);