OBPIH-6275 Export boolean values as true/false booleans, instead of a… (#4881)

kchelstowski · web-flow · commit 6b73ce64ae4f · 2024-10-09T10:43:39.000+02:00
diff --git a/grails-app/services/org/pih/warehouse/core/DocumentService.groovy b/grails-app/services/org/pih/warehouse/core/DocumentService.groovy
@@ -404,9 +404,11 @@ class DocumentService {
     void createExcelRow(HSSFSheet sheet, int rowNumber, Map dataRow) {
         Row excelRow = sheet.createRow(rowNumber)
         dataRow.keySet().eachWithIndex { columnName, index ->
-            def cellValue = dataRow.get(columnName) ?: ""
-            // POI can't handle objects so we need to convert all objects to strings unless they are numeric
-            if (!(cellValue instanceof Number)) {
+            def actualValue = dataRow.get(columnName)
+            // We can't just check the truthiness of the actualValue, because the false boolean would be evaluated to an empty string
+            def cellValue = actualValue == null ? "" : actualValue
+            // POI can't handle objects so we need to convert all objects to strings unless they are numeric or boolean
+            if (!(cellValue instanceof Number) && !(cellValue instanceof Boolean)) {
                 cellValue = cellValue.toString()
             }
             excelRow.createCell(index).setCellValue(cellValue)
diff --git a/grails-app/services/org/pih/warehouse/data/DataService.groovy b/grails-app/services/org/pih/warehouse/data/DataService.groovy
@@ -702,12 +702,14 @@ class DataService {
                 } else if (element.defaultValue && !value) {
                     value = element.defaultValue
                 }
-                properties[fieldName] = value ?: ""
+                // We can't just check the truthiness of the value, because the false boolean would be evaluated to an empty string
+                properties[fieldName] = value == null ? "" : value
             } else {
                 // to access object value by key we must use the object.get(key) instead of object[key]
                 // because using the object[key] will throw an error when trying to export data using the batch controller
                 value = object.get(element) ?: element.tokenize('.').inject(object) { v, k -> v?."$k" }
-                properties[fieldName] = value ?: ""
+                // We can't just check the truthiness of the value, because the false boolean would be evaluated to an empty string
+                properties[fieldName] = value == null ? "" : value
             }
         }
         return properties

Original file line number	Diff line number	Diff line change
`@@ -702,12 +702,14 @@ class DataService {`
`702`	`702`	`} else if (element.defaultValue && !value) {`
`703`	`703`	`value = element.defaultValue`
`704`	`704`	`}`
`705`		`- properties[fieldName] = value ?: ""`
	`705`	`+ // We can't just check the truthiness of the value, because the false boolean would be evaluated to an empty string`
	`706`	`+ properties[fieldName] = value == null ? "" : value`
`706`	`707`	`} else {`
`707`	`708`	`// to access object value by key we must use the object.get(key) instead of object[key]`
`708`	`709`	`// because using the object[key] will throw an error when trying to export data using the batch controller`
`709`	`710`	`value = object.get(element) ?: element.tokenize('.').inject(object) { v, k -> v?."$k" }`
`710`		`- properties[fieldName] = value ?: ""`
	`711`	`+ // We can't just check the truthiness of the value, because the false boolean would be evaluated to an empty string`
	`712`	`+ properties[fieldName] = value == null ? "" : value`
`711`	`713`	`}`
`712`	`714`	`}`
`713`	`715`	`return properties`