#10476 fix DataversesIT

sekmiller · sekmiller · commit 56cfa92c42f0 · 2025-03-12T16:42:33.000-04:00
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
@@ -675,18 +675,21 @@ public static JsonObjectBuilder json(MetadataBlock metadataBlock, boolean printO
             if (!datasetFieldType.isChild()) {
                 Boolean fieldDisplayOnCreate = datasetFieldType.isDisplayOnCreate();
                 Boolean fieldRequired = datasetFieldType.isRequired();
+                Boolean fieldExcludedDisplayOnCreateCollection = false;
+                Boolean fieldIncludedDisplayOnCreateCollection = false;
                 Boolean fieldExcludedCollection = false;
-                Boolean fieldIncludedCollection = false;
+                
                 if (ownerDataverse != null){
                     DataverseFieldTypeInputLevel custom = datasetFieldInputLevelService.findByDataverseIdDatasetFieldTypeId(ownerDataverse.getId(), datasetFieldType.getId() );
                     if(custom != null){
-                        fieldIncludedCollection = custom.isDisplayOnCreate();
-                        fieldExcludedCollection = !custom.isDisplayOnCreate();
+                        fieldIncludedDisplayOnCreateCollection = custom.isDisplayOnCreate();
+                        fieldExcludedDisplayOnCreateCollection = !custom.isDisplayOnCreate();
+                        fieldExcludedCollection = !custom.isInclude();
                     }
                 }
                         
-                if (!printOnlyDisplayedOnCreateDatasetFieldTypes || (fieldDisplayOnCreate != null && fieldDisplayOnCreate && !fieldExcludedCollection)
-                        || fieldRequired || fieldIncludedCollection ) {
+                if ((!printOnlyDisplayedOnCreateDatasetFieldTypes && !fieldExcludedCollection) || (fieldDisplayOnCreate != null && fieldDisplayOnCreate && !fieldExcludedDisplayOnCreateCollection)
+                        || fieldRequired || fieldIncludedDisplayOnCreateCollection ) {
                     fieldsBuilder.add(datasetFieldType.getName(), json(datasetFieldType, ownerDataverse));
                 }
             }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -1082,7 +1082,7 @@ public void testListMetadataBlocks() {
 
         // notesText has displayOnCreate=true but has include=false, so should not be retrieved
         String notesTextCitationMetadataField = listMetadataBlocksResponse.then().extract().path(String.format("data[%d].fields.notesText.name", citationMetadataBlockIndex));
-        assertNotNull(notesTextCitationMetadataField);
+        assertNull(notesTextCitationMetadataField);
 
         // producerName is a conditionally required field, so should not be retrieved
         String producerNameCitationMetadataField = listMetadataBlocksResponse.then().extract().path(String.format("data[%d].fields.producerName.name", citationMetadataBlockIndex));
