*

Author: LuizFelipeNeves

graphql/resolvers/Freight/index.js

@@ -14,32 +14,78 @@ const convertJsonToDot = (obj, parent = [], keyValue = {}) => {
   return keyValue;
 };
 
+const freightquery = [
+  {
+    $lookup: {
+      from: "locations",
+      localField: "origin",
+      foreignField: "_id",
+      as: "origin"
+    }
+  },
+  {
+    $lookup: {
+      from: "locations",
+      localField: "destination",
+      foreignField: "_id",
+      as: "destination"
+    }
+  },
+  {
+    $lookup: {
+      from: "companies",
+      localField: "company",
+      foreignField: "_id",
+      as: "company"
+    }
+  },
+  { $unwind: "$destination" },
+  { $unwind: "$origin" },
+  { $unwind: "$company" }
+];
+
 const freightaggregate = async (groupby, conditions) => {
   const data = await Freight.aggregate([
-    {
-      $lookup: {
-        from: "locations",
-        localField: "origin",
-        foreignField: "_id",
-        as: "origin"
-      }
-    },
-    {
-      $lookup: {
-        from: "locations",
-        localField: "destination",
-        foreignField: "_id",
-        as: "destination"
-      }
-    },
-    { $unwind: "$destination" },
-    { $unwind: "$origin" },
+    ...freightquery,
     { $match: conditions },
     { $group: { _id: `$${groupby}` } }
   ]).exec();
   return Array.from(Object.keys(data), p => data[p]._id);
 };
 
+const freightfinalquery = async (res, conditions, page, perpage) => {
+  const totalcount = await Freight.countDocuments(conditions).exec();
+  const hasnextpage = page < totalcount / perpage;
+  return {
+    totalcount,
+    hasnextpage,
+    freights: res.map(u => ({
+      _id: u._id.toString(),
+      url: u.url,
+      site: u.site,
+      origin: u.origin,
+      destination: u.destination,
+      status: u.status,
+      km: u.km,
+      price: u.price,
+      weight: u.weight,
+      cargo: u.cargo,
+      especie: u.especie,
+      complement: u.complement,
+      tracking: u.tracking,
+      note: u.note,
+      vehicles: u.vehicles,
+      bodies: u.bodies,
+      nextel: u.nextel,
+      cellphone: u.cellphone,
+      telephone: u.telephone,
+      whatsapp: u.whatsapp,
+      sac: u.sac,
+      company: u.company
+    }))
+  };
+};
+
 export default {
   Query: {
     stateOrigin: async (parent, args, context, info) => {
@@ -71,70 +117,35 @@ export default {
       if (vehicles) conditions.vehicles = { vehicles: { $in: vehicles } };
       if (bodies) conditions.bodies = { bodies: { $in: bodies } };
       const res = await Freight.aggregate([
-        {
-          $lookup: {
-            from: "locations",
-            localField: "origin",
-            foreignField: "_id",
-            as: "origin"
-          }
-        },
-        {
-          $lookup: {
-            from: "locations",
-            localField: "destination",
-            foreignField: "_id",
-            as: "destination"
-          }
-        },
-        {
-          $lookup: {
-            from: "companies",
-            localField: "company",
-            foreignField: "_id",
-            as: "company"
-          }
-        },
-        { $unwind: "$destination" },
-        { $unwind: "$origin" },
-        { $unwind: "$company" },
+        ...freightquery,
         { $match: conditions },
         { $skip: (page - 1) * perpage },
         { $limit: perpage }
       ]).exec();
-
-      const totalcount = await Freight.countDocuments(conditions).exec();
-
-      const hasnextpage = page < totalcount / perpage;
-
-      return {
-        totalcount,
-        hasnextpage,
-        freights: res.map(u => ({
-          _id: u._id.toString(),
-          url: u.url,
-          site: u.site,
-          origin: u.origin,
-          destination: u.destination,
-          status: u.status,
-          km: u.km,
-          price: u.price,
-          weight: u.weight,
-          cargo: u.cargo,
-          especie: u.especie,
-          complement: u.complement,
-          tracking: u.tracking,
-          note: u.note,
-          vehicles: u.vehicles,
-          bodies: u.bodies,
-          nextel: u.nextel,
-          cellphone: u.cellphone,
-          telephone: u.telephone,
-          whatsapp: u.whatsapp,
-          sac: u.sac,
-          company: u.company
-        }))
-      };
+      return freightfinalquery(res, conditions, page, perpage);
+    },
+    freightsrange: async (parent, args, context, info) => {
+      const { page = 1, perpage = 20, filter, coordinates, range } = args;
+      const { vehicles, bodies, ...resto } = convertJsonToDot(filter);
+      const conditions = { ...resto };
+      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
+          }
+        },*/
+        { $skip: (page - 1) * perpage },
+        { $limit: perpage }
+      ]).exec();
+      return freightfinalquery(res, conditions, page, perpage);
     }
   },
   Mutation: {

graphql/types/Freight/index.js

@@ -66,25 +66,35 @@ export default `
     stateOrigin(filter: InputQueryState): [String!]!
     stateDestination(filter: InputQueryState): [String!]!
 
-    cityOrigin(filter: InputQueryCityOrigin): [String!]!
-    cityDestination(filter: InputQueryCityDestination): [String!]!
+    cityOrigin(filter: InputQueryCityOrigin!): [String!]!
+    cityDestination(filter: InputQueryCityDestination!): [String!]!
     
     freight(_id: ID!): Freight!
     freights(page: Int, perpage: Int, filter: InputFreights): OutputFreight!
+    freightsrange(page: Int, perpage: Int, filter: InputFreightsRange, range: Int!, coordinates: [Float!]!): OutputFreight!
   }
 
   input InputFreights {
     status: Boolean
     vehicles: [String]
     bodies: [String]
-
     origin: InputLocation
     destination: InputLocation
-    
-    company_id: ID
-    companyname: String
-    companylevel: Int
-    companystatus: Int
+    company: QueryFreigth
+  }
+
+  input InputFreightsRange {
+    status: Boolean
+    vehicles: [String]
+    bodies: [String]
+    company: QueryFreigth
+  }
+
+  input QueryFreigth {
+    _id: ID
+    name: String
+    level: Int
+    status: Int
   }
 
   type Mutation {