Fix sonar issues and improve test coverage

Altinn · Nov 15, 2024 · 44219c7 · 44219c7
1 parent b0d27c8
commit 44219c7
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 23 deletions.
diff --git a/src/Altinn.App.Core/Features/Validation/Default/ExpressionValidator.cs b/src/Altinn.App.Core/Features/Validation/Default/ExpressionValidator.cs
@@ -51,12 +51,11 @@ IAppMetadata appMetadata
     public bool ShouldRunForTask(string taskId) =>
         _appMetadata
             .GetApplicationMetadata()
-            .Result.DataTypes.Where(dt =>
+            .Result.DataTypes.Any(dt =>
                 dt.TaskId == taskId
                 && dt.AppLogic?.ClassRef is not null
                 && _appResourceService.GetValidationConfiguration(dt.Id) is not null
-            )
-            .Any();
+            );
 
     /// <summary>
     /// This validator has the code "Expression" and this is known by the frontend, who may request this validator to not run for incremental validation.

diff --git a/src/Altinn.App.Core/Features/Validation/Wrappers/DataElementValidatorWrapper.cs b/src/Altinn.App.Core/Features/Validation/Wrappers/DataElementValidatorWrapper.cs
@@ -11,17 +11,11 @@ internal class DataElementValidatorWrapper : IValidator
 {
     private readonly IDataElementValidator _dataElementValidator;
     private readonly string _taskId;
-    private readonly List<DataType> _dataTypes;
 
-    public DataElementValidatorWrapper(
-        IDataElementValidator dataElementValidator,
-        string taskId,
-        List<DataType> dataTypes
-    )
+    public DataElementValidatorWrapper(IDataElementValidator dataElementValidator, string taskId)
     {
         _dataElementValidator = dataElementValidator;
         _taskId = taskId;
-        _dataTypes = dataTypes;
     }
 
     /// <inheritdoc />

diff --git a/src/Altinn.App.Core/Implementation/AppResourcesSI.cs b/src/Altinn.App.Core/Implementation/AppResourcesSI.cs
@@ -499,8 +499,8 @@ private static byte[] ReadFileContentsFromLegalPath(string legalPath, string fil
     public string? GetValidationConfiguration(string dataTypeId)
     {
         using var activity = _telemetry?.StartGetValidationConfigurationActivity();
-        string legalPath = $"{_settings.AppBasePath}{_settings.ModelsFolder}";
-        string filename = $"{legalPath}{dataTypeId}.{_settings.ValidationConfigurationFileName}";
+        string legalPath = Path.Join(_settings.AppBasePath, _settings.ModelsFolder);
+        string filename = Path.Join(legalPath, $"{dataTypeId}.{_settings.ValidationConfigurationFileName}");
         PathHelper.EnsureLegalPath(legalPath, filename);
 
         string? filedata = null;

diff --git a/src/Altinn.App.Core/Internal/Validation/IValidatorFactory.cs b/src/Altinn.App.Core/Internal/Validation/IValidatorFactory.cs
@@ -132,8 +132,7 @@ public IEnumerable<IValidator> GetValidators(string taskId)
         var dataTypes = _appMetadata.GetApplicationMetadata().Result.DataTypes;
 
         validators.AddRange(
-            GetDataElementValidators(taskId, dataTypes)
-                .Select(dev => new DataElementValidatorWrapper(dev, taskId, dataTypes))
+            GetDataElementValidators(taskId, dataTypes).Select(dev => new DataElementValidatorWrapper(dev, taskId))
         );
         validators.AddRange(
             GetFormDataValidators(taskId, dataTypes).Select(fdv => new FormDataValidatorWrapper(fdv, taskId))

diff --git a/test/Altinn.App.Api.Tests/Controllers/ActionsControllerTests.cs b/test/Altinn.App.Api.Tests/Controllers/ActionsControllerTests.cs
@@ -580,7 +580,9 @@ public async Task<UserActionResult> HandleAction(UserActionContext context)
                 );
                 break;
             case "update":
-                var originalDataElement = context.DataMutator.GetDataElementsForType("Scheme").First();
+                var dataType =
+                    context.DataMutator.GetDataType("Scheme") ?? throw new Exception("DataType \"Scheme\" not found");
+                var originalDataElement = context.DataMutator.GetDataElementsForType(dataType).First();
                 var data = await context.DataMutator.GetFormData<Scheme>(originalDataElement);
 
                 data.TestCustomButtonReadOnlyInput = "Her kommer det data fra backend";

diff --git a/...ocessControllerTests.RunProcessNext_FailingValidator_ReturnsValidationErrors.verified.txt b/...ocessControllerTests.RunProcessNext_FailingValidator_ReturnsValidationErrors.verified.txt
@@ -4,6 +4,18 @@
       ActivityName: ApplicationMetadata.Service.GetLayoutModel,
       IdFormat: W3C
     },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutModel,
+      IdFormat: W3C
+    },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutSet,
+      IdFormat: W3C
+    },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutSet,
+      IdFormat: W3C
+    },
     {
       ActivityName: ApplicationMetadata.Service.GetLayoutSet,
       IdFormat: W3C
@@ -28,20 +40,28 @@
       ActivityName: ApplicationMetadata.Service.GetLayoutSets,
       IdFormat: W3C
     },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutSets,
