Merge branch 'main' into 12180-default-section-for-component-config

Altinn · Feb 6, 2024 · 7cda72c · 7cda72c
2 parents 3d4e2fa + dfac17d
commit 7cda72c
Show file tree

Hide file tree

Showing 26 changed files with 260 additions and 234 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -40,7 +40,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Attempt to wait for deploy to environment (12 minutes sleep)
+      - name: Attempt to wait for deploy to environment (10 minutes sleep)
         run: sleep 10m
         shell: bash
 

diff --git a/backend/packagegroups/NuGet.props b/backend/packagegroups/NuGet.props
@@ -37,6 +37,7 @@
     <PackageReference Update="Polly" Version="8.2.1" />
     <PackageReference Update="Altinn.Authorization.ABAC" Version="0.0.7" />
     <PackageReference Update="Altinn.ApiClients.Maskinporten" Version="9.1.0" />
+    <PackageReference Update="MediatR" Version="12.2.0" />
   </ItemGroup>
 
   <ItemGroup Label="Packages used for testing">

diff --git a/backend/src/Designer/Controllers/AppDevelopmentController.cs b/backend/src/Designer/Controllers/AppDevelopmentController.cs
@@ -10,6 +10,7 @@
 using Altinn.Studio.Designer.Helpers;
 using Altinn.Studio.Designer.Infrastructure.GitRepository;
 using Altinn.Studio.Designer.Models;
+using Altinn.Studio.Designer.Models.Dto;
 using Altinn.Studio.Designer.Services.Interfaces;
 using Altinn.Studio.Designer.ViewModels.Response;
 using Microsoft.AspNetCore.Authorization;

diff --git a/backend/src/Designer/Controllers/ProcessModelingController.cs b/backend/src/Designer/Controllers/ProcessModelingController.cs
@@ -2,11 +2,15 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Mime;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Events;
 using Altinn.Studio.Designer.Helpers;
 using Altinn.Studio.Designer.Models;
+using Altinn.Studio.Designer.Models.Dto;
 using Altinn.Studio.Designer.Services.Interfaces;
+using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -23,23 +27,30 @@ namespace Altinn.Studio.Designer.Controllers
     public class ProcessModelingController : ControllerBase
     {
         private readonly IProcessModelingService _processModelingService;
-        public ProcessModelingController(IProcessModelingService processModelingService)
+        private readonly IMediator _mediator;
+
+        public ProcessModelingController(IProcessModelingService processModelingService, IMediator mediator)
         {
             _processModelingService = processModelingService;
+            _mediator = mediator;
         }
 
         [HttpGet("process-definition")]
         public FileStreamResult GetProcessDefinition(string org, string repo)
         {
             string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
 
-            Stream processDefinitionStream = _processModelingService.GetProcessDefinitionStream(AltinnRepoEditingContext.FromOrgRepoDeveloper(org, repo, developer));
+            Stream processDefinitionStream =
+                _processModelingService.GetProcessDefinitionStream(
+                    AltinnRepoEditingContext.FromOrgRepoDeveloper(org, repo, developer));
 
             return new FileStreamResult(processDefinitionStream, MediaTypeNames.Text.Plain);
         }
 
         [HttpPut("process-definition")]
-        public async Task<IActionResult> SaveProcessDefinition(string org, string repo, CancellationToken cancellationToken)
+        [Obsolete("This endpoint should be replaced by process-definition-latest, and url fixed after integration with frontend")]
+        public async Task<IActionResult> SaveProcessDefinition(string org, string repo,
+            CancellationToken cancellationToken)
         {
             Request.EnableBuffering();
             try
@@ -52,7 +63,48 @@ public async Task<IActionResult> SaveProcessDefinition(string org, string repo,
             }
 
             string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
-            await _processModelingService.SaveProcessDefinitionAsync(AltinnRepoEditingContext.FromOrgRepoDeveloper(org, repo, developer), Request.Body, cancellationToken);
+            await _processModelingService.SaveProcessDefinitionAsync(
+                AltinnRepoEditingContext.FromOrgRepoDeveloper(org, repo, developer), Request.Body, cancellationToken);
+            return Ok();
+        }
+
+        [HttpPut("process-definition-latest")]
+        public async Task<IActionResult> UpsertProcessDefinitionAndNotify(string org, string repo, [FromForm] IFormFile content, [FromForm] string metadata, CancellationToken cancellationToken)
+        {
+            Request.EnableBuffering();
+
+            var metadataObject = metadata is not null
+                ? JsonSerializer.Deserialize<ProcessDefinitionMetadata>(metadata,
+                    new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })
+                : null;
+
+            Stream stream = content.OpenReadStream();
+
+            try
+            {
+                await Guard.AssertValidXmlStreamAndRewindAsync(stream);
+            }
+            catch (ArgumentException)
+            {
+                return BadRequest("BPMN file is not valid XML");
+            }
+
+            string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+            await _processModelingService.SaveProcessDefinitionAsync(
+                AltinnRepoEditingContext.FromOrgRepoDeveloper(org, repo, developer), stream, cancellationToken);
+
+            if (metadataObject?.TaskIdChanges is not null)
+            {
+                foreach (TaskIdChange taskIdChange in metadataObject.TaskIdChanges)
+                {
+                    await _mediator.Publish(new ProcessTaskIdChangedEvent
+                    {
+                        OldId = taskIdChange.OldId,
+                        NewId = taskIdChange.NewId
+                    }, cancellationToken);
+                }
+            }
+
             return Ok();
         }
 
