Handle grouping null dates in DateGroup #928

AtlasOfLivingAustralia · May 1, 2024 · 9a0ebdc · 9a0ebdc
1 parent 6170591
commit 9a0ebdc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/main/groovy/au/org/ala/ecodata/reporting/ReportGroups.groovy b/src/main/groovy/au/org/ala/ecodata/reporting/ReportGroups.groovy
@@ -119,6 +119,7 @@ class ReportGroups {
 
  static class DateGroup extends SinglePropertyGroupingStrategy {
 
+ static final String MISSING_DATE_GROUP_NAME = "Date missing"
  static DateTimeFormatter parser = ISODateTimeFormat.dateTimeNoMillis().withZone(DateTimeZone.default)
  DateTimeFormatter dateFormatter
  List buckets
@@ -157,6 +158,10 @@ class ReportGroups {
  def group(data) {
  def value = propertyAccessor.getPropertyValue(data)
 
+ if (!value) {
+ return MISSING_DATE_GROUP_NAME // Use a special group for null / empty dates.
+ }
+
  int result = bucketIndex(value)
 
  // we put results with an exact date match into the group where the end date of the bucket matches

diff --git a/src/test/groovy/au/org/ala/ecodata/reporting/ReportGroupsSpec.groovy b/src/test/groovy/au/org/ala/ecodata/reporting/ReportGroupsSpec.groovy
@@ -105,6 +105,8 @@ public class ReportGroupsSpec extends Specification {
  ['2014-09-01T00:00:00Z', '2014-10-01T00:00:00Z', '2014-11-01T00:00:00Z'] | '2014-08-13T00:00:00Z' | 'MM-yyyy' | 'Before 09-2014'
  ['2014-09-01T00:00:00Z', '2014-10-01T00:00:00Z', '2014-11-01T00:00:00Z'] | '2014-11-01T00:00:01Z' | 'MM-yyyy' | 'After 10-2014'
  ['2014-10-01T00:00:00Z', '2015-01-01T00:00:00Z', '2015-04-01T00:00:00Z'] | '2014-10-13T00:00:00Z' | 'MM-yyyy' | '10-2014 - 12-2014'
+ ['2014-10-01T00:00:00Z', '2015-01-01T00:00:00Z', '2015-04-01T00:00:00Z'] | null | 'MM-yyyy' | 'Date missing'
+ ['2014-10-01T00:00:00Z', '2015-01-01T00:00:00Z', '2015-04-01T00:00:00Z'] | '' | 'MM-yyyy' | 'Date missing'
 
 
  }