fix index

LuizFelipeNeves · Aug 26, 2019 · 1c04d7c · 1c04d7c
1 parent a0b7d34
commit 1c04d7c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/graphql/resolvers/Freight/index.js b/graphql/resolvers/Freight/index.js
@@ -131,17 +131,18 @@ export default {
       if (vehicles) conditions.vehicles = { vehicles: { $in: vehicles } };
       if (bodies) conditions.bodies = { bodies: { $in: bodies } };
       const res = await Freight.aggregate([
-        ...freightquery,
-        { $match: conditions },
-        /*{
+        {
           $geoNear: {
             near: { type: "Point", coordinates },
             distanceField: "dist.calculated",
             spherical: true,
             key: "origin.location",
-            maxDistance: range
+            includeLocs: "location",
+            maxDistance: range,
+            query: conditions
           }
-        },*/
+        },
+        ...freightquery,
         { $skip: (page - 1) * perpage },
         { $limit: perpage }
       ]).exec();

diff --git a/server/models/Location.js b/server/models/Location.js
@@ -41,6 +41,6 @@ const LocSchema = new Schema({
   }
 });
 
-LocSchema.index({ coordinates: "2dsphere" });
+LocSchema.index({ location: "2dsphere" });
 
 export default mongoose.model("Location", LocSchema);