minor fixes

Signed-off-by: Lillie Dae <lillie.dae@answerdigital.com>

Author: lillie-dae

src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs

@@ -46,7 +46,7 @@ public static ArtifactReceivedDetails FromArtifact(Artifact artifact) =>
 
     public class ArtifactReceivedItems
     {
-        public BsonObjectId Id { get; set; }
+        public string Id { get; set; }
 
         /// <summary>
         /// Gets or Sets WorkflowInstanceId.
@@ -181,6 +181,7 @@ public async Task AddOrUpdateItemAsync(string workflowInstanceId, string taskId,
             }
             else
             {
+                item.Artifacts = item.Artifacts.Concat(existing.Artifacts).ToList();
                 var update = Builders<ArtifactReceivedItems>.Update.Set(a => a.Artifacts, item.Artifacts);
                 await _artifactReceivedItemsCollection
                     .UpdateOneAsync(a => a.WorkflowInstanceId == workflowInstanceId && a.TaskId == taskId, update)

src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs

@@ -215,6 +215,7 @@ public async Task<bool> ProcessArtifactReceivedAsync(ArtifactsReceivedEvent mess
             {
                 previouslyReceivedArtifactsFromRepo = new List<ArtifactReceivedItems>() { new ArtifactReceivedItems()
                 {
+                    Id = workflowInstanceId + taskId,
                     TaskId = taskId,
                     WorkflowInstanceId = workflowInstanceId,
                     Artifacts = message.Artifacts.Select(ArtifactReceivedDetails.FromArtifact).ToList()

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/ArtifactReceivedEvent.feature

@@ -21,7 +21,7 @@ Publishing a artifact received event is consumed by the Workflow Manager.
     Scenario Outline: Publish a valid Artifact Received Event which creates an entry.
         Given I have a clinical workflow <clinicalWorkflow> I have a Workflow Instance <workflowInstance>
         When I publish a Artifact Received Event <artifactReceivedEvent>
-        Then I can see a Artifact Received Item is created
+        Then I can see 2 Artifact Received Items is created
         Examples:
           | clinicalWorkflow                               | workflowInstance                               | artifactReceivedEvent |
           | Workflow_Revision_For_Artifact_ReceivedEvent_1 | Workflow_Instance_For_Artifact_ReceivedEvent_1 | Test1                 |

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs

@@ -168,6 +168,7 @@ public static void ClearTestData()
             MongoClient?.DeleteAllWorkflowRevisionDocuments();
             MongoClient?.DeleteAllWorkflowInstances();
             MongoClient?.DeleteAllPayloadDocuments();
+            MongoClient?.DeleteAllArtifactDocuments();
         }
 
         [BeforeTestRun(Order = 3)]

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/ArtifactReceivedEventStepDefinitions.cs

@@ -84,43 +84,45 @@ public async Task GivenIHaveAClinicalWorkflowIHaveAWorkflowInstance(string clini
             _outputHelper.WriteLine($"Retrieving workflow revision with name={clinicalWorkflowName}");
             await MongoClient.CreateWorkflowRevisionDocumentAsync(workflowRevision);
 
-            await MongoClient.CreateArtifactsEventsDocumentAsync(artifactReceivedItems);
+            try
+            {
+                await MongoClient.CreateArtifactsEventsDocumentAsync(artifactReceivedItems);
+            }
+            catch (Exception e)
+            {
+            }
 
-            // await Task.WhenAll(task1, task2, task3, task4).ConfigureAwait(false);
             _outputHelper.WriteLine("Seeding Data Tasks complete");
         }
 
         [Then(@"I can see a Artifact Received Item is created")]
         public void ThenICanSeeAArtifactReceivedItemIsCreated()
         {
-            ThenICanSeeAArtifactReceivedItemIsCreated(1);
+            ThenICanSeeXArtifactReceivedItemIsCreated(1);
         }
 
         [Then(@"I can see ([1-9]*) Artifact Received Items are created")]
         [Then(@"I can see ([0-9]*) Artifact Received Items is created")]
-        public void ThenICanSeeAArtifactReceivedItemIsCreated(int count)
+        public void ThenICanSeeXArtifactReceivedItemIsCreated(int count)
         {
             _outputHelper.WriteLine($"Retrieving {count} workflow instance/s using the payloadid={DataHelper.WorkflowRequestMessage.PayloadId.ToString()}");
             RetryPolicy.Execute(() =>
             {
                 var artifactsReceivedItems = DataHelper.GetArtifactsReceivedItemsFromDB(count, DataHelper.ArtifactsReceivedEvent);
-
-                foreach (var artifactsReceivedItem in artifactsReceivedItems)
+                if (artifactsReceivedItems.Any())
                 {
-                    var workflowInstance = DataHelper.WorkflowInstances.FirstOrDefault(x => x.Id.Equals(artifactsReceivedItem.WorkflowInstanceId));
-                    var workflowRevision = DataHelper.WorkflowRevisions
-                        .FirstOrDefault(x => x.WorkflowId.Equals(workflowInstance!.WorkflowId));
-
-                    if (workflowRevision != null)
+                    foreach (var artifactsReceivedItem in artifactsReceivedItems)
                     {
-                        Assertions.AssertArtifactsReceivedItemMatchesExpectedWorkflow(artifactsReceivedItem, workflowRevision);
-                    }
-                    else
-                    {
-                        throw new Exception($"Workflow not found for workflowId {artifactsReceivedItem.WorkflowInstanceId}");
+                        var wfiId = artifactsReceivedItems.FirstOrDefault().WorkflowInstanceId;
+                        var wfi = DataHelper.WorkflowInstances.FirstOrDefault(a => a.Id == wfiId);
+                        var workflow = DataHelper.WorkflowRevisions.FirstOrDefault(w => w.WorkflowId == wfi.WorkflowId);
+                        if (workflow is null)
+                        {
+                            throw new Exception("Failing Test");
+                        }
+                        Assertions.AssertArtifactsReceivedItemMatchesExpectedWorkflow(artifactsReceivedItem, workflow, wfi);
                     }
                 }
-
             });
             _outputHelper.WriteLine($"Retrieved {count} workflow instance/s");
         }

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs

@@ -552,13 +552,20 @@ public void AssertExecutionStats(ExecutionStats executionStats, TaskDispatchEven
             Output.WriteLine("Details ExecutionStats are correct");
         }
 
-        public static void AssertArtifactsReceivedItemMatchesExpectedWorkflow(ArtifactReceivedItems artifactsReceivedItem, WorkflowRevision workflowRevision)
-        {
-            artifactsReceivedItem.WorkflowInstanceId.Should().Be(workflowRevision.WorkflowId);
-            artifactsReceivedItem.TaskId.Should().Be(workflowRevision.Workflow!.Tasks[0].Id);
-            artifactsReceivedItem.Artifacts.Count.Should().Be(workflowRevision.Workflow!.Tasks[0].Artifacts.Output.Length);
+        public static void AssertArtifactsReceivedItemMatchesExpectedWorkflow(
+            ArtifactReceivedItems artifactsReceivedItem, WorkflowRevision workflowRevision,
+            WorkflowInstance? workflowInstance)
+        {
+            artifactsReceivedItem.WorkflowInstanceId.Should().Be(workflowInstance?.Id);
+            var task = workflowRevision.Workflow!.Tasks.FirstOrDefault(t => t.Id == artifactsReceivedItem.TaskId);
+            task.Should().NotBeNull();
+            artifactsReceivedItem.TaskId.Should().Be(task!.Id);
+            artifactsReceivedItem.Artifacts.Count.Should().Be(task.Artifacts.Output.Length);
             artifactsReceivedItem.Received.Should().BeCloseTo(DateTime.UtcNow, TimeSpan.FromSeconds(20));
-            artifactsReceivedItem.Artifacts[0].Path.Should().Be(workflowRevision.Workflow.Tasks[0].Artifacts.Output[0].Value);
+            foreach (var artifact in task.Artifacts.Output)
+            {
+                artifactsReceivedItem.Artifacts.FirstOrDefault(t => t.Type == artifact.Type).Should().NotBeNull();
+            }
         }
     }
 }

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/DataHelper.cs

@@ -303,7 +303,7 @@ public List<ArtifactReceivedItems> GetArtifactsReceivedItemsFromDB(int count, Ar
             {
                 ArtifactsReceivedItems = MongoClient.GetArtifactsReceivedItems(artifactsReceivedEvent);
 
-                if (ArtifactsReceivedItems.Count == count)
+                if (ArtifactsReceivedItems.FirstOrDefault()?.Artifacts.Count == count)
                 {
                     return ArtifactsReceivedItems;
                 }
@@ -600,6 +600,7 @@ public class ArtifactsEventTestData
         {
             new ArtifactReceivedItems()
             {
+                Id = "e545de90-c936-40ab-ad11-19ef07f49607" + "d32d5769-4ecf-4639-a048-6ecf2cced04a",
                 WorkflowInstanceId = "d32d5769-4ecf-4639-a048-6ecf2cced04a",
                 TaskId = "e545de90-c936-40ab-ad11-19ef07f49607",
                 Received = DateTime.UtcNow,

tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs

@@ -239,6 +239,21 @@ public void DeleteAllPayloadDocuments()
             });
         }
 
+        public void DeleteAllArtifactDocuments()
+        {
+            RetryMongo.Execute(() =>
+            {
+                ArtifactsCollection.DeleteMany("{ }");
+
+                var artifacts = ArtifactsCollection.Find("{ }").ToList();
+
+                if (artifacts.Count > 0)
+                {
+                    throw new Exception("All payloads are not deleted!");
+                }
+            });
+        }
+
         #endregion Payload
 
         #region ExecutionStats