Updated validator messages

digdir · Sep 16, 2024 · b53ad95 · b53ad95
1 parent 711fa6d
commit b53ad95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/...rten.Application/Features/V1/EndUser/Dialogs/Queries/Search/SearchDialogQueryValidator.cs b/...rten.Application/Features/V1/EndUser/Dialogs/Queries/Search/SearchDialogQueryValidator.cs
@@ -2,6 +2,7 @@
 using Digdir.Domain.Dialogporten.Application.Common.Extensions.FluentValidation;
 using Digdir.Domain.Dialogporten.Application.Common.Pagination;
 using Digdir.Domain.Dialogporten.Application.Features.V1.Common.Localizations;
+using Digdir.Domain.Dialogporten.Domain.Common;
 using Digdir.Domain.Dialogporten.Domain.Localizations;
 using FluentValidation;
 
@@ -45,8 +46,8 @@ public SearchDialogQueryValidator()
             .When(x => x.ExtendedStatus is not null);
 
         RuleFor(x => x.Process)
-            .Must(x => Uri.IsWellFormedUriString(x, UriKind.Absolute))
-            .WithMessage("{PropertyName} must be a valid URI")
+            .IsValidUri()
+            .MaximumLength(Constants.DefaultMaxUriLength)
             .When(x => x.Process is not null);
 
         RuleForEach(x => x.Status).IsInEnum();

diff --git a/...iceOwner/DialogActivities/Queries/NotificationCondition/NotificationConditionValidator.cs b/...iceOwner/DialogActivities/Queries/NotificationCondition/NotificationConditionValidator.cs
@@ -21,11 +21,12 @@ public NotificationConditionQueryValidator()
         RuleFor(x => x.TransmissionId)
             .NotNull()
             .NotEqual(default(Guid))
-            .When(x => x.ActivityType == DialogActivityType.Values.TransmissionOpened);
+            .When(x => x.ActivityType == DialogActivityType.Values.TransmissionOpened)
+            .WithMessage($"{{PropertyName}} must not be empty when ${nameof(NotificationConditionQuery.ActivityType)} is ${nameof(DialogActivityType.Values.TransmissionOpened)}");
 
         RuleFor(x => x.TransmissionId)
             .Null()
             .When(x => x.ActivityType == DialogActivityType.Values.DialogOpened)
-            .WithMessage($"{{PropertyName}} must be empty when {nameof(NotificationConditionQuery.ActivityType)} is {DialogActivityType.Values.DialogOpened}.");
+            .WithMessage($"{{PropertyName}} must be empty when {nameof(NotificationConditionQuery.ActivityType)} is {nameof(DialogActivityType.Values.DialogOpened)}.");
     }
 }
diff --git a/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs b/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs
@@ -134,8 +134,8 @@ public CreateDialogCommandValidator(
             .SetValidator(activityValidator);
 
         RuleFor(x => x.Process)
-            .Must(x => Uri.IsWellFormedUriString(x, UriKind.Absolute))
-            .WithMessage("{PropertyName} must be a valid absolute URI.")
+            .IsValidUri()
+            .MaximumLength(Constants.DefaultMaxUriLength)
             .When(x => x.Process is not null);
 
         RuleFor(x => x.Process)
@@ -144,8 +144,8 @@ public CreateDialogCommandValidator(
             .When(x => x.PrecedingProcess is not null);
 
         RuleFor(x => x.PrecedingProcess)
-            .Must(x => Uri.IsWellFormedUriString(x, UriKind.Absolute))
-            .WithMessage("{PropertyName} must be a valid absolute URI.")
+            .IsValidUri()
+            .MaximumLength(Constants.DefaultMaxUriLength)
             .When(x => x.PrecedingProcess is not null);
     }
 }