Merge pull request #112 from GreenmaskIO/fix/naoise_date_validation

fix: Fixes in NoiseData transformer
GreenmaskIO · May 14, 2024 · 08b780d · 08b780d
2 parents eb92581 + c1baf2f
commit 08b780d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/internal/db/postgres/transformers/noise_date.go b/internal/db/postgres/transformers/noise_date.go
@@ -47,13 +47,14 @@ var NoiseDateTransformerDefinition = utils.NewTransformerDefinition(
 
 	toolkit.MustNewParameterDefinition(
 		"min_ratio",
-		"min random duration for noise",
+		"min random duration for noise. Dy default 5% of the max_ratio",
 	).SetCastDbType("interval"),
 
 	toolkit.MustNewParameterDefinition(
 		"max_ratio",
-		"max random duration for noise. Dy default 5% of the max_ratio",
-	).SetCastDbType("interval"),
+		"max random duration for noise",
+	).SetRequired(true).
+		SetCastDbType("interval"),
 
 	toolkit.MustNewParameterDefinition(
 		"min",
@@ -170,7 +171,7 @@ func NewNoiseDateTransformerBase(ctx context.Context, driver *toolkit.Driver, pa
 	}
 
 	warn := validateIntervalValue(maxRatio)
-	if warns != nil {
+	if warn != nil {
 		warn.AddMeta("ParameterName", "max_ratio")
 		warns = append(warns, warn)
 	}
@@ -187,7 +188,7 @@ func NewNoiseDateTransformerBase(ctx context.Context, driver *toolkit.Driver, pa
 			return nil, nil, fmt.Errorf("unable to scan \"max_ratio\" param: %w", err)
 		}
 		warn = validateIntervalValue(minRatio)
-		if warns != nil {
+		if warn != nil {
 			warn.AddMeta("ParameterName", "min_ratio")
 			warns = append(warns, warn)
 		}

diff --git a/internal/db/postgres/transformers/random_date.go b/internal/db/postgres/transformers/random_date.go
@@ -251,7 +251,8 @@ func validateDateTruncationParameterValue(p *toolkit.ParameterDefinition, v tool
 			toolkit.NewValidationWarning().
 				SetSeverity(toolkit.ErrorValidationSeverity).
 				AddMeta("ParameterValue", string(v)).
-				SetMsg("wrong truncation part value: must be one of nano, second, minute, hour, day, month, year"),
+				AddMeta("AllowedValues", truncateParts).
+				SetMsg("wrong truncation part value"),
 		}, nil
 	}
 	return nil, nil