fix offset (#26)

Co-authored-by: tbal999 <[email protected]>
xiatechs · Nov 29, 2023 · 834811c · 834811c
1 parent 11a33a1
commit 834811c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 27 deletions.
diff --git a/jlib/timeparse/testdata.json b/jlib/timeparse/testdata.json
@@ -35,7 +35,7 @@
    "output_srcTz": "Europe/London",
    "DateDim": {
     "TimeZone": "Europe/London",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "+01:00",
     "YearMonth": 202308,
     "YearWeek": 202330,
     "YearIsoWeek": 202331,
@@ -63,7 +63,7 @@
    "output_srcTz": "Europe/London",
    "DateDim": {
     "TimeZone": "Europe/London",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "+01:00",
     "YearMonth": 202308,
     "YearWeek": 202330,
     "YearIsoWeek": 202331,
@@ -91,7 +91,7 @@
    "output_srcTz": "Europe/London",
    "DateDim": {
     "TimeZone": "Europe/London",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "+01:00",
     "YearMonth": 202308,
     "YearWeek": 202330,
     "YearIsoWeek": 202331,
@@ -119,7 +119,7 @@
    "output_srcTz": "America/New_York",
    "DateDim": {
     "TimeZone": "America/New_York",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "-04:00",
     "YearMonth": 202308,
     "YearWeek": 202330,
     "YearIsoWeek": 202331,
@@ -147,7 +147,7 @@
    "output_srcTz": "Europe/London",
    "DateDim": {
     "TimeZone": "Europe/London",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "+01:00",
     "YearMonth": 202308,
     "YearWeek": 202330,
     "YearIsoWeek": 202331,

diff --git a/jlib/timeparse/testdata_lite.json b/jlib/timeparse/testdata_lite.json
@@ -27,7 +27,7 @@
    "output_srcTz": "Europe/London",
    "DateDim": {
     "TimeZone": "Europe/London",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "+01:00",
     "DateId": "Dates_20230806",
     "DateKey": 20230806,
     "DateTimeKey": 20230806012341000,
@@ -47,7 +47,7 @@
    "output_srcTz": "Europe/London",
    "DateDim": {
     "TimeZone": "Europe/London",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "+01:00",
     "DateId": "Dates_20230806",
     "DateKey": 20230806,
     "DateTimeKey": 20230806002341000,
@@ -67,7 +67,7 @@
    "output_srcTz": "Europe/London",
    "DateDim": {
     "TimeZone": "Europe/London",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "+01:00",
     "DateId": "Dates_20230806",
     "DateKey": 20230806,
     "DateTimeKey": 20230806002341000,
@@ -87,7 +87,7 @@
    "output_srcTz": "America/New_York",
    "DateDim": {
     "TimeZone": "America/New_York",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "-04:00",
     "DateId": "Dates_20230805",
     "DateKey": 20230805,
     "DateTimeKey": 20230805192341000,
@@ -107,7 +107,7 @@
    "output_srcTz": "Europe/London",
    "DateDim": {
     "TimeZone": "Europe/London",
-    "TimeZoneOffset": "+00:00",
+    "TimeZoneOffset": "+01:00",
     "DateId": "Dates_20230806",
     "DateKey": 20230806,
     "DateTimeKey": 20230806002341000,

diff --git a/jlib/timeparse/timeparse.go b/jlib/timeparse/timeparse.go
@@ -3,7 +3,6 @@ package timeparse
 import (
 	"fmt"
 	"strconv"
-	"strings"
 	"time"
 )
 
@@ -109,10 +108,11 @@ func TimeDateDimensions(inputSrcTs, inputSrcFormat, inputSrcTz, requiredTz strin
 	}
 
 	localTimeStamp := localTime.Format("2006-01-02T15:04:05.000-07:00")
+	offsetStr := localTime.Format("-07:00")
 	// construct the date dimension structure
 	dateDim := &DateDim{
 		RawValue:       inputSrcTs,
-		TimeZoneOffset: getOffsetString(localTimeStamp),
+		TimeZoneOffset: offsetStr,
 		YearWeek:       mondayWeek,
 		YearDay:        yearDay,
 		YearIsoWeek:    yearIsoWeekInt,
@@ -135,20 +135,6 @@ func TimeDateDimensions(inputSrcTs, inputSrcFormat, inputSrcTz, requiredTz strin
 	return dateDim, nil
 }
 
-func getOffsetString(input string) string {
-	znegArr := strings.Split(input, "Z-")
-	if len(znegArr) == 2 {
-		return "-" + znegArr[1]
-	}
-
-	zposArr := strings.Split(input, "Z+")
-	if len(zposArr) == 2 {
-		return "+" + zposArr[1]
-	}
-
-	return "+00:00"
-}
-
 func getWeekOfYearString(date time.Time) (int, error) {
 	_, week := date.ISOWeek()
 

diff --git a/jlib/timeparse/timeparselite.go b/jlib/timeparse/timeparselite.go
@@ -84,10 +84,11 @@ func TimeDateDimensionsLite(inputSrcTs, inputSrcFormat, inputSrcTz, requiredTz s
 	}
 
 	localTimeStamp := localTime.Format("2006-01-02T15:04:05.000-07:00")
+	offsetStr := localTime.Format("-07:00")
 	// construct the date dimension structure
 	dateDim := &DateDimLite{
 		RawValue:       inputSrcTs,
-		TimeZoneOffset: getOffsetString(localTimeStamp),
+		TimeZoneOffset: offsetStr,
 		Millis:         int(localTime.UnixMilli()),
 		DateLocal:      localTime.Format("2006-01-02"),
 		TimeZone:       localTime.Location().String(),