Fix databse payload serialization issue (#76)

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

src/Api/Storage/FileStorageInfo.cs

@@ -50,7 +50,7 @@ public abstract record FileStorageInfo
         /// <summary>
         /// Gets a list of workflows designated for the file.
         /// </summary>
-        public string[] Workflows { get; private set; }
+        public List<string> Workflows { get; private set; }
 
         /// <summary>
         /// Gets or sets the DateTime that the file was received.
@@ -99,6 +99,7 @@ protected FileStorageInfo(string fileExtension)
             DateReceived = DateTime.UtcNow;
             DateUploaded = DateTime.MinValue;
             IsUploaded = false;
+            Workflows = new List<string>();
         }
 
         /// <summary>
@@ -109,7 +110,7 @@ public void SetWorkflows(params string[] workflows)
         {
             Guard.Against.NullOrEmpty(workflows, nameof(workflows));
 
-            Workflows = workflows.Clone() as string[];
+            Workflows.AddRange(workflows);
         }
 
         public virtual BlockStorageInfo ToBlockStorageInfo(string bucket)

src/Api/Storage/Payload.cs

@@ -32,7 +32,6 @@ public enum PayloadState
 
         public const int MAX_RETRY = 3;
         private readonly Stopwatch _lastReceived;
-        private readonly List<FileStorageInfo> _files;
         private bool _disposedValue;
 
         public Guid Id { get; }
@@ -47,24 +46,23 @@ public enum PayloadState
 
         public PayloadState State { get; set; }
 
-        [BackingField(nameof(_files))]
-        public IReadOnlyList<FileStorageInfo> Files { get => _files; }
+        public List<FileStorageInfo> Files { get; init; }
 
         public string CorrelationId { get; init; }
 
-        public int Count { get => _files.Count; }
+        public int Count { get => Files.Count; }
 
         public bool HasTimedOut { get => ElapsedTime().TotalSeconds >= Timeout; }
 
-        public string CallingAeTitle { get => _files.OfType<DicomFileStorageInfo>().Select(p => p.CallingAeTitle).FirstOrDefault(); }
+        public string CallingAeTitle { get => Files.OfType<DicomFileStorageInfo>().Select(p => p.CallingAeTitle).FirstOrDefault(); }
 
-        public string CalledAeTitle { get => _files.OfType<DicomFileStorageInfo>().Select(p => p.CalledAeTitle).FirstOrDefault(); }
+        public string CalledAeTitle { get => Files.OfType<DicomFileStorageInfo>().Select(p => p.CalledAeTitle).FirstOrDefault(); }
 
         public Payload(string key, string correlationId, uint timeout)
         {
             Guard.Against.NullOrWhiteSpace(key, nameof(key));
 
-            _files = new List<FileStorageInfo>();
+            Files = new List<FileStorageInfo>();
             _lastReceived = new Stopwatch();
 
             CorrelationId = correlationId;
@@ -80,7 +78,7 @@ public void Add(FileStorageInfo value)
         {
             Guard.Against.Null(value, nameof(value));
 
-            _files.Add(value);
+            Files.Add(value);
             _lastReceived.Reset();
             _lastReceived.Start();
         }
@@ -107,7 +105,7 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _lastReceived.Stop();
-                    _files.Clear();
+                    Files.Clear();
                 }
 
                 _disposedValue = true;

src/Database/PayloadConfiguration.cs

@@ -16,7 +16,7 @@ internal class PayloadConfiguration : IEntityTypeConfiguration<Payload>
     {
         public void Configure(EntityTypeBuilder<Payload> builder)
         {
-            var fileStorageInfoComparer = new ValueComparer<IReadOnlyList<FileStorageInfo>>(
+            var fileStorageInfoComparer = new ValueComparer<List<FileStorageInfo>>(
                 (c1, c2) => c1.SequenceEqual(c2),
                 c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
                 c => c.ToList());
@@ -34,7 +34,7 @@ public void Configure(EntityTypeBuilder<Payload> builder)
             builder.Property(j => j.Files)
                 .HasConversion(
                         v => JsonConvert.SerializeObject(v, jsonSerializerSettings),
-                        v => JsonConvert.DeserializeObject<IReadOnlyList<FileStorageInfo>>(v, jsonSerializerSettings))
+                        v => JsonConvert.DeserializeObject<List<FileStorageInfo>>(v, jsonSerializerSettings))
                 .Metadata.SetValueComparer(fileStorageInfoComparer);
 
             builder.Ignore(j => j.CalledAeTitle);

src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs

@@ -211,7 +211,7 @@ private async Task Upload(Payload payload, CancellationToken cancellationToken)
             }
         }
 
-        private async Task UploadPayloadFile(Guid payloadId, string destinationPath, string sourcePath, string source, string[] workflows, string contentType, CancellationToken cancellationToken)
+        private async Task UploadPayloadFile(Guid payloadId, string destinationPath, string sourcePath, string source, List<string> workflows, string contentType, CancellationToken cancellationToken)
         {
             Guard.Against.Null(payloadId, nameof(payloadId));
             Guard.Against.NullOrWhiteSpace(destinationPath, nameof(destinationPath));