Merge pull request #943 from Project-MONAI/AI-376

Ai 376

Author: neildsouth

src/Common/Configuration/WorkflowManagerOptions.cs

@@ -74,6 +74,9 @@ public class WorkflowManagerOptions : PagedOptions
         [ConfigurationKeyName("migExternalAppPlugins")]
         public string[] MigExternalAppPlugins { get; set; }
 
+        [ConfigurationKeyName("dataRetentionDays")]
+        public int DataRetentionDays { get; set; }
+
         public WorkflowManagerOptions()
         {
             Messaging = new MessageBrokerConfiguration();

src/WorkflowManager/Common/Interfaces/IPayloadService.cs

@@ -54,5 +54,13 @@ Task<IList<PayloadDto>> GetAllAsync(int? skip = null,
         /// <param name="payload"></param>
         /// <returns></returns>
         Task<bool> UpdateWorkflowInstanceIdsAsync(string payloadId, IEnumerable<string> workflowInstances);
+
+        /// <summary>
+        /// Gets the expiry date for a payload.
+        /// </summary>
+        /// <param name="now"></param>
+        /// <param name="workflowInstanceId"></param>
+        /// <returns>date of expiry or null</returns>
+        Task<DateTime?> GetExpiry(DateTime now, string? workflowInstanceId);
     }
 }

src/WorkflowManager/Common/Monai.Deploy.WorkflowManager.Common.csproj

@@ -31,6 +31,7 @@
     <AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Common\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj" />
     <ProjectReference Include="..\Contracts\Monai.Deploy.WorkflowManager.Contracts.csproj" />
     <ProjectReference Include="..\Database\Monai.Deploy.WorkflowManager.Database.csproj" />
     <ProjectReference Include="..\Storage\Monai.Deploy.WorkflowManager.Storage.csproj" />

src/WorkflowManager/Common/Services/PayloadService.cs

@@ -25,6 +25,8 @@
 using Monai.Deploy.WorkflowManager.Common.Database.Interfaces;
 using Monai.Deploy.WorkflowManager.Common.Logging;
 using Monai.Deploy.WorkflowManager.Common.Storage.Services;