@@ -64,37 +116,17 @@ public IEnumerable<string> GetTemplates(string org, string repo, SemanticVersion
         }
 
         [HttpPut("templates/{appVersion}/{templateName}")]
-        public async Task<FileStreamResult> SaveProcessDefinitionFromTemplate(string org, string repo, SemanticVersion appVersion, string templateName, CancellationToken cancellationToken)
+        public async Task<FileStreamResult> SaveProcessDefinitionFromTemplate(string org, string repo,
+            SemanticVersion appVersion, string templateName, CancellationToken cancellationToken)
         {
             Guard.AssertArgumentNotNull(appVersion, nameof(appVersion));
             string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
             var editingContext = AltinnRepoEditingContext.FromOrgRepoDeveloper(org, repo, developer);
-            await _processModelingService.SaveProcessDefinitionFromTemplateAsync(editingContext, templateName, appVersion, cancellationToken);
+            await _processModelingService.SaveProcessDefinitionFromTemplateAsync(editingContext, templateName,
+                appVersion, cancellationToken);
 
             Stream processDefinitionStream = _processModelingService.GetProcessDefinitionStream(editingContext);
             return new FileStreamResult(processDefinitionStream, MediaTypeNames.Text.Plain);
         }
-
-        [HttpPut("tasks/{taskId}/{taskName}")]
-        public async Task<ActionResult> UpdateProcessTaskName(string org, string repo, string taskId, string taskName, CancellationToken cancellationToken)
-        {
-            Guard.AssertArgumentNotNull(taskId, nameof(taskId));
-            Guard.AssertArgumentNotNull(taskName, nameof(taskName));
-            string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
-            var editingContext = AltinnRepoEditingContext.FromOrgRepoDeveloper(org, repo, developer);
-            try
-            {
-                Stream updatedProcessDefinitionStream = await _processModelingService.UpdateProcessTaskNameAsync(editingContext, taskId, taskName, cancellationToken);
-                return new FileStreamResult(updatedProcessDefinitionStream, MediaTypeNames.Text.Plain);
-            }
-            catch (InvalidOperationException)
-            {
-                return BadRequest("Could not deserialize process definition.");
-            }
-            catch (ArgumentException)
-            {
-                return BadRequest("Could not find task with given id.");
-            }
-        }
     }
 }
diff --git a/backend/src/Designer/Designer.csproj b/backend/src/Designer/Designer.csproj
@@ -29,6 +29,7 @@
     <PackageReference Include="ini-parser-netstandard" />
     <PackageReference Include="JWTCookieAuthentication" />
     <PackageReference Include="LibGit2Sharp" />
+    <PackageReference Include="MediatR" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
     <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" />

diff --git a/...gner/EventHandlers/ProcessTaskIdChanged/ProcessTaskIdChangedApplicationMetadataHandler.cs b/...gner/EventHandlers/ProcessTaskIdChanged/ProcessTaskIdChangedApplicationMetadataHandler.cs
@@ -0,0 +1,16 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Events;
+using MediatR;
+
+namespace Altinn.Studio.Designer.EventHandlers.ProcessTaskIdChanged;
+
+public class ProcessTaskIdChangedApplicationMetadataHandler : INotificationHandler<ProcessTaskIdChangedEvent>
+{
+    public Task Handle(ProcessTaskIdChangedEvent notification, CancellationToken cancellationToken)
+    {
+        // TODO: Implement logic to handle the event here: https://github.com/Altinn/altinn-studio/issues/12220
+        // Here we should think how to handle errors in the handlers. Should we throw exceptions or use websocket to send error messages to the client?
+        return Task.CompletedTask;
+    }
+}
diff --git a/backend/src/Designer/Events/ProcessTaskIdChangedEvent.cs b/backend/src/Designer/Events/ProcessTaskIdChangedEvent.cs
@@ -0,0 +1,9 @@
+using MediatR;
+
+namespace Altinn.Studio.Designer.Events;
+
+public class ProcessTaskIdChangedEvent : INotification
+{
+    public string OldId { get; set; }
+    public string NewId { get; set; }
+}
diff --git a/backend/src/Designer/Models/Dto/ProcessDefinitionMetadata.cs b/backend/src/Designer/Models/Dto/ProcessDefinitionMetadata.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Altinn.Studio.Designer.Models.Dto;
+
+public class ProcessDefinitionMetadata
+{
+    public List<TaskIdChange> TaskIdChanges { get; set; }
+}
diff --git a/backend/src/Designer/Models/Dto/TaskIdChange.cs b/backend/src/Designer/Models/Dto/TaskIdChange.cs
@@ -0,0 +1,7 @@
+namespace Altinn.Studio.Designer.Models.Dto;
+
+public class TaskIdChange
+{
+    public string OldId { get; set; }
+    public string NewId { get; set; }
+}
diff --git a/...er/ViewModels/Response/VersionResponse.cs → ...rc/Designer/Models/Dto/VersionResponse.cs b/...er/ViewModels/Response/VersionResponse.cs → ...rc/Designer/Models/Dto/VersionResponse.cs
@@ -1,6 +1,6 @@
 using NuGet.Versioning;
 