+      IdFormat: W3C
+    },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutSets,
+      IdFormat: W3C
+    },
     {
       ActivityName: ApplicationMetadata.Service.GetLayoutSetsForTask,
       IdFormat: W3C
     },
     {
-      ActivityName: ApplicationMetadata.Service.GetLayoutSettingsForSet,
+      ActivityName: ApplicationMetadata.Service.GetLayoutSetsForTask,
       IdFormat: W3C
     },
     {
-      ActivityName: ApplicationMetadata.Service.GetValidationConfiguration,
+      ActivityName: ApplicationMetadata.Service.GetLayoutSettingsForSet,
       IdFormat: W3C
     },
     {
-      ActivityName: ApplicationMetadata.Service.GetValidationConfiguration,
+      ActivityName: ApplicationMetadata.Service.GetLayoutSettingsForSet,
       IdFormat: W3C
     },
     {
@@ -153,6 +173,21 @@
       ],
       IdFormat: W3C
     },
+    {
+      ActivityName: Validation.RunValidator,
+      Tags: [
+        {
+          validation.issue_count: 0
+        },
+        {
+          validator.source: Expression
+        },
+        {
+          validator.type: ExpressionValidator
+        }
+      ],
+      IdFormat: W3C
+    },
     {
       ActivityName: Validation.RunValidator,
       Tags: [

diff --git a/...ts/Controllers/ProcessControllerTests.RunProcessNext_PdfFails_DataIsUnlocked.verified.txt b/...ts/Controllers/ProcessControllerTests.RunProcessNext_PdfFails_DataIsUnlocked.verified.txt
@@ -4,6 +4,18 @@
       ActivityName: ApplicationMetadata.Service.GetLayoutModel,
       IdFormat: W3C
     },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutModel,
+      IdFormat: W3C
+    },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutSet,
+      IdFormat: W3C
+    },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutSet,
+      IdFormat: W3C
+    },
     {
       ActivityName: ApplicationMetadata.Service.GetLayoutSet,
       IdFormat: W3C
@@ -28,28 +40,36 @@
       ActivityName: ApplicationMetadata.Service.GetLayoutSets,
       IdFormat: W3C
     },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutSets,
+      IdFormat: W3C
+    },
+    {
+      ActivityName: ApplicationMetadata.Service.GetLayoutSets,
+      IdFormat: W3C
+    },
     {
       ActivityName: ApplicationMetadata.Service.GetLayoutSetsForTask,
       IdFormat: W3C
     },
     {
-      ActivityName: ApplicationMetadata.Service.GetLayoutSettingsForSet,
+      ActivityName: ApplicationMetadata.Service.GetLayoutSetsForTask,
       IdFormat: W3C
     },
     {
-      ActivityName: ApplicationMetadata.Service.GetTexts,
+      ActivityName: ApplicationMetadata.Service.GetLayoutSettingsForSet,
       IdFormat: W3C
     },
     {
-      ActivityName: ApplicationMetadata.Service.GetTexts,
+      ActivityName: ApplicationMetadata.Service.GetLayoutSettingsForSet,
       IdFormat: W3C
     },
     {
-      ActivityName: ApplicationMetadata.Service.GetValidationConfiguration,
+      ActivityName: ApplicationMetadata.Service.GetTexts,
       IdFormat: W3C
     },
     {
-      ActivityName: ApplicationMetadata.Service.GetValidationConfiguration,
+      ActivityName: ApplicationMetadata.Service.GetTexts,
       IdFormat: W3C
     },
     {
@@ -283,6 +303,21 @@
       ],
       IdFormat: W3C
     },
+    {
+      ActivityName: Validation.RunValidator,
+      Tags: [
+        {
+          validation.issue_count: 0
+        },
+        {
+          validator.source: Expression
+        },
+        {
+          validator.type: ExpressionValidator
+        }
+      ],
+      IdFormat: W3C
+    },
     {
       ActivityName: Validation.RunValidator,
       Tags: [

diff --git a/...Altinn.App.Api.Tests/Data/apps/tdd/contributer-restriction/models/default.validation.json b/...Altinn.App.Api.Tests/Data/apps/tdd/contributer-restriction/models/default.validation.json
@@ -0,0 +1,18 @@
+{
+    "$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/validation/validation.schema.v1.json",
+    "validations": {
+        "melding.name": [
+            {
+                "condition": [
+                    "equals",
+                    [
+                        "dataModel",
+                        "melding.name"
+                    ],
+                    "Model"
+                ],
+                "message": "The file must be of type Model"
+            }
+        ]
+    }
+}