Merge pull request #12 from IndicoDataSolutions/bugfix/INT-136-submit-review-empty-changes

szymon-socha · web-flow · commit 9c08b7689843 · 2021-04-21T12:15:36.000+02:00
INT-136 Submit review empty changes
diff --git a/Indico.BluePrism.Connector.IntegrationTests/IndicoConnectorTests/ConnectorTestsBase.cs b/Indico.BluePrism.Connector.IntegrationTests/IndicoConnectorTests/ConnectorTestsBase.cs
@@ -28,32 +28,28 @@ public void PerformAction_ShouldReturnResult()
         }
 
         [Test]
-        public void PerformAction_ShouldThrow_WhenBaseUrlNotFound() => 
+        public void PerformAction_ShouldThrow_WhenBaseUrlNotFound() =>
             new IndicoConnectorBuilder().WithBaseUrl("https://invalid.indico.io").Build()
                 .Invoking(PerformAction)
-                .Should().Throw<HttpRequestException>()
-                .WithMessage("No such host is known.");
+                .Should().Throw<HttpRequestException>();
 
         [Test]
         public void PerformAction_ShouldThrow_WhenBaseUrlIncorrectFormat() =>
             new IndicoConnectorBuilder().WithBaseUrl("invalid").Build()
                 .Invoking(PerformAction)
-                .Should().Throw<UriFormatException>()
-                .WithMessage("Invalid URI: The format of the URI could not be determined.");
+                .Should().Throw<UriFormatException>();
 
         [Test]
         public void PerformAction_ShouldThrow_WhenApiTokenIncorrect() =>
             new IndicoConnectorBuilder().WithToken("invalid").Build()
                 .Invoking(PerformAction)
-                .Should().Throw<HttpRequestException>()
-                .WithMessage("[error] : Unauthorized");
+                .Should().Throw<HttpRequestException>();
 
         [Test]
         public void PerformAction_ShouldThrow_WhenApiTokenNull() =>
             new IndicoConnectorBuilder().WithToken(null)
                 .Invoking(bld => PerformAction(bld.Build()))
-                .Should().Throw<ArgumentNullException>()
-                .WithMessage("Value cannot be null. (Parameter 'apiToken')");
+                .Should().Throw<ArgumentNullException>();
 
 
         protected abstract TActionResult PerformAction(IndicoConnector connector);
diff --git a/Indico.BluePrism.Connector.IntegrationTests/IndicoConnectorTests/ListSubmissionsTests.cs b/Indico.BluePrism.Connector.IntegrationTests/IndicoConnectorTests/ListSubmissionsTests.cs
@@ -14,21 +14,20 @@ public void ListSubmissions_Throws_WhenIncorrectWorkflowId()
             var connector = new IndicoConnectorBuilder().Build();
             const string expectedExceptionMessage =
                 @"1 : http://sunbow:5000/api/submission?workflow_ids=0&limit=1&filters=%7B%7D: {""code"": 403, ""content"": {}, ""error_class"": ""ServiceException"", ""error_type"": ""ForbiddenAccess"", ""message"": ""This user does not have access to this resource""}";
-            connector.Invoking(c => c.ListSubmissions(null, new decimal[] {0}.ToDataTable(), null, null, null, 1))
+            connector.Invoking(c => c.ListSubmissions(null, new decimal[] { 0 }.ToDataTable(), null, null, null, 1))
                 .Should()
                 .Throw<GraphQLException>()
                 .WithMessage(expectedExceptionMessage);
         }
 
-
         protected override DataTable PerformAction(IndicoConnector connector) =>
             connector.ListSubmissions(
+                DataTableHelpers.ToDataTable(new[] { _dataHelper.GetAnySubmissionId() }),
+                null,
+                null,
+                null,
                 null,
-                 DataTableHelpers.ToDataTable(new[] { _dataHelper.GetAnySubmissionId() }),
-                        null,
-                        null,
-                        null,
-                        1);
+                1);
 
         protected override void AssertResultCorrect(DataTable result) => result.Rows.Count.Should().Be(1);
     }
diff --git a/Indico.BluePrism.Connector.IntegrationTests/Utils/TestDataHelper.cs b/Indico.BluePrism.Connector.IntegrationTests/Utils/TestDataHelper.cs
@@ -8,9 +8,9 @@ public class TestDataHelper
 
         public TestDataHelper(IndicoConnector connector) => _connector = connector;
 
-        public decimal GetAnyWorkflowId() => 1087;
+        public decimal GetAnyWorkflowId() => (int)GetSubmission()["WorkflowId"];
 
-        public decimal GetAnySubmissionId() => (int)_connector.ListSubmissions(null, null, null, null, null, 1).Rows[0]["Id"];
+        public decimal GetAnySubmissionId() => (int)GetSubmission()["Id"];
 
         public decimal GetNewSubmissionId() => (int)_connector.WorkflowSubmission(
             null,
@@ -27,5 +27,7 @@ public decimal GetNewSubmissionId() => (int)_connector.WorkflowSubmission(
 
         private (decimal submisisonId, DataTable submissionResult) GetSubmissionResult(decimal submissionId) => (submissionId,
             _connector.SubmissionResult(submissionId, default));
+
+        private DataRow GetSubmission() => _connector.ListSubmissions(null, null, null, null, null, 1).Rows[0];
     }
 }
