Code review updates

Altinn · Nov 15, 2023 · 8869639 · 8869639
1 parent cf256d0
commit 8869639
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/Altinn.App.Api/Controllers/StatelessDataController.cs b/src/Altinn.App.Api/Controllers/StatelessDataController.cs
@@ -116,13 +116,21 @@ public async Task<ActionResult> Get(
             await _prefillService.PrefillDataModel(owner.PartyId, dataType, appModel);
 
             Instance virtualInstance = new Instance() { InstanceOwner = owner };
+            await ProcessAllDataWrite(virtualInstance, appModel);
+
+            return Ok(appModel);
+        }
+
+        private async Task ProcessAllDataWrite(Instance virtualInstance, object appModel)
+        {
             foreach (var dataProcessor in _dataProcessors)
             {
-                _logger.LogInformation("ProcessDataRead for {modelType} using {dataProcesor}", appModel.GetType().Name, dataProcessor.GetType().Name);
+                _logger.LogInformation(
+                    "ProcessDataRead for {modelType} using {dataProcesor}", 
+                    appModel.GetType().Name,
+                    dataProcessor.GetType().Name);
                 await dataProcessor.ProcessDataRead(virtualInstance, null, appModel);
             }
-
-            return Ok(appModel);
         }
 
         /// <summary>
@@ -152,14 +160,8 @@ public async Task<ActionResult> GetAnonymous([FromQuery] string dataType)
             }
 
             object appModel = _appModel.Create(classRef);
-
             var virtualInstance = new Instance();
-
-            foreach (var dataProcessor in _dataProcessors)
-            {
-                _logger.LogInformation("ProcessDataRead for {modelType} using {dataProcesor}", appModel.GetType().Name, dataProcessor.GetType().Name);
-                await dataProcessor.ProcessDataRead(virtualInstance, null, appModel);
-            }
+            await ProcessAllDataWrite(virtualInstance, appModel);
 
             return Ok(appModel);
         }
@@ -185,7 +187,7 @@ public async Task<ActionResult> Post(
             [FromHeader(Name = "party")] string partyFromHeader)
         {
             if (string.IsNullOrEmpty(dataType))
-            {
+            {π
                 return BadRequest($"Invalid dataType {dataType} provided. Please provide a valid dataType as query parameter.");
             }
 

diff --git a/src/Altinn.App.Core/Helpers/Serialization/ModelDeserializer.cs b/src/Altinn.App.Core/Helpers/Serialization/ModelDeserializer.cs
@@ -69,7 +69,7 @@ private async Task<ModelDeserializerResult> DeserializeMultipartAsync(Stream str
             MultipartSection? firstSection = await reader.ReadNextSectionAsync();
             if (firstSection?.ContentDisposition?.Contains("name=\"dataModel\"") != true)
             {
-                return ModelDeserializerResult.FromError("First entry in mulipart serialization must have name=\"dataModel\"");
+                return ModelDeserializerResult.FromError("First entry in multipart serialization must have name=\"dataModel\"");
             }
             var modelResult = await DeserializeJsonAsync(firstSection.Body);
             if (modelResult.HasError)
@@ -83,12 +83,12 @@ private async Task<ModelDeserializerResult> DeserializeMultipartAsync(Stream str
             {
                 if (secondSection?.ContentDisposition?.Contains("name=\"previousValues\"") != true)
                 {
-                    return ModelDeserializerResult.FromError("First entry in mulipart serialization must have name=\"dataModel\"");
+                    return ModelDeserializerResult.FromError("Second entry in multipart serialization must have name=\"previousValues\"");
                 }
                 reportedChanges = await System.Text.Json.JsonSerializer.DeserializeAsync<Dictionary<string, string?>>(secondSection.Body);
                 if (await reader.ReadNextSectionAsync() != null)
                 {
-                    return ModelDeserializerResult.FromError("Multipart request had more than 2 elements");
+                    return ModelDeserializerResult.FromError("Multipart request had more than 2 elements. Only \"dataModel\" and the optional \"previousValues\" are supported.");
                 }
             }
             return ModelDeserializerResult.FromSuccess(modelResult.Model, reportedChanges);

diff --git a/src/Altinn.App.Core/Infrastructure/Clients/Storage/DataClient.cs b/src/Altinn.App.Core/Infrastructure/Clients/Storage/DataClient.cs
@@ -169,11 +169,11 @@ public async Task<object> GetFormData(Guid instanceGuid, Type type, string org,
             HttpResponseMessage response = await _client.GetAsync(token, apiUrl);
             if (response.IsSuccessStatusCode)
             {
-                using Stream stream = await response.Content.ReadAsStreamAsync();
+                await using Stream stream = await response.Content.ReadAsStreamAsync();
                 ModelDeserializer deserializer = new ModelDeserializer(_logger, type);
                 ModelDeserializerResult deserializerResult = await deserializer.DeserializeAsync(stream, "application/xml");
 
-                if (deserializerResult.Error is not null || deserializerResult.Model is null )
+                if (deserializerResult.HasError)
                 {
                     _logger.LogError($"Cannot deserialize XML form data read from storage: {deserializerResult.Error}");
                     throw new ServiceException(HttpStatusCode.Conflict, $"Cannot deserialize XML form data from storage {deserializerResult.Error}");