Conditions - Big refactor to prepare for conditional databindings

Conditions - Improved list-condition functionality

src/Artemis.Storage/Entities/Profile/Abstract/DisplayConditionPartEntity.cs

@@ -2,8 +2,8 @@
 
 namespace Artemis.Storage.Entities.Profile.Abstract
 {
-    public abstract class DisplayConditionPartEntity
+    public abstract class DataModelConditionPartEntity
     {
-        public List<DisplayConditionPartEntity> Children { get; set; }
+        public List<DataModelConditionPartEntity> Children { get; set; }
     }
 }

src/Artemis.Storage/Entities/Profile/Abstract/RenderElementEntity.cs

@@ -16,6 +16,6 @@ namespace Artemis.Storage.Entities.Profile.Abstract
         public List<PropertyEntity> PropertyEntities { get; set; }
         public List<string> ExpandedPropertyGroups { get; set; }
 
-        public DisplayConditionGroupEntity RootDisplayCondition { get; set; }
+        public DataModelConditionGroupEntity DisplayCondition { get; set; }
     }
 }

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionGroupEntity.cs

@@ -3,11 +3,11 @@ using Artemis.Storage.Entities.Profile.Abstract;
 
 namespace Artemis.Storage.Entities.Profile.Conditions
 {
-    public class DisplayConditionGroupEntity : DisplayConditionPartEntity
+    public class DataModelConditionGroupEntity : DataModelConditionPartEntity
     {
-        public DisplayConditionGroupEntity()
+        public DataModelConditionGroupEntity()
         {
-            Children = new List<DisplayConditionPartEntity>();
+            Children = new List<DataModelConditionPartEntity>();
         }
 
         public int BooleanOperator { get; set; }

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionListEntity.cs

@@ -4,11 +4,11 @@ using Artemis.Storage.Entities.Profile.Abstract;
 
 namespace Artemis.Storage.Entities.Profile.Conditions
 {
-    public class DisplayConditionListEntity : DisplayConditionPartEntity
+    public class DataModelConditionListEntity : DataModelConditionPartEntity
     {
-        public DisplayConditionListEntity()
+        public DataModelConditionListEntity()
         {
-            Children = new List<DisplayConditionPartEntity>();
+            Children = new List<DataModelConditionPartEntity>();
         }
 
         public Guid? ListDataModelGuid { get; set; }

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionListPredicateEntity.cs

@@ -3,7 +3,7 @@ using Artemis.Storage.Entities.Profile.Abstract;
 
 namespace Artemis.Storage.Entities.Profile.Conditions
 {
-    public class DisplayConditionListPredicateEntity : DisplayConditionPartEntity
+    public class DataModelConditionListPredicateEntity : DataModelConditionPartEntity
     {
         public int PredicateType { get; set; }
 
@@ -12,6 +12,7 @@ namespace Artemis.Storage.Entities.Profile.Conditions
 
         public string LeftPropertyPath { get; set; }
 
+        public Guid? RightDataModelGuid { get; set; }
         public string RightPropertyPath { get; set; }
 
         // Stored as a string to be able to control serialization and deserialization ourselves

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionPredicateEntity.cs

@@ -3,7 +3,7 @@ using Artemis.Storage.Entities.Profile.Abstract;
 
 namespace Artemis.Storage.Entities.Profile.Conditions
 {
-    public class DisplayConditionPredicateEntity : DisplayConditionPartEntity
+    public class DataModelConditionPredicateEntity : DataModelConditionPartEntity
     {
         public int PredicateType { get; set; }
         public Guid? LeftDataModelGuid { get; set; }

src/Artemis.Storage/Entities/Profile/Conditions/ProfileConditionEntity.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Artemis.Storage.Entities.Profile.Conditions
-{
-    public class ProfileConditionEntity
-    {
-        public Guid Id { get; set; }
-    }
-}

src/Artemis.Storage/Entities/Profile/DataBindings/DataBindingConditionValueEntity.cs

@@ -5,6 +5,6 @@ namespace Artemis.Storage.Entities.Profile.DataBindings
     public class DataBindingConditionValueEntity
     {
         public string Value { get; set; }
-        public DisplayConditionGroupEntity RootGroup { get; set; }
+        public DataModelConditionGroupEntity RootGroup { get; set; }
     }
 }