Merge pull request #335 from neuroglia-io/fix-odata-expression-eval

Fixed the ODataFunctionProcessor to properly evaluate both operation uri and arguments before performing the ODATA call

Author: cdavernas

src/apps/Synapse.Worker/Extensions/IWorkflowRuntimeContextExtensions.cs

@@ -43,7 +43,7 @@ public static class IWorkflowRuntimeContextExtensions
             var json = JsonConvert.SerializeObject(expressionObject, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); ;
             foreach (var match in Regex.Matches(json, @"""\$\{.+?\}""", RegexOptions.Compiled).Cast<Match>())
             {
-                var expression = match.Value[3..^2].Trim().Replace(@"\""", @"""");
+                var expression = Regex.Unescape(match.Value[3..^2].Trim().Replace(@"\""", @""""));
                 var evaluationResult = await context.EvaluateAsync(expression, data, cancellationToken);
                 if (evaluationResult == null) continue;
                 var valueToken = JToken.FromObject(evaluationResult);
@@ -52,7 +52,7 @@ public static class IWorkflowRuntimeContextExtensions
                 {
                     value = valueToken.Type switch
                     {
-                        JTokenType.String => @$"""{valueToken}""",
+                        JTokenType.String => JsonConvert.SerializeObject(valueToken),
                         _ => valueToken.ToString(),
                     };
                 }

src/apps/Synapse.Worker/Services/Processors/ODataFunctionProcessor.cs

@@ -15,6 +15,8 @@
  *
  */
 
+using IdentityModel.Client;
+using Newtonsoft.Json;
 using Simple.OData.Client;
 using Synapse.Integration.Events.WorkflowActivities;
 
@@ -80,7 +82,13 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         {
             await base.InitializeAsync(cancellationToken);
             await this.HttpClient.ConfigureAuthorizationAsync(this.ServiceProvider, this.Authentication, cancellationToken);
-            var components = this.Function.Operation.Split("#", StringSplitOptions.RemoveEmptyEntries);
+            var odataUriString = this.Function.Operation;
+            if (odataUriString.IsRuntimeExpression())
+            {
+                var evaluationResult = (string?)await this.Context.EvaluateAsync(odataUriString, this.Activity.Input, cancellationToken);
+                if (!string.IsNullOrWhiteSpace(evaluationResult)) odataUriString = evaluationResult;
+            }
+            var components = odataUriString.Split("#", StringSplitOptions.RemoveEmptyEntries);
             if (components.Length != 2)
                 throw new FormatException($"The 'operation' property of the ODATA function with name '{this.Function.Name}' has an invalid value '{this.Function.Operation}'. ODATA functions expect a value in the following format: <URI_to_odata_service>#<Entity_Set_Name>");
             this.ServiceUri = new(components.First());
@@ -97,7 +105,11 @@ protected override async Task ProcessAsync(CancellationToken cancellationToken)
                 return;
             try
             {
-                var commandOptions = this.FunctionReference.Arguments?.ToObject<ODataCommandOptions>();
+                var parameters = this.FunctionReference.Arguments?.ToObject()!;
+                var inputData = this.Activity.Input!.ToObject()!;
+                parameters = (await this.Context.EvaluateObjectAsync(parameters, inputData, cancellationToken))!;
+
+                var commandOptions = JsonConvert.DeserializeObject<ODataCommandOptions>(JsonConvert.SerializeObject(parameters));
                 var command = this.EntitySet;
                 if (!string.IsNullOrWhiteSpace(commandOptions?.Key))
                     command += $"({commandOptions.Key})";