diff --git a/Indico.BluePrism.Connector/IndicoConnector.cs b/Indico.BluePrism.Connector/IndicoConnector.cs
@@ -52,8 +52,8 @@ public IndicoConnector(ISubmissionsClient submissionsClient, ISubmissionResultAw
 
         public DataTable WorkflowSubmission(DataTable filepaths, DataTable uris, decimal workflowId)
         {
-            bool filepathsProvided = ValidateInputDataTable(filepaths);
-            bool urisProvided = ValidateInputDataTable(uris);
+            bool filepathsProvided = HasAnyRows(filepaths);
+            bool urisProvided = HasAnyRows(uris);
 
             if (!filepathsProvided && !urisProvided)
             {
@@ -166,9 +166,15 @@ public DataTable SubmitReview(decimal submissionIdDec, DataTable changesTable, b
         private DataTable SubmitReview(decimal submissionIdDec, DataTable changesTable, bool rejected, bool? forceComplete)
         {
             var submissionId = (int)submissionIdDec;
-            var changes = _jsonUtility.ConvertToJSON(changesTable ?? throw new ArgumentNullException(nameof(changesTable)));
+            var changesProvided = HasAnyRows(changesTable);
+            JObject changes = null;
 
-            var jobResult = Task.Run(() => SubmitReviewAsync(submissionId, (JObject)changes, rejected, forceComplete))
+            if (changesProvided)
+            {
+                changes = (JObject)_jsonUtility.ConvertToJSON(changesTable);
+            }
+
+            var jobResult = Task.Run(() => SubmitReviewAsync(submissionId, changes, rejected, forceComplete))
                 .GetAwaiter()
                 .GetResult();
 
@@ -188,7 +194,7 @@ private async Task<JObject> SubmitReviewAsync(int submissionId, JObject changes,
             }
         }
 
-        private static bool ValidateInputDataTable(DataTable dataTable)
+        private static bool HasAnyRows(DataTable dataTable)
         {
             if (dataTable == null || dataTable.Rows.Count == 0)
             {

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ public class TestDataHelper`
`8`	`8`
`9`	`9`	`public TestDataHelper(IndicoConnector connector) => _connector = connector;`
`10`	`10`
`11`		`- public decimal GetAnyWorkflowId() => 1087;`
	`11`	`+ public decimal GetAnyWorkflowId() => (int)GetSubmission()["WorkflowId"];`
`12`	`12`
`13`		`- public decimal GetAnySubmissionId() => (int)_connector.ListSubmissions(null, null, null, null, null, 1).Rows[0]["Id"];`
	`13`	`+ public decimal GetAnySubmissionId() => (int)GetSubmission()["Id"];`
`14`	`14`
`15`	`15`	`public decimal GetNewSubmissionId() => (int)_connector.WorkflowSubmission(`
`16`	`16`	`null,`
`@@ -27,5 +27,7 @@ public decimal GetNewSubmissionId() => (int)_connector.WorkflowSubmission(`
`27`	`27`
`28`	`28`	`private (decimal submisisonId, DataTable submissionResult) GetSubmissionResult(decimal submissionId) => (submissionId,`
`29`	`29`	`_connector.SubmissionResult(submissionId, default));`
	`30`	`+`
	`31`	`+ private DataRow GetSubmission() => _connector.ListSubmissions(null, null, null, null, null, 1).Rows[0];`
`30`	`32`	`}`
`31`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ public IndicoConnector(ISubmissionsClient submissionsClient, ISubmissionResultAw`
`52`	`52`
`53`	`53`	`public DataTable WorkflowSubmission(DataTable filepaths, DataTable uris, decimal workflowId)`
`54`	`54`	`{`
`55`		`- bool filepathsProvided = ValidateInputDataTable(filepaths);`
`56`		`- bool urisProvided = ValidateInputDataTable(uris);`
	`55`	`+ bool filepathsProvided = HasAnyRows(filepaths);`
	`56`	`+ bool urisProvided = HasAnyRows(uris);`
`57`	`57`
`58`	`58`	`if (!filepathsProvided && !urisProvided)`
`59`	`59`	`{`
`@@ -166,9 +166,15 @@ public DataTable SubmitReview(decimal submissionIdDec, DataTable changesTable, b`
`166`	`166`	`private DataTable SubmitReview(decimal submissionIdDec, DataTable changesTable, bool rejected, bool? forceComplete)`
`167`	`167`	`{`
`168`	`168`	`var submissionId = (int)submissionIdDec;`
`169`		`- var changes = _jsonUtility.ConvertToJSON(changesTable ?? throw new ArgumentNullException(nameof(changesTable)));`
	`169`	`+ var changesProvided = HasAnyRows(changesTable);`
	`170`	`+ JObject changes = null;`
`170`	`171`
`171`		`- var jobResult = Task.Run(() => SubmitReviewAsync(submissionId, (JObject)changes, rejected, forceComplete))`
	`172`	`+ if (changesProvided)`
	`173`	`+ {`
	`174`	`+ changes = (JObject)_jsonUtility.ConvertToJSON(changesTable);`
	`175`	`+ }`
	`176`	`+`
	`177`	`+ var jobResult = Task.Run(() => SubmitReviewAsync(submissionId, changes, rejected, forceComplete))`
`172`	`178`	`.GetAwaiter()`
`173`	`179`	`.GetResult();`
`174`	`180`
`@@ -188,7 +194,7 @@ private async Task<JObject> SubmitReviewAsync(int submissionId, JObject changes,`
`188`	`194`	`}`
`189`	`195`	`}`
`190`	`196`
`191`		`- private static bool ValidateInputDataTable(DataTable dataTable)`
	`197`	`+ private static bool HasAnyRows(DataTable dataTable)`
`192`	`198`	`{`
`193`	`199`	`if (dataTable == null \|\| dataTable.Rows.Count == 0)`
`194`	`200`	`{`