Reconciled domain models with data models

Domain/Sia.Domain.ApiModels/Playbooks/CreateAction.cs

@@ -7,7 +7,6 @@ namespace Sia.Domain.ApiModels.Playbooks
 {
     public class CreateAction
     {
-        public bool IsUrl { get; set; }
         public CreateActionTemplate NewActionTemplate { get; set; }
         public long? ExistingActionTemplateId { get; set; }
         public ICollection<CreateConditionSet> NewConditionSets { get; set; }

Domain/Sia.Domain.ApiModels/Playbooks/CreateActionTemplate.cs

@@ -9,6 +9,8 @@ namespace Sia.Domain.ApiModels.Playbooks
     {
         [Required]
         public string Name { get; set; }
+        public bool IsUrl { get; set; }
+        public string Template { get; set; }
         public ICollection<CreateActionTemplateSource> NewSources { get; set; }
             = new List<CreateActionTemplateSource>();
         public ICollection<long> ExistingSourceIds { get; set; }

Domain/Sia.Domain.ApiModels/Playbooks/CreateCondition.cs

@@ -8,9 +8,14 @@ namespace Sia.Domain.ApiModels.Playbooks
     public class CreateCondition
     {
         public string Name { get; set; }
+        public AssertionType AssertionType { get; set; }
+            = AssertionType.IsOrDoes;
         public ConditionType ConditionType { get; set; }
+        public DataFormat DataFormat { get; set; }
+            = DataFormat.String;
         public string ComparisonValue { get; set; }
-        public CreateConditionSource NewConditionSource { get; set; }
+        public long? IntegerComparisonValue { get; set; }
+        public DateTime DateTimeComparisonValue { get; set; }
         public long? ExistingConditionSourceId { get; set; }
     }
 }

Domain/Sia.Domain.ApiModels/Sia.Domain.ApiModels.csproj

@@ -15,11 +15,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Sia.Shared" Version="1.1.0-alpha" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Sia.Domain\Sia.Domain.csproj" />
+    <ProjectReference Include="..\Sia.Shared\Sia.Shared.csproj" />
   </ItemGroup>
 
 </Project>

Domain/Sia.Domain/Playbook/Action.cs

@@ -8,7 +8,6 @@ namespace Sia.Domain.Playbook
     public class Action : IEntity
     {
         public long Id { get; set; }
-        public bool IsUrl { get; set; }
         public ActionTemplate ActionTemplate { get; set; }
         public ICollection<ConditionSet> ConditionSets { get; set; }
             = new List<ConditionSet>();

Domain/Sia.Domain/Playbook/Condition.cs

@@ -9,16 +9,36 @@ namespace Sia.Domain.Playbook
     {
         public long Id { get; set; }
         public string Name { get; set; }
+        public AssertionType AssertionType { get; set; }
+            = AssertionType.IsOrDoes;
         public ConditionType ConditionType { get; set; }
+        public DataFormat DataFormat { get; set; }
+            = DataFormat.String;
         public string ComparisonValue { get; set; }
+        public long? IntegerComparisonValue { get; set; }
+        public DateTime DateTimeComparisonValue { get; set; }
         public ConditionSource ConditionSource { get; set; }
     }
 
+    public enum AssertionType
+    {
+        IsOrDoes,
+        IsNotOrDoesNot
+    }
+
     public enum ConditionType
     {
-        Equals,
-        DoesNotEqual,
-        Contains,
-        DoesNotContain
+        Equal,
+        Contain,
+        HaveValue,
+        GreaterThan,
+        LessThan
+    }
+
+    public enum DataFormat
+    {
+        String,
+        DateTime,
+        Integer
     }
 }

Domain/Sia.Domain/Sia.Domain.csproj

@@ -15,7 +15,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Sia.Shared" Version="1.1.0-alpha" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Sia.Shared\Sia.Shared.csproj" />
   </ItemGroup>
 
 </Project>