data is a integer in seconds(#16)

* data is a integer in seconds Change-Id: Id66503d4338df79f7f4eb7534db14127aa8ba328 Signed-off-by: mtlljm <[email protected]>
sassoftware · Nov 19, 2024 · 4872006 · 4872006
1 parent d737e85
commit 4872006
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/internal/esp/client/espwsclient.go b/internal/esp/client/espwsclient.go
@@ -455,6 +455,9 @@ func parseFieldValue(rawValue any, sub *subscription, schemaType field.SchemaTyp
 	case field.Timestamp:
 		signed := int64(rawValue.(uint64))
 		fieldValue = time.UnixMicro(signed)
+	case field.Date:
+		signed := int64(rawValue.(uint64))
+		fieldValue = time.Unix(signed, 0)
 	default:
 		fieldValue = rawValue
 	}
@@ -497,6 +500,14 @@ func parseJsonFieldValue(rawValue any, schemaType field.SchemaType) any {
 		}
 
 		fieldValue = time.UnixMicro(fieldValueInt)
+	case field.Date:
+		fieldValueInt, err := strconv.ParseInt(fieldValueString, 10, 64)
+		if err != nil {
+			log.DefaultLogger.Error(fmt.Sprintf("Cannot convert field value to type timestamp: %s", fieldValueString))
+			panic(err)
+		}
+
+		fieldValue = time.Unix(fieldValueInt, 0)
 	default:
 		err := fmt.Errorf("unsupported field type %d", schemaType)
 		log.DefaultLogger.Error(err.Error())
@@ -543,6 +554,11 @@ func (espWsClient *EspWsClient) validateField(name string, value any, sub *subsc
 		case uint64:
 			return nil
 		}
+	case field.Date:
+		switch value.(type) {
+		case uint64:
+			return nil
+		}
 	default:
 		err := fmt.Errorf("unexpected schema field type %v", fieldType)
 		log.DefaultLogger.Error(err.Error())

diff --git a/internal/esp/field/field.go b/internal/esp/field/field.go
@@ -37,6 +37,7 @@ const (
 	Int
 	Timestamp
 	String
+	Date
 )
 
 var (
@@ -45,7 +46,7 @@ var (
 		"array(i32)": Array,
 		"array(i64)": Array,
 		"blob":       Blob,
-		"date":       String,
+		"date":       Date,
 		"double":     Double,
 		"int32":      Int,
 		"int64":      Int,