@@ -106,58 +106,58 @@ main = hspec $ do
106106 _ <- insertData
107107 let queryFilter = BoolFilter (MustMatch (Term "user" "bitemyapp") False)
108108 <&&> IdentityFilter
109− let search = Search Nothing (Just queryFilter)
109+ let search = mkSearch Nothing (Just queryFilter)
110110 myTweet <- searchTweet search
111111 myTweet `shouldBe` Right exampleTweet
112112
113113 it "returns document for existential filter" $ do
114114 _ <- insertData
115− let search = Search Nothing (Just (ExistsFilter "user"))
115+ let search = mkSearch Nothing (Just (ExistsFilter (FieldName "user")))
116116 myTweet <- searchTweet search
117117 myTweet `shouldBe` Right exampleTweet
118118
119119 it "returns document for geo boundingbox filter" $ do
120120 _ <- insertData
121121 let box = GeoBoundingBox (LatLon 40.73 (-74.1)) (LatLon 40.10 (-71.12))
122− let bbConstraint = GeoBoundingBoxConstraint "tweet.location" box False
122+ let bbConstraint = GeoBoundingBoxConstraint (FieldName "tweet.location") box False
123123 let geoFilter = GeoBoundingBoxFilter bbConstraint GeoFilterMemory
124− let search = Search Nothing (Just geoFilter)
124+ let search = mkSearch Nothing (Just geoFilter)
125125 myTweet <- searchTweet search
126126 myTweet `shouldBe` Right exampleTweet
127127
128128 it "doesn't return document for nonsensical boundingbox filter" $ do
129129 _ <- insertData
130130 let box = GeoBoundingBox (LatLon 0.73 (-4.1)) (LatLon 0.10 (-1.12))
131− let bbConstraint = GeoBoundingBoxConstraint "tweet.location" box False
131+ let bbConstraint = GeoBoundingBoxConstraint (FieldName "tweet.location") box False
132132 let geoFilter = GeoBoundingBoxFilter bbConstraint GeoFilterMemory
133− let search = Search Nothing (Just geoFilter)
133+ let search = mkSearch Nothing (Just geoFilter)
134134 searchExpectNoResults search
135135
136136 it "returns document for geo distance filter" $ do
137137 _ <- insertData
138− let geoPoint = GeoPoint "tweet.location" (LatLon 40.12 (-71.34))
138+ let geoPoint = GeoPoint (FieldName "tweet.location") (LatLon 40.12 (-71.34))
139139 let distance = Distance 10.0 Miles
140140 let optimizeBbox = OptimizeGeoFilterType GeoFilterMemory
141141 let geoFilter = GeoDistanceFilter geoPoint distance SloppyArc optimizeBbox False
142− let search = Search Nothing (Just geoFilter)
142+ let search = mkSearch Nothing (Just geoFilter)
143143 myTweet <- searchTweet search
144144 myTweet `shouldBe` Right exampleTweet
145145
146146 it "returns document for geo distance range filter" $ do
147147 _ <- insertData
148− let geoPoint = GeoPoint "tweet.location" (LatLon 40.12 (-71.34))
148+ let geoPoint = GeoPoint (FieldName "tweet.location") (LatLon 40.12 (-71.34))
149149 let distanceRange = DistanceRange (Distance 0.0 Miles) (Distance 10.0 Miles)
150150 let geoFilter = GeoDistanceRangeFilter geoPoint distanceRange
151− let search = Search Nothing (Just geoFilter)
151+ let search = mkSearch Nothing (Just geoFilter)
152152 myTweet <- searchTweet search
153153 myTweet `shouldBe` Right exampleTweet
154154
155155 it "doesn't return document for wild geo distance range filter" $ do
156156 _ <- insertData
157− let geoPoint = GeoPoint "tweet.location" (LatLon 40.12 (-71.34))
157+ let geoPoint = GeoPoint (FieldName "tweet.location") (LatLon 40.12 (-71.34))
158158 let distanceRange = DistanceRange (Distance 100.0 Miles) (Distance 1000.0 Miles)
159159 let geoFilter = GeoDistanceRangeFilter geoPoint distanceRange
160− let search = Search Nothing (Just geoFilter)
160+ let search = mkSearch Nothing (Just geoFilter)
161161 searchExpectNoResults search
162162
163163 it "returns document for geo polygon filter" $ do
@@ -166,8 +166,8 @@ main = hspec $ do
166166 LatLon 40.0 (-72.00),
167167 LatLon 41.0 (-70.00),
168168 LatLon 41.0 (-72.00)]
169− let geoFilter = GeoPolygonFilter "tweet.location" points
170− let search = Search Nothing (Just geoFilter)
169+ let geoFilter = GeoPolygonFilter (FieldName "tweet.location") points
170+ let search = mkSearch Nothing (Just geoFilter)
171171 myTweet <- searchTweet search
172172 myTweet `shouldBe` Right exampleTweet
173173
@@ -177,35 +177,38 @@ main = hspec $ do
177177 LatLon 40.0 (-71.00),
178178 LatLon 41.0 (-70.00),
179179 LatLon 41.0 (-71.00)]
180− let geoFilter = GeoPolygonFilter "tweet.location" points
181− let search = Search Nothing (Just geoFilter)
180+ let geoFilter = GeoPolygonFilter (FieldName "tweet.location") points
181+ let search = mkSearch Nothing (Just geoFilter)
182182 searchExpectNoResults search
183183
184184 it "returns document for ids filter" $ do
185185 _ <- insertData
186186 let filter = IdsFilter "tweet" ["1"]
187− let search = Search Nothing (Just filter)
187+ let search = mkSearch Nothing (Just filter)
188188 myTweet <- searchTweet search
189189 myTweet `shouldBe` Right exampleTweet
190190
191191 it "returns document for range filter" $ do
192192 _ <- insertData
193− let filter = RangeFilter "age"
193+ let filter = RangeFilter (FieldName "age")
194194 (Right (RangeLtGt (LessThan 100000.0) (GreaterThan 1000.0)))
195195 RangeExecutionIndex False
196− let search = Search Nothing (Just filter)
196+ let search = mkSearch Nothing (Just filter)
197197 myTweet <- searchTweet search
198198 myTweet `shouldBe` Right exampleTweet
199199
200200 it "returns document for regexp filter" $ do
201201 _ <- insertData
202− let filter = RegexpFilter "user" (Regexp "bite.*app") RegexpAll "test" False "key"
203− let search = Search Nothing (Just filter)
202+ let filter = RegexpFilter (FieldName "user") (Regexp "bite.*app")
203+ RegexpAll (CacheName "test") False (CacheKey "key")
204+ let search = mkSearch Nothing (Just filter)
204205 myTweet <- searchTweet search
205206 myTweet `shouldBe` Right exampleTweet
206207
207208 it "doesn't return document for non-matching regexp filter" $ do
208209 _ <- insertData
209− let filter = RegexpFilter "user" (Regexp "boy") RegexpAll "test" False "key"
210− let search = Search Nothing (Just filter)
210+ let filter = RegexpFilter (FieldName "user")
211+ (Regexp "boy") RegexpAll
212+ (CacheName "test") False (CacheKey "key")
213+ let search = mkSearch Nothing (Just filter)
211214 searchExpectNoResults search