From 839062db74a9ffed2dbd36deb95b9fdd060af5a0 Mon Sep 17 00:00:00 2001 From: Colin Dawson Date: Mon, 2 Mar 2026 22:42:44 +0000 Subject: [PATCH] Added support for put operations for editing a workflow template version --- .../IWorkflowTemplateManager.cs | 18 +----------------- .../Controllers/WorkflowTemplateController.cs | 7 +------ .../Repository/WorkflowTemplateRepository.cs | 4 +++- .../WorkflowTemplateManager.cs | 3 ++- e-suite.Workflow.Core/Tasks/MilestoneTask.cs | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/e-suite.API.Common/e-suite.API.Common/IWorkflowTemplateManager.cs b/e-suite.API.Common/e-suite.API.Common/IWorkflowTemplateManager.cs index b609737..99f05bb 100644 --- a/e-suite.API.Common/e-suite.API.Common/IWorkflowTemplateManager.cs +++ b/e-suite.API.Common/e-suite.API.Common/IWorkflowTemplateManager.cs @@ -51,22 +51,6 @@ public class GetWorkflowTemplateVersion : IGeneralId public Guid Guid { get; set; } } -public class EditWorkflowTemplateVersion : IGeneralId -{ - public long Id { get; set; } - public Guid Guid { get; set; } - - public long Version { get; set; } - - public GeneralIdRef? DomainId { get; set; } - - public string Description { get; set; } = String.Empty; - - public string ActivityNameTemplate { get; set; } = String.Empty; - - public List Tasks { get; set; } = []; -} - public class PatchWorkflowTemplateVersion { @@ -105,7 +89,7 @@ public interface IWorkflowTemplateManager Task> GetWorkflowTemplateVersionsAsync(Paging paging, CancellationToken cancellationToken); Task GetWorkflowTemplateAsync(GeneralIdRef generalIdRef, CancellationToken cancellationToken); - Task EditTemplateVersion(AuditUserDetails auditUserDetails, EditWorkflowTemplateVersion template, CancellationToken cancellationToken); + Task EditTemplateVersion(AuditUserDetails auditUserDetails, GetWorkflowTemplateVersion template, CancellationToken cancellationToken); Task PatchTemplateVersion(AuditUserDetails auditUserDetails, IGeneralIdRef templateId, PatchWorkflowTemplateVersion patchTemplate, CancellationToken cancellationToken); Task PostTemplateVersion(AuditUserDetails auditUserDetails, CreateWorkflowTemplateVersion template, CancellationToken cancellationToken); Task DeleteTemplateVersion(AuditUserDetails auditUserDetails, IGeneralIdRef templateId, CancellationToken cancellationToken); diff --git a/e-suite.API/eSuite.API/Controllers/WorkflowTemplateController.cs b/e-suite.API/eSuite.API/Controllers/WorkflowTemplateController.cs index 78f90f7..fe6b62c 100644 --- a/e-suite.API/eSuite.API/Controllers/WorkflowTemplateController.cs +++ b/e-suite.API/eSuite.API/Controllers/WorkflowTemplateController.cs @@ -1,15 +1,10 @@ using e_suite.API.Common; -using e_suite.API.Common.models; -using e_suite.Database.Core.Tables.UserManager; -using e_suite.Modules.SSOManager; using e_suite.Utilities.Pagination; -using eSuite.API.Models; using eSuite.API.security; using eSuite.API.Utilities; using eSuite.Core.Miscellaneous; using eSuite.Core.Security; using Microsoft.AspNetCore.Mvc; -using System.Net.NetworkInformation; namespace eSuite.API.Controllers; @@ -92,7 +87,7 @@ public class WorkflowTemplateController : ESuiteControllerBase [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] [AccessKey(SecurityAccess.EditWorkflowTemplate)] - public async Task EditTemplateVersion(EditWorkflowTemplateVersion template, CancellationToken cancellationToken = default!) + public async Task EditTemplateVersion(GetWorkflowTemplateVersion template, CancellationToken cancellationToken = default!) { await _workflowTemplateManager.EditTemplateVersion(AuditUserDetails, template, cancellationToken); return Ok(); diff --git a/e-suite.Modules.WorkflowTemplatesManager/Repository/WorkflowTemplateRepository.cs b/e-suite.Modules.WorkflowTemplatesManager/Repository/WorkflowTemplateRepository.cs index 4a6bac1..9706987 100644 --- a/e-suite.Modules.WorkflowTemplatesManager/Repository/WorkflowTemplateRepository.cs +++ b/e-suite.Modules.WorkflowTemplatesManager/Repository/WorkflowTemplateRepository.cs @@ -165,7 +165,9 @@ public class WorkflowTemplateRepository : RepositoryBase, IWorkflowTemplateRepos public IQueryable GetWorkflowVersions() { - return DatabaseDbContext.WorkflowVersions.Include( x => x.Domain); + return DatabaseDbContext.WorkflowVersions + .Include( x => x.Domain) + .Include( x => x.Workflow); } public async Task EditWorkflowVersionAsync(AuditUserDetails auditUserDetails, e_suite.Database.Core.Tables.Workflow.WorkflowVersion workflowVersion, CancellationToken cancellationToken) diff --git a/e-suite.Modules.WorkflowTemplatesManager/WorkflowTemplateManager.cs b/e-suite.Modules.WorkflowTemplatesManager/WorkflowTemplateManager.cs index a1c4255..a470675 100644 --- a/e-suite.Modules.WorkflowTemplatesManager/WorkflowTemplateManager.cs +++ b/e-suite.Modules.WorkflowTemplatesManager/WorkflowTemplateManager.cs @@ -92,7 +92,7 @@ public class WorkflowTemplateManager : IWorkflowTemplateManager public async Task EditTemplateVersion( AuditUserDetails auditUserDetails, - EditWorkflowTemplateVersion template, + GetWorkflowTemplateVersion template, CancellationToken cancellationToken ) { @@ -107,6 +107,7 @@ public class WorkflowTemplateManager : IWorkflowTemplateManager version.Deleted = false; version.Version = template.Version+1; version.Tasks = template.Tasks; + version.Workflow.Name = template.WorkflowName; }, cancellationToken); } diff --git a/e-suite.Workflow.Core/Tasks/MilestoneTask.cs b/e-suite.Workflow.Core/Tasks/MilestoneTask.cs index d4cd94f..801928b 100644 --- a/e-suite.Workflow.Core/Tasks/MilestoneTask.cs +++ b/e-suite.Workflow.Core/Tasks/MilestoneTask.cs @@ -14,4 +14,4 @@ public class MilestoneTask : TaskBase // await base.OnActivateAsync(); // TaskState = TaskState.ReadyToComplete; //} -} \ No newline at end of file +}