Merge pull request #19 from arslanaybars/fpaganetto-support-guid-type

Fpaganetto support guid type pr
arslanaybars · Jul 15, 2020 · b9e3ff0 · b9e3ff0
2 parents c28029d + 21216a2
commit b9e3ff0
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -45,20 +45,20 @@ Supported operators for type are below;
 
 Fop uses these query sign for preparing expression. 
 
-|Operators          |Query Sign  |Int/Long |String | Char |DateTime|
-|-------------------|------------|---------|-------|------|--------|
-|Equal              |`==`        | ✔️     | ✔️    | ✔️  | ✔️     |
-|NotEqual           |`!=`        | ✔️     | ✔️    | ✔️  | ✔️     |
-|GreaterThan        |`>`         | ✔️     | ❌    | ❌  | ✔️     |
-|GreaterOrEqualThan |`>=`        | ✔️     | ❌    | ❌  | ✔️     |
-|LessThan           |`<`         | ✔️     | ❌    | ❌  | ✔️     |
-|LessOrEqualThan    |`<=`        | ✔️     | ❌    | ❌  | ✔️     |
-|Contains           |`~=`        | ❌     | ✔️    | ❌  | ❌     | 
-|NotContains        |`!~=`       | ❌     | ✔️    | ❌  | ❌     | 
-|StartsWith         |`_=`        | ❌     | ✔️    | ❌  | ❌     |
-|NotStartsWith      |`!_=`       | ❌     | ✔️    | ❌  | ❌     |
-|EndsWith           |`\|=`       | ❌     | ✔️    | ❌  | ❌     |
-|NotEndsWith        |`!\|=`      | ❌     | ✔️    | ❌  | ❌     |
+|Operators          |Query Sign  |Int/Long |String | Char |DateTime|Guid|
+|-------------------|------------|----|-------|------|--------|----|
+|Equal              |`==`        | ✔️ | ✔️    | ✔️  | ✔️    | ✔️ |
+|NotEqual           |`!=`        | ✔️ | ✔️    | ✔️  | ✔️    | ✔️ |
+|GreaterThan        |`>`         | ✔️ | ❌    | ❌  | ✔️    | ❌ |
+|GreaterOrEqualThan |`>=`        | ✔️ | ❌    | ❌  | ✔️    | ❌ |
+|LessThan           |`<`         | ✔️ | ❌    | ❌  | ✔️    | ❌ |
+|LessOrEqualThan    |`<=`        | ✔️ | ❌    | ❌  | ✔️    | ❌ |
+|Contains           |`~=`        | ❌ | ✔️    | ❌  | ❌    | ❌ |
+|NotContains        |`!~=`       | ❌ | ✔️    | ❌  | ❌    | ❌ |
+|StartsWith         |`_=`        | ❌ | ✔️    | ❌  | ❌    | ❌ |
+|NotStartsWith      |`!_=`       | ❌ | ✔️    | ❌  | ❌    | ❌ |
+|EndsWith           |`\|=`       | ❌ | ✔️    | ❌  | ❌    | ❌ |
+|NotEndsWith        |`!\|=`      | ❌ | ✔️    | ❌  | ❌    | ❌ |
 
 ##### Example
 api/students/

diff --git a/src/Exceptions/GuidDataTypeNotSupportedException.cs b/src/Exceptions/GuidDataTypeNotSupportedException.cs
@@ -0,0 +1,9 @@
+namespace Fop.Exceptions
+{
+    public class GuidDataTypeNotSupportedException : FopException
+    {
+
+        public GuidDataTypeNotSupportedException(string message) : base(message) { }
+
+    }
+}
diff --git a/src/Extensions.cs b/src/Extensions.cs
@@ -26,6 +26,7 @@ static Extensions()
             DataTypeStrategies.Add(FilterDataTypes.DateTime, new DateTimeDataTypeStrategy());
             DataTypeStrategies.Add(FilterDataTypes.Boolean, new BooleanDataTypeStrategy());
             DataTypeStrategies.Add(FilterDataTypes.Enum, new EnumDataTypeStrategy());
+            DataTypeStrategies.Add(FilterDataTypes.Guid, new GuidTypeStrategy());
         }
 
         public static (IQueryable<T>, int) ApplyFop<T>(this IQueryable<T> source, IFopRequest request)

diff --git a/src/Filter/FilterEnumerations.cs b/src/Filter/FilterEnumerations.cs
@@ -33,6 +33,7 @@ public enum FilterDataTypes : byte
         Char,
         DateTime,
         Boolean,
-        Enum
+        Enum,
+        Guid
     }
 }
diff --git a/src/FopExpression/FopExpressionBuilder.cs b/src/FopExpression/FopExpressionBuilder.cs
@@ -195,6 +195,11 @@ private static FilterDataTypes GetFilterDataTypes(PropertyInfo pi)
                 return FilterDataTypes.Boolean;
             }
 
+            if (propertyName == "Guid")
+            {
+                return FilterDataTypes.Guid;
+            }
+
             throw new ArgumentOutOfRangeException();
         }
 

diff --git a/src/Strategies/GuidTypeStrategy.cs b/src/Strategies/GuidTypeStrategy.cs
@@ -0,0 +1,31 @@
+using Fop.Exceptions;
+using Fop.Filter;
+
+namespace Fop.Strategies
+{
+    public class GuidTypeStrategy : IFilterDataTypeStrategy
+    {
+        public string ConvertFilterToText(IFilter filter)
+        {
+            switch (filter.Operator)
+            {
+                case FilterOperators.Equal:
+                    return filter.Key + " ==  new Guid(\"" + filter.Value + "\")";
+                case FilterOperators.NotEqual:
+                    return filter.Key + " != new Guid(\"" + filter.Value + "\")";
+                case FilterOperators.Contains:
+                case FilterOperators.NotContains:
+                case FilterOperators.StartsWith:
+                case FilterOperators.NotStartsWith:
+                case FilterOperators.EndsWith:
+                case FilterOperators.NotEndsWith:
+                case FilterOperators.GreaterThan:
+                case FilterOperators.GreaterOrEqualThan:
+                case FilterOperators.LessThan:
+                case FilterOperators.LessOrEqualThan:
+                default:
+                    throw new GuidDataTypeNotSupportedException($"Guid filter does not support {filter.Operator}");
+            }
+        }
+    }
+}