Change ListWorkflows call to use StrawberryShake and IndicoV2

Author: meghanhickey

.gitignore

@@ -47,3 +47,4 @@ IndicoV2.StrawberryShake/Generated/
 user.runsettings
 /IndicoV2/Properties/PublishProfiles
 /Indico/Properties/PublishProfiles
+/.graphqlrc.json

IndicoV2.Abstractions/Workflows/Models/IWorkflow.cs

@@ -8,5 +8,7 @@ public interface IWorkflow
         int Id { get; }
 
         bool ReviewEnabled { get; }
+
+        string Name { get;  }
     }
 }

IndicoV2.Abstractions/Workflows/Models/Workflow.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using IndicoV2.StrawberryShake;
+
+namespace IndicoV2.Workflows.Models
+{
+    public class WorkflowSs : IWorkflow
+    {
+        private readonly IListWorkflows_Workflows_Workflows _ssWorkflow;
+        public WorkflowSs(IListWorkflows_Workflows_Workflows workflow) => _ssWorkflow = workflow;
+        public int Id => _ssWorkflow.Id ?? 0;
+        public bool ReviewEnabled => _ssWorkflow.ReviewEnabled ?? false;
+        public string Name => _ssWorkflow.Name;
+    }
+}

IndicoV2.IntegrationTests/Workflows/WorkflowClientTests.cs

@@ -6,6 +6,7 @@
 using IndicoV2.IntegrationTests.Utils.Configs;
 using IndicoV2.IntegrationTests.Utils.DataHelpers;
 using IndicoV2.Workflows;
+using IndicoV2.Workflows.Models;
 using NUnit.Framework;
 using Unity;
 
@@ -61,5 +62,17 @@ public async Task AddData_ShouldReturnResult()
 
             result.Should().NotBeNull();
         }
+
+        [Test]
+        public async Task ListWorkflows_ShouldReturnResult()
+        {
+            var result = await _workflowsClient.ListAsync(_dataSetId);
+            result.Should().NotBeNull();
+            foreach (WorkflowSs wf in result)
+            {
+                wf.Id.Should().BeGreaterThan(0);
+                wf.Name.Should().NotBeNull();
+            }
+        }
     }
 }

IndicoV2.StrawberryShake/Workflows/WorkflowSsClient.cs

@@ -1,8 +1,12 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 using IndicoV2.StrawberryShake.Exceptions;
 using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Data;
+using Newtonsoft.Json.Linq;
 
 namespace IndicoV2.StrawberryShake.Workflows
 {
@@ -23,5 +27,22 @@ public async Task<WorkflowStatus> GetStatus(int workflowId, CancellationToken ca
 
             return response.Workflows.Workflows.Single().Status.Value;
         }
+
+        public async Task<IListWorkflows_Workflows> ListAsync(int datasetId, CancellationToken cancellationToken)
+        {
+            int?[] datasetIds =  { datasetId };
+            var response = await ExecuteAsync(() =>
+                _services.GetRequiredService<ListWorkflowsQuery>().ExecuteAsync(Array.AsReadOnly(datasetIds), cancellationToken));
+            return response.Workflows;
+        }
+
+        public async Task<IListWorkflows_Workflows> ListAsync(int[] datasetIds, CancellationToken cancellationToken)
+        {
+            var nullableDatasetIds = datasetIds.Cast<int?>().ToArray();
+            var response = await ExecuteAsync(() =>
+                _services.GetRequiredService<ListWorkflowsQuery>().ExecuteAsync(Array.AsReadOnly(nullableDatasetIds), cancellationToken));
+            return response.Workflows;
+        }
+
     }
 }

IndicoV2.StrawberryShake/Workflows/Workflows.graphql

@@ -15,3 +15,13 @@ mutation WorkflowAddData($workflowId: Int!) {
     }
   }
 }
+
+query ListWorkflows($datasetIds: [Int]){
+  workflows(datasetIds: $datasetIds){
+    workflows {
+      id
+      name
+      reviewEnabled
+    }
+  }
+}

IndicoV2/Workflows/WorkflowsClient.cs

@@ -1,34 +1,41 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Linq;
 using IndicoV2.StrawberryShake;
-using IndicoV2.V1Adapters.Workflows;
 using IndicoV2.Workflows.Models;
 
 namespace IndicoV2.Workflows
 {
     public class WorkflowsClient : IWorkflowsClient
     {
-        private readonly WorkflowsV1ClientAdapter _legacy;
         private readonly IndicoStrawberryShakeClient _strawberryShake;
+        private readonly IndicoClient _indicoClient;
 
         public WorkflowsClient(IndicoClient indicoClient)
         {
-            _legacy = new WorkflowsV1ClientAdapter(indicoClient.LegacyClient);
+            _indicoClient = indicoClient;
             _strawberryShake = indicoClient.IndicoStrawberryShakeClient;
         }
 
-        public Task<IEnumerable<IWorkflow>> ListAsync(int dataSetId, CancellationToken cancellationToken = default) =>
-            _legacy.ListAsync(dataSetId, cancellationToken);
+        public async Task<IEnumerable<IWorkflow>> ListAsync(int dataSetId, CancellationToken cancellationToken = default) 
+        {
+            var result = await _strawberryShake.Workflows().ListAsync(dataSetId, cancellationToken);
+            return result.Workflows.Select(x => ToWorkflowFromSs(x)).ToList();
+        }
 
-        public Task<IEnumerable<IWorkflow>>
-            ListAsync(int[] dataSetIds, CancellationToken cancellationToken = default) =>
-            _legacy.ListAsync(dataSetIds, cancellationToken);
+        public async Task<IEnumerable<IWorkflow>>ListAsync(int[] dataSetIds, CancellationToken cancellationToken = default)
+        {
+            var result = await _strawberryShake.Workflows().ListAsync(dataSetIds, cancellationToken);
+            return result.Workflows.Select(x => ToWorkflowFromSs(x)).ToList();
+        }
 
         public Task<IWorkflowAddDataResult> AddDataAsync(int workflowId, CancellationToken cancellationToken) =>
             _strawberryShake.Workflows().AddData(workflowId, cancellationToken);
 
         public Task<WorkflowStatus> GetStatusAsync(int workflowId, CancellationToken cancellationToken) =>
             _strawberryShake.Workflows().GetStatus(workflowId, cancellationToken);
+
+        private IWorkflow ToWorkflowFromSs(IListWorkflows_Workflows_Workflows workflow) => new WorkflowSs(workflow);
     }
 }