merged changes

delegateas · Nov 2, 2023 · 6292a0b · 6292a0b
2 parents 85dd373 + b5bece6
commit 6292a0b
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 45 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,7 +33,13 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
-
+
+      - name: Setup Git for Windows' minimal SDK
+        uses: git-for-windows/setup-git-for-windows-sdk@v1
+
+      - name: Print GIT verison
+        run:  git --version  
+
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.x'   
@@ -62,7 +68,7 @@ jobs:
 
       - name: Print release verison
         run: echo ${env:RELEASE_VERSION}
-
+       
       - name: Cleaning
         run: dotnet clean
 

diff --git a/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj b/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Hangfire" Version="1.7.31" />
+        <PackageReference Include="Hangfire" Version="1.8.6" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/WorkflowEngine.Core/ExpressionEngineExtensions.cs b/src/WorkflowEngine.Core/ExpressionEngineExtensions.cs
@@ -29,6 +29,9 @@ public static async ValueTask<IDictionary<string, object>> ResolveInputs(this IE
         {
 
             var resolvedInputs = new Dictionary<string, object>();
+            if (inputs == null)
+                return resolvedInputs;
+
 
             foreach (var input in inputs)
             {
@@ -48,16 +51,16 @@ public static async ValueTask<IDictionary<string, object>> ResolveInputs(this IE
                     }
 
                 }
-                 
+
             }
 
             return resolvedInputs;
 
         }
-        public static  ValueTask<IDictionary<string,object>> ResolveInputs(this IExpressionEngine engine, ActionMetadata actionMetadata, ILogger logger)
+        public static ValueTask<IDictionary<string, object>> ResolveInputs(this IExpressionEngine engine, ActionMetadata actionMetadata, ILogger logger)
         {
             return engine.ResolveInputs(actionMetadata.Inputs, logger);
-             
+
         }
     }
 }
diff --git a/src/WorkflowEngine.Core/IOutputsRepository.cs b/src/WorkflowEngine.Core/IOutputsRepository.cs
@@ -10,10 +10,6 @@ public interface IOutputsRepository
         ValueTask<object> GetTriggerData(Guid id);
         ValueTask AddInput(IRunContext context, IWorkflow workflow, IAction action);
         ValueTask<object> GetOutputData(Guid id, string v);
-        ValueTask AddArrayItemAsync(IRunContext run, IWorkflow workflow, string key, IActionResult result);
-        ValueTask AddArrayInput(IRunContext context, IWorkflow workflow, IAction action);
-      //  ValueTask StartScope(IRunContext context, IWorkflow workflow, IAction action);
-        ValueTask AddScopeItem(IRunContext context, IWorkflow workflow, IAction action, IActionResult result);
         ValueTask EndScope(IRunContext run, IWorkflow workflow, IAction action);
         ValueTask AddEvent(IRunContext run, IWorkflow workflow, IAction action, Event @event);
     }

diff --git a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj
@@ -14,7 +14,7 @@
     </ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
-		<PackageReference Include="Delegate.ExpressionEngine" Version="4.0.0" />
+		<PackageReference Include="Delegate.ExpressionEngine" Version="4.1.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
 	</ItemGroup>