-namespace Altinn.Studio.Designer.ViewModels.Response
+namespace Altinn.Studio.Designer.Models.Dto
 {
     public class VersionResponse
     {

diff --git a/backend/src/Designer/Program.cs b/backend/src/Designer/Program.cs
@@ -249,6 +249,10 @@ void ConfigureServices(IServiceCollection services, IConfiguration configuration
 
     // Auto register all settings classes
     services.RegisterSettingsByBaseType<ISettingsMarker>(configuration);
+
+    // Registers all handlers and the mediator
+    services.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(Program).Assembly));
+
     logger.LogInformation("// Program.cs // ConfigureServices // Configuration complete");
 }
 

diff --git a/backend/src/Designer/Services/Implementation/ProcessModeling/ProcessModelingService.cs b/backend/src/Designer/Services/Implementation/ProcessModeling/ProcessModelingService.cs
@@ -56,37 +56,6 @@ public Stream GetProcessDefinitionStream(AltinnRepoEditingContext altinnRepoEdit
             return altinnAppGitRepository.GetProcessDefinitionFile();
         }
 
-        public async Task<Stream> UpdateProcessTaskNameAsync(AltinnRepoEditingContext altinnRepoEditingContext, string taskId, string taskName, CancellationToken cancellationToken = default)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            AltinnAppGitRepository altinnAppGitRepository = _altinnGitRepositoryFactory.GetAltinnAppGitRepository(altinnRepoEditingContext.Org, altinnRepoEditingContext.Repo, altinnRepoEditingContext.Developer);
-            XmlSerializer serializer = new(typeof(Definitions));
-            Definitions? definitions;
-            using (Stream processDefinitionStream = GetProcessDefinitionStream(altinnRepoEditingContext))
-            {
-                definitions = (Definitions?)serializer.Deserialize(processDefinitionStream);
-            }
-
-            if (definitions == null)
-            {
-                throw new InvalidOperationException("Could not deserialize process definition.");
-            }
-
-            ProcessTask? processTask = (definitions.Process.Tasks?.FirstOrDefault(t => t.Id == taskId)) ?? throw new ArgumentException($"Could not find task with id {taskId}.");
-            processTask.Name = taskName;
-
-            Stream processStream = new MemoryStream();
-            serializer.Serialize(processStream, definitions);
-
-            // Reset stream position to beginning after serialization
-            processStream.Seek(0, SeekOrigin.Begin);
-            await altinnAppGitRepository.SaveProcessDefinitionFileAsync(processStream, cancellationToken);
-
-            // Reset stream position to beginning after saving
-            processStream.Seek(0, SeekOrigin.Begin);
-            return processStream;
-        }
-
         private IEnumerable<string> EnumerateTemplateResources(SemanticVersion version)
         {
             return typeof(ProcessModelingService).Assembly.GetManifestResourceNames()

diff --git a/backend/src/Designer/Services/Interfaces/IProcessModelingService.cs b/backend/src/Designer/Services/Interfaces/IProcessModelingService.cs
@@ -39,15 +39,5 @@ public interface IProcessModelingService
         /// <param name="altinnRepoEditingContext">An <see cref="AltinnRepoEditingContext"/>.</param>
         /// <returns>A <see cref="Stream"/> of a process definition file.</returns>
         Stream GetProcessDefinitionStream(AltinnRepoEditingContext altinnRepoEditingContext);
-
-        /// <summary>
-        /// Updates the name of a task in the process definition file.
-        /// </summary>
-        /// <param name="altinnRepoEditingContext">n <see cref="AltinnRepoEditingContext"/>.</param>
-        /// <param name="taskId">The ID of the task to update</param>
-        /// <param name="taskName">The name to set for the task</param>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
-        /// <returns></returns>
-        Task<Stream> UpdateProcessTaskNameAsync(AltinnRepoEditingContext altinnRepoEditingContext, string taskId, string taskName, CancellationToken cancellationToken = default);
     }
 }
diff --git a/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/GetAppVersionTests.cs b/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/GetAppVersionTests.cs
@@ -5,6 +5,7 @@
 using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Models.Dto;
 using Altinn.Studio.Designer.ViewModels.Response;
 using Designer.Tests.Controllers.ApiTests;
 using Designer.Tests.Utils;

diff --git a/.../tests/Designer.Tests/Controllers/ProcessModelingController/UpdateProcessTaskNameTests.cs b/.../tests/Designer.Tests/Controllers/ProcessModelingController/UpdateProcessTaskNameTests.cs