add contains operator support (#35)

vapor · Jul 23, 2020 · 4f3c1c3 · 4f3c1c3
1 parent 4b3ee2b
commit 4f3c1c3
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/Sources/FluentMongoDriver/Errors.swift b/Sources/FluentMongoDriver/Errors.swift
@@ -20,9 +20,22 @@ enum FluentMongoError: Error, DatabaseError {
     var isConstraintFailure: Bool { false }
     var isConnectionClosed: Bool { false }
 
-    case missingHosts, noTargetDatabaseSpecified, unsupportedJoin, unsupportedOperator, invalidIndexKey
-    case unsupportedField, unsupportedDefaultValue, insertFailed, unsupportedFilter
-    case unsupportedCustomLimit, unsupportedCustomFilter, unsupportedCustomValue, unsupportedCustomAction, unsupportedCustomSort, unsupportedCustomAggregate
+    case missingHosts
+    case noTargetDatabaseSpecified
+    case unsupportedJoin
+    case unsupportedOperator
+    case unsupportedFilterValue
+    case invalidIndexKey
+    case unsupportedField
+    case unsupportedDefaultValue
+    case insertFailed
+    case unsupportedFilter
+    case unsupportedCustomLimit
+    case unsupportedCustomFilter
+    case unsupportedCustomValue
+    case unsupportedCustomAction
+    case unsupportedCustomSort
+    case unsupportedCustomAggregate
     case notMongoDB, fileNotFound
 }
 

diff --git a/Sources/FluentMongoDriver/Filter.swift b/Sources/FluentMongoDriver/Filter.swift
@@ -37,9 +37,29 @@ extension DatabaseQuery.Filter {
                 path = try field.makeMongoPath()
             }
 
-            let filterOperator = try operation.makeMongoOperator()
             var filter = Document()
-            try filter[path][filterOperator] = value.makePrimitive()
+            switch operation {
+            case .contains(let inverse, let contains):
+                guard case .bind(let bind) = value, let string = bind as? String else {
+                    throw FluentMongoError.unsupportedFilterValue
+                }
+                let pattern: String
+                switch contains {
+                case .anywhere:
+                    pattern = ".*\(string).*"
+                case .prefix:
+                    pattern = "\(string).*"
+                case .suffix:
+                    pattern = ".*\(string)"
+                }
+                if inverse {
+                    filter[path]["$not"]["$regex"] = pattern
+                } else {
+                    filter[path]["$regex"] = pattern
+                }
+            default:
+                try filter[path][operation.makeMongoOperator()] = value.makePrimitive()
+            }
             return filter
         case .field(let a, let operation, let b):
             var filter = Document()

diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -0,0 +1,2 @@
+#error("Please test with `swift test --enable-test-discovery`")
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#error("Please test with `swift test --enable-test-discovery`")