fix freshness check parsing

Author: sholokhov

adapters/clickhouse_adapter_test.go

@@ -81,8 +81,8 @@ func TestClickhouseAdapter_InterpretDataQualityCheck(t *testing.T) {
 		{
 			name: "freshness check",
 			check: &dbqcore.DataQualityCheck{
-				Expression:  "freshness(last_updated) < 3600",
-				ParsedCheck: createMockParsedCheck("freshness", []string{"last_updated"}, "<", 3600),
+				Expression:  "freshness(last_updated) < 1h",
+				ParsedCheck: createMockParsedCheck("freshness", []string{"last_updated"}, "<", "1h"),
 			},
 			dataset:     "products",
 			whereClause: "",

adapters/mysql_adapter_test.go

@@ -81,8 +81,8 @@ func TestMySQLAdapter_InterpretDataQualityCheck(t *testing.T) {
 		{
 			name: "freshness check with TIMESTAMPDIFF",
 			check: &dbqcore.DataQualityCheck{
-				Expression:  "freshness(last_updated) < 3600",
-				ParsedCheck: createMockParsedCheck("freshness", []string{"last_updated"}, "<", 3600),
+				Expression:  "freshness(last_updated) < 1h",
+				ParsedCheck: createMockParsedCheck("freshness", []string{"last_updated"}, "<", "1h"),
 			},
 			dataset:     "products",
 			whereClause: "",

adapters/postgresql_adapter_test.go

@@ -81,8 +81,8 @@ func TestPostgreSQLAdapter_InterpretDataQualityCheck(t *testing.T) {
 		{
 			name: "freshness check with EXTRACT and EPOCH",
 			check: &dbqcore.DataQualityCheck{
-				Expression:  "freshness(last_updated) < 3600",
-				ParsedCheck: createMockParsedCheck("freshness", []string{"last_updated"}, "<", 3600),
+				Expression:  "freshness(last_updated) < 1h",
+				ParsedCheck: createMockParsedCheck("freshness", []string{"last_updated"}, "<", "1h"),
 			},
 			dataset:     "products",
 			whereClause: "",

dbq_validator.go

@@ -349,10 +349,9 @@ func (d DbqDataValidatorImpl) convertToFloat64(value interface{}) (float64, erro
 	case uint64:
 		return float64(v), nil
 	case string:
-		return strconv.ParseFloat(v, 64)
+		return d.tryParseTimeDurationOrFloat(v)
 	case []byte:
-		// Handle byte arrays from PostgreSQL/MySQL drivers
-		return strconv.ParseFloat(string(v), 64)
+		return d.tryParseTimeDurationOrFloat(string(v))
 	default:
 		return 0, fmt.Errorf("unsupported type: %T", value)
 	}
@@ -388,9 +387,38 @@ func (d DbqDataValidatorImpl) convertToInt(value interface{}) (int, error) {
 	case string:
 		return strconv.Atoi(v)
 	case []byte:
-		// Handle byte arrays from PostgreSQL/MySQL drivers
 		return strconv.Atoi(string(v))
 	default:
 		return 0, fmt.Errorf("unsupported type: %T", value)
 	}
 }
+
+// tryParseTimeDurationOrFloat parses time duration strings like "3d", "1h", "30m", "45s" into seconds or fallbacks to plain float parsing
+func (d DbqDataValidatorImpl) tryParseTimeDurationOrFloat(duration string) (float64, error) {
+	if len(duration) < 2 {
+		return strconv.ParseFloat(duration, 64) // Fallback to regular number parsing
+	}
+
+	// number and unit
+	numStr := duration[:len(duration)-1]
+	unit := duration[len(duration)-1:]
+
+	num, err := strconv.ParseFloat(numStr, 64)
+	if err != nil {
+		return strconv.ParseFloat(duration, 64) // Fallback to regular number parsing
+	}
+
+	switch unit {
+	case "s": // seconds
+		return num, nil
+	case "m": // minutes
+		return num * 60, nil
+	case "h": // hours
+		return num * 3600, nil
+	case "d": // days
+		return num * 86400, nil // 24 * 60 * 60
+	default:
+		// unit is not recognized, fallback to regular number parsing
+		return strconv.ParseFloat(duration, 64)
+	}
+}

dbq_validator_integration_test.go

@@ -98,29 +98,29 @@ func TestDbqDataValidator_RunCheck_Integration(t *testing.T) {
 			expectedPass: false,
 		},
 		{
-			name: "freshness < 3600 - pass",
+			name: "freshness < 1h - pass",
 			check: &DataQualityCheck{
-				Expression: "freshness(last_updated) < 3600",
+				Expression: "freshness(last_updated) < 1h",
 				ParsedCheck: &CheckExpression{
 					FunctionName:   "freshness",
 					Operator:       "<",
-					ThresholdValue: 3600,
+					ThresholdValue: "1h",
 				},
 			},
-			queryResult:  1800,
+			queryResult:  1800, // 30 minutes in seconds
 			expectedPass: true,
 		},
 		{
-			name: "freshness < 3600 - fail",
+			name: "freshness < 1h - fail",
 			check: &DataQualityCheck{
-				Expression: "freshness(last_updated) < 3600",
+				Expression: "freshness(last_updated) < 1h",
 				ParsedCheck: &CheckExpression{
 					FunctionName:   "freshness",
 					Operator:       "<",
-					ThresholdValue: 3600,
+					ThresholdValue: "1h",
 				},
 			},
-			queryResult:  7200,
+			queryResult:  7200, // 2 hours in seconds
 			expectedPass: false,
 		},
 	}