diff --git a/src/WorkflowEngine.Core/WorkflowExecutor.cs b/src/WorkflowEngine.Core/WorkflowExecutor.cs
@@ -28,12 +28,9 @@ public WorkflowExecutor(ILogger<WorkflowExecutor> logger, IOutputsRepository  ou
         public ValueTask<IAction> GetNextAction(IRunContext context, IWorkflow workflow, IAction action, IActionResult priorResult)
         {
             logger.LogInformation("Finding Next Action for {WorkflowId} and prior {@result} ", workflow.Id, priorResult);
-            //var action = workflow.Manifest.Actions.Single(c => c.Key == priorResult.Key);
-
-
+
             var next = workflow.Manifest.Actions.FindNextAction(priorResult.Key);
-            //var parent = workflow.Manifest.Actions.FindParentAction(priorResult.Key) is ForLoopActionMetadata;
-
+
             if (next.IsDefault())
                 return new ValueTask<IAction>();
 

diff --git a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
 		<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Hangfire.Core" Version="1.7.31" />
+        <PackageReference Include="Hangfire.Core" Version="1.8.6" />
 
     </ItemGroup>
 
@@ -21,11 +21,8 @@
 	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
 	</ItemGroup>
-
-
-
-    <ItemGroup>
-        <ProjectReference Include="..\WorkflowEngine.Core\WorkflowEngine.Core.csproj" />
-    </ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\WorkflowEngine.Core\WorkflowEngine.Core.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/WorkflowEngine.Hangfire/WorkflowStarterBackgroundJob.cs b/src/WorkflowEngine.Hangfire/WorkflowStarterBackgroundJob.cs
@@ -32,28 +32,31 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                 foreach (var workflow in await workflows.GetAllWorkflows())
                 {
-                    var trigger = workflow.Manifest.Triggers.FirstOrDefault(t => t.Value.Type == "TimerTrigger");
 
-                    if (!trigger.Equals(default(KeyValuePair<string, TriggerMetadata>)))
+                    foreach (var trigger in workflow.Manifest.Triggers.Where(t => t.Value.Type == "TimerTrigger"))
                     {
-                         
-
-
-                        jobs.AddOrUpdate<IHangfireWorkflowExecutor>(workflow.Id.ToString(),
-                            (executor) => executor.TriggerAsync(new TriggerContext
-                            {
-                                Workflow = workflow,
-                                Trigger = new Trigger
+
+                        if (!trigger.Equals(default(KeyValuePair<string, TriggerMetadata>)))
+                        {
+
+                            workflow.Manifest = null;
+
+                            jobs.AddOrUpdate(workflow.Id.ToString() + trigger.Key,
+                                (System.Linq.Expressions.Expression<Action<IHangfireWorkflowExecutor>>)((executor) => executor.TriggerAsync(new TriggerContext
                                 {
-                                    Inputs = trigger.Value.Inputs,
-                                    ScheduledTime = DateTimeOffset.UtcNow,
-                                    Type = trigger.Value.Type,
-                                    Key = trigger.Key
-                                },
-                            },null), trigger.Value.Inputs["cronExpression"] as string);
-
-                        if (first && trigger.Value.Inputs.ContainsKey("runAtStartup") && (bool)trigger.Value.Inputs["runAtStartup"])
-                            jobs.Trigger(workflow.Id.ToString());
+                                    Workflow = workflow,
+                                    Trigger = new Trigger
+                                    {
+                                        Inputs = trigger.Value.Inputs,
+                                        ScheduledTime = DateTimeOffset.UtcNow,
+                                        Type = trigger.Value.Type,
+                                        Key = trigger.Key
+                                    },
+                                }, null)), trigger.Value.Inputs["cronExpression"] as string,GetTimeZone(trigger) );
+
+                            if (first && trigger.Value.Inputs.ContainsKey("runAtStartup") && (bool)trigger.Value.Inputs["runAtStartup"])
+                                jobs.Trigger(workflow.Id.ToString());
+                        }
                     }
                 }
 
@@ -66,7 +69,14 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
             }
 
-
+            static TimeZoneInfo GetTimeZone(KeyValuePair<string, TriggerMetadata> trigger)
+            {
+
+                if (trigger.Value.Inputs.ContainsKey("timezone") && trigger.Value.Inputs["timezone"] is string zone && !string.IsNullOrWhiteSpace(zone))
+                    return TimeZoneInfo.FindSystemTimeZoneById(zone) ?? TimeZoneInfo.Utc;
+                return TimeZoneInfo.Utc;
+
+            }
         }
     }
 }