Remove milliseconds for data set dates #823

AtlasOfLivingAustralia · Sep 12, 2023 · a82c2ac · a82c2ac
1 parent 4f30c1b
commit a82c2ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/groovy/au/org/ala/ecodata/paratoo/ParatooProtocolConfig.groovy b/src/main/groovy/au/org/ala/ecodata/paratoo/ParatooProtocolConfig.groovy
@@ -1,5 +1,6 @@
 package au.org.ala.ecodata.paratoo
 
+import au.org.ala.ecodata.DateUtil
 import au.org.ala.ecodata.metadata.PropertyAccessor
 import groovy.util.logging.Slf4j
 
@@ -22,12 +23,19 @@ class ParatooProtocolConfig {
  apiEndpoint ?: defaultEndpoint(surveyId)
  }
 
+ private static String removeMilliseconds(String isoDateWithMillis) {
+ if (!isoDateWithMillis) {
+ return isoDateWithMillis
+ }
+ DateUtil.format(DateUtil.parseWithMilliseconds(isoDateWithMillis))
+ }
+
  String getStartDate(Map surveyData) {
- getProperty(surveyData, startDatePath)
+ removeMilliseconds(getProperty(surveyData, startDatePath))
  }
 
  String getEndDate(Map surveyData) {
- getProperty(surveyData, endDatePath)
+ removeMilliseconds(getProperty(surveyData, endDatePath))
  }
 
  Map getSurveyId(Map surveyData) {

diff --git a/src/test/groovy/au/org/ala/ecodata/paratoo/ParatooProtocolConfigSpec.groovy b/src/test/groovy/au/org/ala/ecodata/paratoo/ParatooProtocolConfigSpec.groovy
@@ -25,7 +25,7 @@ class ParatooProtocolConfigSpec extends Specification {
  ParatooProtocolConfig config = new ParatooProtocolConfig(vegetationMappingConfig)
 
  expect:
- config.getStartDate(surveyData) == '2023-09-08T23:39:00.520Z'
+ config.getStartDate(surveyData) == '2023-09-08T23:39:00Z'
  config.getEndDate(surveyData) == null
  config.getGeoJson(surveyData) == [type:'Point', coordinates:[149.0651536, -35.2592398]]
  }