Add back filtration of ignored validators in patch endpoint (#611)

This was erroniously removed in #423 see: https://github.com/Altinn/app-lib-dotnet/commit/56915792556051f50f8bbd73e24590c567e58eda#diff-a7c144cbd45865be3234552[…]a8e42ea7ff099ccb80182d3bL133
Altinn · Apr 24, 2024 · f40c89e · f40c89e
1 parent f6d33be
commit f40c89e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 0 deletions.
diff --git a/src/Altinn.App.Core/Internal/Validation/ValidationService.cs b/src/Altinn.App.Core/Internal/Validation/ValidationService.cs
@@ -138,6 +138,7 @@ public async Task<Dictionary<string, List<ValidationIssue>>> ValidateFormData(In
 
         // Locate the relevant data validator services from normal and keyed services
         var dataValidators = _validatorFactory.GetFormDataValidators(dataType.Id)
+            .Where(dv => ignoredValidators?.Contains(dv.ValidationSource) != true) // Filter out ignored validators
             .Where(dv => previousData is null || dv.HasRelevantChanges(data, previousData))
             .ToArray();
 

diff --git a/test/Altinn.App.Api.Tests/Controllers/DataController_PatchTests.cs b/test/Altinn.App.Api.Tests/Controllers/DataController_PatchTests.cs
@@ -20,6 +20,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit.Abstractions;
+using Altinn.App.Core.Models.Validation;
 
 namespace Altinn.App.Api.Tests.Controllers;
 
@@ -511,4 +512,49 @@ public async Task ValidationIssueSeverity_IsSerializedNumeric()
 
         responseString.Should().Contain("\"severity\":1");
     }
+
+    [Fact]
+    public async Task IgnoredValidators_NotExecuted()
+    {
+        // Common setup
+        _dataProcessorMock.Setup(p => p.ProcessDataWrite(It.IsAny<Instance>(), It.IsAny<Guid?>(), It.IsAny<object>(), It.IsAny<object?>(), null))
+            .Returns((Instance instance, Guid? dataGuid, object skjema, object? existingData, string? language) => Task.CompletedTask)
+            .Verifiable(Times.Exactly(2));
+
+        // Add extra validator that should be ignored
+        _formDataValidatorMock.Setup(fdv => fdv.ValidateFormData(
+            It.IsAny<Instance>(),
+            It.IsAny<DataElement>(),
+            It.IsAny<object>(),
+            It.IsAny<string?>()))
+            .ReturnsAsync(new List<ValidationIssue>
+            {
+                new()
+                {
+                    Severity = ValidationIssueSeverity.Error,
+                    Description = "Ignored validator",
+                }
+            })
+            .Verifiable(Times.Once);
+        _formDataValidatorMock.SetupGet(fdv => fdv.ValidationSource).Returns("ignored");
+        _formDataValidatorMock.SetupGet(fdv => fdv.DataType).Returns("default");
+        _formDataValidatorMock.Setup(fdv => fdv.HasRelevantChanges(It.IsAny<object>(), It.IsAny<object>())).Returns(true);
+
+
+        var patch = new JsonPatch(
+            PatchOperation.Replace(JsonPointer.Create("melding", "name"), JsonNode.Parse("\"Ola Olsen\"")));
+
+        var (_, _, parsedResponse1) = await CallPatchApi<DataPatchResponse>(patch, ["ignored"], HttpStatusCode.OK);
+
+        // Verify that no issues from the ignored validator are present
+        parsedResponse1.ValidationIssues.Should().NotContainKey("ignored");
+
+        var (_, _, parsedResponse2) = await CallPatchApi<DataPatchResponse>(patch, null, HttpStatusCode.OK);
+
+        // Verify that issues from the ignored validator are present
+        parsedResponse2.ValidationIssues.Should().ContainKey("ignored").WhoseValue.Should().ContainSingle().Which.Description.Should().Be("Ignored validator");
+
+        _dataProcessorMock.Verify();
+        _formDataValidatorMock.Verify();
+    }
 }