Renamed QueryOperand to Operand

SurpassSoftware · Jul 23, 2018 · 471a950 · 471a950
1 parent 23acac8
commit 471a950
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/DynamicExpressionBuilder/Enums/QueryOperand.cs b/DynamicExpressionBuilder/Enums/QueryOperand.cs
@@ -4,7 +4,7 @@
     /// <summary>
     /// Expression query operands
     /// </summary>
-    public enum QueryOperand
+    public enum Operand
     {
         /// <summary>
         /// Equiavlent to &amp;&amp;

diff --git a/DynamicExpressionBuilder/ExpressionBuilder.cs b/DynamicExpressionBuilder/ExpressionBuilder.cs
@@ -45,7 +45,7 @@ public static Expression<Func<T, bool>> GetExpression<T>(IList<ExpressionInput>
                         exp = GetExpression<T>(param, filter);
                     else
                     {
-                        if (filter.Operand == QueryOperand.And)
+                        if (filter.Operand == Operand.And)
                         {
                             var tempExp = GetExpression<T>(param, filter);
                             exp = Expression.AndAlso(exp, tempExp);

diff --git a/DynamicExpressionBuilder/Helpers/ExpressionBuilderHelpers.cs b/DynamicExpressionBuilder/Helpers/ExpressionBuilderHelpers.cs
@@ -21,10 +21,10 @@ public class ExpressionBuilderHelpers
         /// <param name="value">Value to operate with</param>
         /// <param name="operand">Operand. And, Or, Not</param>
         /// <returns></returns>
-        public static ExpressionInput GetExpressionInput(string propertyName, Operation operation, object value, QueryOperand operand)
+        public static ExpressionInput GetExpressionInput(string propertyName, Operation operation, object value, Operand operand)
         {
-            if (operand == QueryOperand.Not)
-                return new ExpressionInput { Value = value, Operand = QueryOperand.And, Operation = Operation.NotEquals, PropertyName = propertyName };
+            if (operand == Operand.Not)
+                return new ExpressionInput { Value = value, Operand = Operand.And, Operation = Operation.NotEquals, PropertyName = propertyName };
             else
                 return new ExpressionInput { Value = value, Operand = operand, Operation = operation, PropertyName = propertyName };
 

diff --git a/DynamicExpressionBuilder/Models/ExpressionInput.cs b/DynamicExpressionBuilder/Models/ExpressionInput.cs
@@ -28,6 +28,6 @@ public class ExpressionInput
         /// <summary>
         /// Expression operand
         /// </summary>
-        public QueryOperand Operand { get; set; }
+        public Operand Operand { get; set; }
     }
 }