Bugfix that works on standard timezone workstation.

cqframework · Oct 25, 2023 · b715e61 · b715e61
1 parent 682e04e
commit b715e61
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/runtime/DateTime.java b/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/runtime/DateTime.java
@@ -1,9 +1,7 @@
 package org.opencds.cqf.cql.engine.runtime;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
+import java.time.*;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
@@ -128,7 +126,16 @@ else if (i == 6) {
         // Otherwise, parse as a LocalDateTime and then interpret that in the evaluation timezone
 
         if (offset != null) {
-            dateString.append(ZoneOffset.ofHoursMinutes(offset.intValue(), new BigDecimal("60").multiply(offset.remainder(BigDecimal.ONE)).intValue()).getId());
+            final int totalSeconds = ZonedDateTime.now().getOffset().getTotalSeconds();
+            final int totalMinutes = totalSeconds / 60;
+            final int totalMinutesModulo60 = totalMinutes % 60;
+
+            final int minutes = totalMinutesModulo60 == 0
+                    ? new BigDecimal("60").multiply(offset.remainder(BigDecimal.ONE)) .intValue()
+                    : Math.abs(totalMinutesModulo60); // This is for a half hour or 45 minute timezone, such as Newfoundland, Canada
+            dateString.append(ZoneOffset.ofHoursMinutes(offset.intValue(),
+                            minutes)
+                    .getId());
             setDateTime(OffsetDateTime.parse(dateString.toString()));
         }
         else {

diff --git a/Src/java/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlMainSuiteTest.java b/Src/java/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlMainSuiteTest.java
@@ -49,7 +49,6 @@ public void test_cql_timezone_tests() {
         // possible set of expressions from the CQL engine API
         // prior to evaluating them all
 
-        // LUKETODO:  the below CQL file compiles, it just fails here:
         var result = e.evaluate(toElmIdentifier("CqlTimeZoneTestSuite"), evalTime);
 
         for (var entry : result.expressionResults.entrySet()) {