Merge branch 'master' of https://github.com/danielgerlag/workflow-core

danielgerlag · danielgerlag · commit aa4802c6620f · 2019-08-30T09:42:39.000-07:00
diff --git a/src/WorkflowCore/Services/DefinitionStorage/DefinitionLoader.cs b/src/WorkflowCore/Services/DefinitionStorage/DefinitionLoader.cs
@@ -25,7 +25,7 @@ public DefinitionLoader(IWorkflowRegistry registry)
         {
             _registry = registry;
         }
-                        
+
         public WorkflowDefinition LoadDefinition(string source, Func<string, DefinitionSourceV1> deserializer)
         {
             var sourceObj = deserializer(source);
@@ -119,7 +119,7 @@ private WorkflowStepCollection ConvertSteps(ICollection<StepSourceV1> source, Ty
                     targetStep.Outcomes.Add(new StepOutcome() { ExternalNextStepId = $"{nextStep.NextStepId}" });
 
                 result.Add(targetStep);
-                
+
                 i++;
             }
 
@@ -176,6 +176,11 @@ private void AttachInputs(StepSourceV1 source, Type dataType, Type stepType, Wor
                 var environmentVarsParameter = Expression.Parameter(typeof(IDictionary), "environment");
                 var stepProperty = stepType.GetProperty(input.Key);
 
+                if (stepProperty == null)
+                {
+                    throw new ArgumentException($"Unknown property for input {input.Key} on {source.Id}");
+                }
+
                 if (input.Value is string)
                 {
                     var acn = BuildScalarInputAction(input, dataParameter, contextParameter, environmentVarsParameter, stepProperty);
@@ -203,7 +208,7 @@ private void AttachOutputs(StepSourceV1 source, Type dataType, Type stepType, Wo
 
                 var dataParameter = Expression.Parameter(dataType, "data");
                 Expression targetProperty;
-                
+
                 // Check if our datatype has a matching property
                 var propertyInfo = dataType.GetProperty(output.Key);
                 if (propertyInfo != null)
@@ -217,7 +222,7 @@ private void AttachOutputs(StepSourceV1 source, Type dataType, Type stepType, Wo
                     // If we did not find a matching property try to find a Indexer with string parameter
                     propertyInfo = dataType.GetProperty("Item");
                     targetProperty = Expression.Property(dataParameter, propertyInfo, Expression.Constant(output.Key));
-                    
+
                     Action<IStepBody, object> acn = (pStep, pData) =>
                     {
                         object resolvedValue = sourceExpr.Compile().DynamicInvoke(pStep); ;
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/MigrationContextFactory.cs b/src/providers/WorkflowCore.Persistence.PostgreSQL/MigrationContextFactory.cs
@@ -7,7 +7,7 @@ public class MigrationContextFactory : IDesignTimeDbContextFactory<PostgresConte
     {
         public PostgresContext CreateDbContext(string[] args)
         {
-            return new PostgresContext(@"Server=127.0.0.1;Port=5432;Database=workflow;User Id=postgres;Password=password;");
+            return new PostgresContext(@"Server=127.0.0.1;Port=5432;Database=workflow;User Id=postgres;Password=password;","wfc");
         }
     }
 }
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContext.cs b/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContext.cs
@@ -12,11 +12,13 @@ namespace WorkflowCore.Persistence.PostgreSQL
     public class PostgresContext : WorkflowDbContext
     {
         private readonly string _connectionString;
+        private readonly string _schemaName;
 
-        public PostgresContext(string connectionString)
+        public PostgresContext(string connectionString,string schemaName)
             :base()
         {   
             _connectionString = connectionString;
+            _schemaName = schemaName;
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -27,37 +29,37 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
         protected override void ConfigureSubscriptionStorage(EntityTypeBuilder<PersistedSubscription> builder)
         {
-            builder.ToTable("Subscription", "wfc");
+            builder.ToTable("Subscription", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
 
         protected override void ConfigureWorkflowStorage(EntityTypeBuilder<PersistedWorkflow> builder)
         {
-            builder.ToTable("Workflow", "wfc");
+            builder.ToTable("Workflow", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
                 
         protected override void ConfigureExecutionPointerStorage(EntityTypeBuilder<PersistedExecutionPointer> builder)
         {
-            builder.ToTable("ExecutionPointer", "wfc");
+            builder.ToTable("ExecutionPointer", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
 
         protected override void ConfigureExecutionErrorStorage(EntityTypeBuilder<PersistedExecutionError> builder)
         {
-            builder.ToTable("ExecutionError", "wfc");
+            builder.ToTable("ExecutionError", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
 
         protected override void ConfigureExetensionAttributeStorage(EntityTypeBuilder<PersistedExtensionAttribute> builder)
         {
-            builder.ToTable("ExtensionAttribute", "wfc");
+            builder.ToTable("ExtensionAttribute", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
 
         protected override void ConfigureEventStorage(EntityTypeBuilder<PersistedEvent> builder)
         {
-            builder.ToTable("Event", "wfc");
+            builder.ToTable("Event", _schemaName);
             builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
         }
     }
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContextFactory.cs b/src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresContextFactory.cs
@@ -9,15 +9,17 @@ namespace WorkflowCore.Persistence.PostgreSQL
     public class PostgresContextFactory : IWorkflowDbContextFactory
     {
         private readonly string _connectionString;
+        private readonly string _schemaName;
 
-        public PostgresContextFactory(string connectionString)
+        public PostgresContextFactory(string connectionString, string schemaName)
         {
             _connectionString = connectionString;
+            _schemaName = schemaName;
         }
 
         public WorkflowDbContext Build()
         {
-            return new PostgresContext(_connectionString);
+            return new PostgresContext(_connectionString,_schemaName);
         }
     }
 }
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/ServiceCollectionExtensions.cs b/src/providers/WorkflowCore.Persistence.PostgreSQL/ServiceCollectionExtensions.cs
@@ -10,9 +10,10 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {
-        public static WorkflowOptions UsePostgreSQL(this WorkflowOptions options, string connectionString, bool canCreateDB, bool canMigrateDB)
+        public static WorkflowOptions UsePostgreSQL(this WorkflowOptions options,
+            string connectionString, bool canCreateDB, bool canMigrateDB, string schemaName="wfc")
         {
-            options.UsePersistence(sp => new EntityFrameworkPersistenceProvider(new PostgresContextFactory(connectionString), canCreateDB, canMigrateDB));
+            options.UsePersistence(sp => new EntityFrameworkPersistenceProvider(new PostgresContextFactory(connectionString, schemaName), canCreateDB, canMigrateDB));
             return options;
         }
     }
diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj b/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj
@@ -15,9 +15,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>Provides support to persist workflows running on Workflow Core to a PostgreSQL database.</Description>
-    <Version>2.0.1</Version>
-    <AssemblyVersion>2.0.1.0</AssemblyVersion>
-    <FileVersion>2.0.1.0</FileVersion>
+    <Version>2.0.2</Version>
+    <AssemblyVersion>2.0.2.0</AssemblyVersion>
+    <FileVersion>2.0.2.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/WorkflowCore.TestAssets/Utils.cs b/test/WorkflowCore.TestAssets/Utils.cs
@@ -10,7 +10,7 @@ namespace WorkflowCore.TestAssets
     public static class Utils
     {
         private static JsonSerializerSettings SerializerSettings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All, DateFormatHandling = DateFormatHandling.IsoDateFormat, DateTimeZoneHandling = DateTimeZoneHandling.Utc };
-              
+
         public static T DeepCopy<T>(T obj)
         {
             string str = JsonConvert.SerializeObject(obj, SerializerSettings);
@@ -32,6 +32,11 @@ public static string GetTestDefinitionDynamicJson()
         {
             return File.ReadAllText("stored-dynamic-definition.json");
         }
+
+        public static string GetTestDefinitionJsonMissingInputProperty()
+        {
+            return File.ReadAllText("stored-def-missing-input-property.json");
+        }
     }
 }
 
diff --git a/test/WorkflowCore.TestAssets/WorkflowCore.TestAssets.csproj b/test/WorkflowCore.TestAssets/WorkflowCore.TestAssets.csproj
@@ -25,6 +25,9 @@
     <EmbeddedResource Include="stored-definition.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="stored-def-missing-input-property.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/WorkflowCore.TestAssets/stored-def-missing-input-property.json b/test/WorkflowCore.TestAssets/stored-def-missing-input-property.json
@@ -0,0 +1,19 @@
+﻿{
+  "Id": "Test",
+  "Version": 1,
+  "Description": "",
+  "DataType": "WorkflowCore.TestAssets.DataTypes.CounterBoard, WorkflowCore.TestAssets",
+  "Steps": [
+    {
+      "Id": "Step1",
+      "StepType": "WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets",
+      "ErrorBehavior": "Retry",
+      "Inputs": {
+        "Value1": "data.Counter1"
+      },
+      "Outputs": {
+        "Counter1": "step.Value"
+      }
+    }
+  ]
+}
diff --git a/test/WorkflowCore.Tests.PostgreSQL/PostgresPersistenceProviderFixture.cs b/test/WorkflowCore.Tests.PostgreSQL/PostgresPersistenceProviderFixture.cs
@@ -19,7 +19,7 @@ public class PostgresPersistenceProviderFixture : BasePersistenceFixture
         public PostgresPersistenceProviderFixture(PostgresDockerSetup dockerSetup, ITestOutputHelper output)
         {
             output.WriteLine($"Connecting on {PostgresDockerSetup.ConnectionString}");
-            _subject = new EntityFrameworkPersistenceProvider(new PostgresContextFactory(PostgresDockerSetup.ConnectionString), true, true);
+            _subject = new EntityFrameworkPersistenceProvider(new PostgresContextFactory(PostgresDockerSetup.ConnectionString,"wfc"), true, true);
             _subject.EnsureStoreExists();
         }
     }
diff --git a/test/WorkflowCore.UnitTests/Services/DefinitionStorage/DefinitionLoaderTests.cs b/test/WorkflowCore.UnitTests/Services/DefinitionStorage/DefinitionLoaderTests.cs
@@ -59,13 +59,18 @@ public void ParseDefinitionDynamic()
             A.CallTo(() => _registry.RegisterWorkflow(A<WorkflowDefinition>.That.Matches(MatchTestDefinition, ""))).MustHaveHappened();
         }
 
+        [Fact(DisplayName = "Should throw error for bad input property name on step")]
+        public void ParseDefinitionInputException()
+        {
+            Assert.Throws<ArgumentException>(() => _subject.LoadDefinition(TestAssets.Utils.GetTestDefinitionJsonMissingInputProperty(), Deserializers.Json));
+        }
 
         private bool MatchTestDefinition(WorkflowDefinition def)
         {
             //TODO: make this better
             var step1 = def.Steps.Single(s => s.ExternalId == "Step1");
             var step2 = def.Steps.Single(s => s.ExternalId == "Step2");
-            
+
             step1.Outcomes.Count.Should().Be(1);
             step1.Inputs.Count.Should().Be(1);
             step1.Outputs.Count.Should().Be(1);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class MigrationContextFactory : IDesignTimeDbContextFactory<PostgresConte`
`7`	`7`	`{`
`8`	`8`	`public PostgresContext CreateDbContext(string[] args)`
`9`	`9`	`{`
`10`		`- return new PostgresContext(@"Server=127.0.0.1;Port=5432;Database=workflow;User Id=postgres;Password=password;");`
	`10`	`+ return new PostgresContext(@"Server=127.0.0.1;Port=5432;Database=workflow;User Id=postgres;Password=password;","wfc");`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,13 @@ namespace WorkflowCore.Persistence.PostgreSQL`
`12`	`12`	`public class PostgresContext : WorkflowDbContext`
`13`	`13`	`{`
`14`	`14`	`private readonly string _connectionString;`
	`15`	`+ private readonly string _schemaName;`
`15`	`16`
`16`		`- public PostgresContext(string connectionString)`
	`17`	`+ public PostgresContext(string connectionString,string schemaName)`
`17`	`18`	`:base()`
`18`	`19`	`{`
`19`	`20`	`_connectionString = connectionString;`
	`21`	`+ _schemaName = schemaName;`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`@@ -27,37 +29,37 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`27`	`29`
`28`	`30`	`protected override void ConfigureSubscriptionStorage(EntityTypeBuilder<PersistedSubscription> builder)`
`29`	`31`	`{`
`30`		`- builder.ToTable("Subscription", "wfc");`
	`32`	`+ builder.ToTable("Subscription", _schemaName);`
`31`	`33`	`builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`protected override void ConfigureWorkflowStorage(EntityTypeBuilder<PersistedWorkflow> builder)`
`35`	`37`	`{`
`36`		`- builder.ToTable("Workflow", "wfc");`
	`38`	`+ builder.ToTable("Workflow", _schemaName);`
`37`	`39`	`builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`protected override void ConfigureExecutionPointerStorage(EntityTypeBuilder<PersistedExecutionPointer> builder)`
`41`	`43`	`{`
`42`		`- builder.ToTable("ExecutionPointer", "wfc");`
	`44`	`+ builder.ToTable("ExecutionPointer", _schemaName);`
`43`	`45`	`builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`protected override void ConfigureExecutionErrorStorage(EntityTypeBuilder<PersistedExecutionError> builder)`
`47`	`49`	`{`
`48`		`- builder.ToTable("ExecutionError", "wfc");`
	`50`	`+ builder.ToTable("ExecutionError", _schemaName);`
`49`	`51`	`builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`protected override void ConfigureExetensionAttributeStorage(EntityTypeBuilder<PersistedExtensionAttribute> builder)`
`53`	`55`	`{`
`54`		`- builder.ToTable("ExtensionAttribute", "wfc");`
	`56`	`+ builder.ToTable("ExtensionAttribute", _schemaName);`
`55`	`57`	`builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`protected override void ConfigureEventStorage(EntityTypeBuilder<PersistedEvent> builder)`
`59`	`61`	`{`
`60`		`- builder.ToTable("Event", "wfc");`
	`62`	`+ builder.ToTable("Event", _schemaName);`
`61`	`63`	`builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();`
`62`	`64`	`}`
`63`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,17 @@ namespace WorkflowCore.Persistence.PostgreSQL`
`9`	`9`	`public class PostgresContextFactory : IWorkflowDbContextFactory`
`10`	`10`	`{`
`11`	`11`	`private readonly string _connectionString;`
	`12`	`+ private readonly string _schemaName;`
`12`	`13`
`13`		`- public PostgresContextFactory(string connectionString)`
	`14`	`+ public PostgresContextFactory(string connectionString, string schemaName)`
`14`	`15`	`{`
`15`	`16`	`_connectionString = connectionString;`
	`17`	`+ _schemaName = schemaName;`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`public WorkflowDbContext Build()`
`19`	`21`	`{`
`20`		`- return new PostgresContext(_connectionString);`
	`22`	`+ return new PostgresContext(_connectionString,_schemaName);`
`21`	`23`	`}`
`22`	`24`	`}`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,10 @@ namespace Microsoft.Extensions.DependencyInjection`
`10`	`10`	`{`
`11`	`11`	`public static class ServiceCollectionExtensions`
`12`	`12`	`{`
`13`		`- public static WorkflowOptions UsePostgreSQL(this WorkflowOptions options, string connectionString, bool canCreateDB, bool canMigrateDB)`
	`13`	`+ public static WorkflowOptions UsePostgreSQL(this WorkflowOptions options,`
	`14`	`+ string connectionString, bool canCreateDB, bool canMigrateDB, string schemaName="wfc")`
`14`	`15`	`{`
`15`		`- options.UsePersistence(sp => new EntityFrameworkPersistenceProvider(new PostgresContextFactory(connectionString), canCreateDB, canMigrateDB));`
	`16`	`+ options.UsePersistence(sp => new EntityFrameworkPersistenceProvider(new PostgresContextFactory(connectionString, schemaName), canCreateDB, canMigrateDB));`
`16`	`17`	`return options;`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace WorkflowCore.TestAssets`
`10`	`10`	`public static class Utils`
`11`	`11`	`{`
`12`	`12`	`private static JsonSerializerSettings SerializerSettings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All, DateFormatHandling = DateFormatHandling.IsoDateFormat, DateTimeZoneHandling = DateTimeZoneHandling.Utc };`
`13`		`-`
	`13`	`+`
`14`	`14`	`public static T DeepCopy<T>(T obj)`
`15`	`15`	`{`
`16`	`16`	`string str = JsonConvert.SerializeObject(obj, SerializerSettings);`
`@@ -32,6 +32,11 @@ public static string GetTestDefinitionDynamicJson()`
`32`	`32`	`{`
`33`	`33`	`return File.ReadAllText("stored-dynamic-definition.json");`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ public static string GetTestDefinitionJsonMissingInputProperty()`
	`37`	`+ {`
	`38`	`+ return File.ReadAllText("stored-def-missing-input-property.json");`
	`39`	`+ }`
`35`	`40`	`}`
`36`	`41`	`}`
`37`	`42`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class PostgresPersistenceProviderFixture : BasePersistenceFixture`
`19`	`19`	`public PostgresPersistenceProviderFixture(PostgresDockerSetup dockerSetup, ITestOutputHelper output)`
`20`	`20`	`{`
`21`	`21`	`output.WriteLine($"Connecting on {PostgresDockerSetup.ConnectionString}");`
`22`		`- _subject = new EntityFrameworkPersistenceProvider(new PostgresContextFactory(PostgresDockerSetup.ConnectionString), true, true);`
	`22`	`+ _subject = new EntityFrameworkPersistenceProvider(new PostgresContextFactory(PostgresDockerSetup.ConnectionString,"wfc"), true, true);`
`23`	`23`	`_subject.EnsureStoreExists();`
`24`	`24`	`}`
`25`	`25`	`}`