fix: Check Content for null, use DependentRules, disallow empty local…

…ization values (#413) #375
Altinn · Feb 12, 2024 · 894644a · 894644a
1 parent 669c7a5
commit 894644a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/...ain.Dialogporten.Application/Features/V1/Common/Localizations/LocalizationDtoValidator.cs b/...ain.Dialogporten.Application/Features/V1/Common/Localizations/LocalizationDtoValidator.cs
@@ -21,6 +21,7 @@ public LocalizationDtoValidator(int maximumLength = 255)
         RuleFor(x => x).NotNull();
 
         RuleFor(x => x.Value)
+            .NotEmpty()
             .NotNull()
             .MaximumLength(maximumLength);
 

diff --git a/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs b/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs
@@ -63,13 +63,19 @@ public CreateDialogCommandValidator(
             .IsInEnum();
 
         RuleFor(x => x.Content)
-            .UniqueBy(x => x.Type)
-            .Must(content => DialogContentType.RequiredTypes
-                .All(requiredContent => content
-                    .Select(x => x.Type)
-                    .Contains(requiredContent)))
-            .WithMessage($"Dialog must contain the following content: [{string.Join(", ", DialogContentType.RequiredTypes)}].")
-            .ForEach(x => x.SetValidator(contentValidator));
+            .NotNull()
+            .DependentRules(() =>
+            {
+                RuleFor(x => x.Content)
+                    .UniqueBy(x => x.Type)
+                    .Must(content => DialogContentType.RequiredTypes
+                        .All(requiredContent => content
+                            .Select(x => x.Type)
+                            .Contains(requiredContent)))
+                    .WithMessage("Dialog must contain the following content: " +
+                                 $"[{string.Join(", ", DialogContentType.RequiredTypes)}].")
+                    .ForEach(x => x.SetValidator(contentValidator));
+            });
 
         RuleForEach(x => x.SearchTags)
             .SetValidator(searchTagValidator);

diff --git a/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommandValidator.cs b/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommandValidator.cs
@@ -56,13 +56,19 @@ public UpdateDialogDtoValidator(
             .IsInEnum();
 
         RuleFor(x => x.Content)
-            .UniqueBy(x => x.Type)
-            .Must(content => DialogContentType.RequiredTypes
-                .All(requiredContent => content
-                    .Select(x => x.Type)
-                    .Contains(requiredContent)))
-            .WithMessage($"Dialog must contain the following content: [{string.Join(", ", DialogContentType.RequiredTypes)}].")
-            .ForEach(x => x.SetValidator(contentValidator));
+            .NotNull()
+            .DependentRules(() =>
+            {
+                RuleFor(x => x.Content)
+                    .UniqueBy(x => x.Type)
+                    .Must(content => DialogContentType.RequiredTypes
+                        .All(requiredContent => content
+                            .Select(x => x.Type)
+                            .Contains(requiredContent)))
+                    .WithMessage("Dialog must contain the following content: " +
+                                 $"[{string.Join(", ", DialogContentType.RequiredTypes)}].")
+                    .ForEach(x => x.SetValidator(contentValidator));
+            });
 
         RuleFor(x => x.SearchTags)
             .UniqueBy(x => x.Value, StringComparer.InvariantCultureIgnoreCase)