+using Microsoft.Extensions.Options;
+using Monai.Deploy.WorkflowManager.Common.Configuration;
 
 namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services
 {
@@ -34,23 +36,31 @@ public class PayloadService : IPayloadService
 
         private readonly IWorkflowInstanceRepository _workflowInstanceRepository;
 
+        private readonly IWorkflowRepository _workflowRepository;
+
         private readonly IDicomService _dicomService;
 
         private readonly IStorageService _storageService;
 
+        private readonly WorkflowManagerOptions _options;
+
         private readonly ILogger<PayloadService> _logger;
 
         public PayloadService(
             IPayloadRepository payloadRepository,
             IDicomService dicomService,
             IWorkflowInstanceRepository workflowInstanceRepository,
+            IWorkflowRepository workflowRepository,
             IServiceScopeFactory serviceScopeFactory,
+            IOptions<WorkflowManagerOptions> options,
             ILogger<PayloadService> logger)
         {
             _payloadRepository = payloadRepository ?? throw new ArgumentNullException(nameof(payloadRepository));
             _workflowInstanceRepository = workflowInstanceRepository ?? throw new ArgumentNullException(nameof(workflowInstanceRepository));
             _dicomService = dicomService ?? throw new ArgumentNullException(nameof(dicomService));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _workflowRepository = workflowRepository ?? throw new ArgumentNullException(nameof(workflowRepository));
+            _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
 
             var scopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
             var scope = scopeFactory.CreateScope();
@@ -85,7 +95,8 @@ public PayloadService(
                     DataTrigger = eventPayload.DataTrigger,
                     Timestamp = eventPayload.Timestamp,
                     PatientDetails = patientDetails,
-                    PayloadDeleted = PayloadDeleted.No
+                    PayloadDeleted = PayloadDeleted.No,
+                    Expires = await GetExpiry(DateTime.UtcNow, eventPayload.WorkflowInstanceId)
                 };
 
                 if (await _payloadRepository.CreateAsync(payload))
@@ -106,6 +117,27 @@ public PayloadService(
             return null;
         }
 
+        public async Task<DateTime?> GetExpiry(DateTime now, string? workflowInstanceId)
+        {
+            var daysToKeep = await GetWorkflowDataExpiry(workflowInstanceId);
+            daysToKeep ??= _options.DataRetentionDays;
+
+            if (daysToKeep == -1) { return null; }
+
+            return now.AddDays(daysToKeep.Value);
+        }
+
+        private async Task<int?> GetWorkflowDataExpiry(string? workflowInstanceId)
+        {
+            if (string.IsNullOrWhiteSpace(workflowInstanceId)) { return null; }
+
+            var workflowInstance = await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(workflowInstanceId);
+
+            if (workflowInstance is null) { return null; }
+
+            return (await _workflowRepository.GetByWorkflowIdAsync(workflowInstance.WorkflowId))?.Workflow?.DataRetentionDays ?? null;
+        }
+
         public async Task<Payload> GetByIdAsync(string payloadId)
         {
             ArgumentNullException.ThrowIfNullOrWhiteSpace(payloadId, nameof(payloadId));

src/WorkflowManager/Contracts/Migrations/M004_Payload_expires.cs

@@ -0,0 +1,42 @@
+// 
+// Copyright 2023 Guy’s and St Thomas’ NHS Foundation Trust
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
+using Mongo.Migration.Migrations.Document;
+using MongoDB.Bson;
+
+namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations
+{
+    public class M004_Payload_Expires : DocumentMigration<Payload>
+    {
+        public M004_Payload_Expires() : base("1.0.4") { }
+
+        public override void Up(BsonDocument document)
+        {
+            document.Add("Expires", BsonNull.Create(null).ToJson(), true); //null = never expires
+        }
+
+        public override void Down(BsonDocument document)
+        {
+            try
+            {
+                document.Remove("DataTrigger");
+            }
+            catch
+            {  // can ignore we dont want failures stopping startup !
+            }
+        }
+    }
+}

src/WorkflowManager/Contracts/Migrations/M004_WorkflowRevision_addDataRetension.cs

@@ -0,0 +1,46 @@
+// 
+// Copyright 2023 Guy’s and St Thomas’ NHS Foundation Trust
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
+using Mongo.Migration.Migrations.Document;
+using MongoDB.Bson;
+
+
+namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations
+{
+    public class M004_WorkflowRevision_AddDataRetension : DocumentMigration<WorkflowRevision>
+    {
+        public M004_WorkflowRevision_AddDataRetension() : base("1.0.1") { }
+
+        public override void Up(BsonDocument document)
+        {
+//            document.Add("Workflow.DataRetentionDays", BsonNull.Create(null).ToJson(), true);
+            var workflow = document["Workflow"].AsBsonDocument;
+            workflow.Add("DataRetentionDays", BsonNull.Create(null).ToJson(), true);
+        }
+
+        public override void Down(BsonDocument document)
+        {
+            try
+            {
+                var workflow = document["Workflow"].AsBsonDocument;
+                workflow.Remove("DataRetentionDays");
+            }
+            catch
+            {  // can ignore we dont want failures stopping startup !
+            }
+        }
+    }
+}

src/WorkflowManager/Contracts/Models/Payload.cs

@@ -27,11 +27,11 @@
 
 namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models
 {
-    [CollectionLocation("Payloads"), RuntimeVersion("1.0.3")]
+    [CollectionLocation("Payloads"), RuntimeVersion("1.0.4")]
     public class Payload : IDocument
     {
         [JsonConverter(typeof(DocumentVersionConvert)), BsonSerializer(typeof(DocumentVersionConverBson))]
-        public DocumentVersion Version { get; set; } = new DocumentVersion(1, 0, 3);
+        public DocumentVersion Version { get; set; } = new DocumentVersion(1, 0, 4);
 
         [JsonProperty(PropertyName = "id")]
         public string Id { get; set; } = string.Empty;
@@ -67,6 +67,10 @@ public class Payload : IDocument
         public PatientDetails PatientDetails { get; set; } = new PatientDetails();
 
         public DataOrigin DataTrigger { get; set; } = new DataOrigin { DataService = DataService.DIMSE };
+
+        [JsonProperty(PropertyName = "expires")]
+        public DateTime? Expires { get; set; }
+
     }
 
     public enum PayloadDeleted

src/WorkflowManager/Contracts/Models/Workflow.cs

@@ -36,5 +36,8 @@ public class Workflow
         [JsonProperty(PropertyName = "tasks")]
         public TaskObject[] Tasks { get; set; } = System.Array.Empty<TaskObject>();
 
+        [JsonProperty(PropertyName = "dataRetentionDays")]
+        public int? DataRetentionDays { get; set; } = 3;// note. -1 = never delete
+
     }
 }

src/WorkflowManager/Contracts/Models/WorkflowRevision.cs

@@ -23,15 +23,15 @@
 
 namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models
 {
-    [CollectionLocation("Workflows"), RuntimeVersion("1.0.0")]
+    [CollectionLocation("Workflows"), RuntimeVersion("1.0.1")]
     public class WorkflowRevision : ISoftDeleteable, IDocument
     {
         [BsonId]
         [JsonProperty(PropertyName = "id")]
         public string? Id { get; set; }
 
         [JsonConverter(typeof(DocumentVersionConvert)), BsonSerializer(typeof(DocumentVersionConverBson))]
-        public DocumentVersion Version { get; set; } = new DocumentVersion(1, 0, 0);
+        public DocumentVersion Version { get; set; } = new DocumentVersion(1, 0, 1);
 
         [JsonProperty(PropertyName = "workflow_id")]
         public string WorkflowId { get; set; } = string.Empty;

src/WorkflowManager/Database/Interfaces/IPayloadRepository.cs

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
@@ -52,11 +53,27 @@ public interface IPayloadRepository
         /// <returns>The updated payload.</returns>
         Task<bool> UpdateAsync(Payload payload);
 
+        /// <summary>
         /// Updates a payload in the database.
         /// </summary>
         /// <param name="payloadId"></param>
         /// <param name="workflowInstances"></param>
         /// <returns></returns>
         Task<bool> UpdateAssociatedWorkflowInstancesAsync(string payloadId, IEnumerable<string> workflowInstances);
+
+        /// <summary>
+        /// Gets all the payloads that might need deleted
+        /// </summary>
+        /// <param name="now">the current datetime</param>
+        /// <returns></returns>
+        Task<IList<Payload>> GetPayloadsToDelete(DateTime now);
+
+        /// <summary>
+        /// Marks a bunch of payloads as a new deleted state
+        /// </summary>
+        /// <param name="Ids">a list of payloadIds to mark in new status</param>
+        /// <param name="status">the status to mark as</param>
+        /// <returns></returns>
+        Task MarkDeletedState(IList<string> Ids, PayloadDeleted status);
     }
 }