*

Author: LuizFelipeNeves

graphql/resolvers/Company/index.js

@@ -65,26 +65,24 @@ export default {
       });
     },
     updateCompany: async (parent, { _id, company }, context, info) => {
-      return new Promise((resolve, reject) => {
-        Company.findByIdAndUpdate(
-          _id,
-          { $set: { ...company } },
-          { new: true }
-        ).exec((err, res) => {
-          err ? reject(err) : resolve(res);
-        });
-      });
+      const data = await Company.updateOne(
+        { _id },
+        { ...company },
+        { new: true }
+      ).exec();
+      return data.ok ? true : false;
     },
     deleteCompany: async (parent, { _id }, context, info) => {
       const company = await Company.findById(_id).exec();
       if (!company) throw new Error("Company not found.");
       if (company.status === 1) throw new Error("Company deleted.");
       await Freight.updateMany({ company: _id }, { $set: { status: false } });
-      return new Promise((resolve, reject) =>
-        Company.findByIdAndUpdate(_id, { status: 1 }).exec((err, res) => {
-          err ? reject(err) : resolve(res);
-        })
-      );
+      const update = await Company.updateOne(
+        { _id },
+        { status: 1 },
+        { new: true }
+      ).exec();
+      return update.ok ? true : false;
     }
   }
 };

graphql/resolvers/Freight/index.js

@@ -248,27 +248,20 @@ export default {
       }
     },
     updateFreight: async (parent, { _id, freight }, context, info) => {
-      return new Promise((resolve, reject) => {
-        Freight.findByIdAndUpdate(
-          _id,
-          { $set: { ...freight } },
-          { new: true }
-        ).exec((err, res) => {
-          err ? reject(err) : resolve(res);
-        });
-      });
+      const update = await Freight.updateOne(
+        { _id },
+        { $set: { ...freight } },
+        { new: true }
+      ).exec();
+      return update.ok ? true : false;
     },
-    deleteFreight: async (parent, { _id }, context, info) => {
-      try {
-        return new Promise((resolve, reject) => {
-          Freight.findByIdAndDelete(_id).exec((err, res) => {
-            err ? reject(err) : resolve(res);
-          });
-        });
-      } catch (error) {
-        console.log(error);
-        throw error;
-      }
+    deleteFreight: async (parent, args, context, info) => {
+      const update = await Freight.updateOne(
+        args,
+        { status: false },
+        { new: true }
+      ).exec();
+      return update.ok ? true : false;
     }
   },
   Subscription: {

graphql/resolvers/Location/index.js

@@ -4,10 +4,6 @@ import {
   FILTER_CONDITION_TYPE
 } from "@entria/graphql-mongo-helpers";
 
-const stringToRegexQuery = val => {
-  return { $regex: new RegExp(val) };
-};
-
 const LocationFilterMapping = {
   code: {
     type: FILTER_CONDITION_TYPE.MATCH_1_TO_1
@@ -68,38 +64,5 @@ export default {
         }))
       };
     }
-  },
-  Mutation: {
-    createLocation: async (parent, { location }, context, info) => {
-      const newLocation = await new Location({
-        code: location.code,
-        city: location.city,
-        state: location.state,
-        location: location.location
-      });
-      return new Promise((resolve, reject) => {
-        newLocation.save((err, res) => {
-          err ? reject(err) : resolve(res);
-        });
-      });
-    },
-    updateLocation: async (parent, { _id, location }, context, info) => {
-      return new Promise((resolve, reject) => {
-        Location.findByIdAndUpdate(
-          _id,
-          { $set: { ...location } },
-          { new: true }
-        ).exec((err, res) => {
-          err ? reject(err) : resolve(res);
-        });
-      });
-    },
-    deleteLocation: async (parent, { _id }, context, info) => {
-      return new Promise((resolve, reject) => {
-        Location.findByIdAndDelete(_id).exec((err, res) => {
-          err ? reject(err) : resolve(res);
-        });
-      });
-    }
   }
 };

graphql/types/Company/index.js

@@ -28,8 +28,8 @@ export default `
 
   type Mutation {
     createCompany(company: CreateCompanyInput!): Company!
-    updateCompany(_id: String!, company: UpdateCompanyInput!): Company!
-    deleteCompany(_id: String!): Company!
+    updateCompany(_id: String!, company: UpdateCompanyInput!): Boolean!
+    deleteCompany(_id: String!): Boolean!
   }
   input CreateCompanyInput {
     name: String!

graphql/types/Freight/index.js

@@ -32,16 +32,6 @@ export default `
     freights: [Freight!]!
   }
 
-  input InputFreights {
-    status: Boolean
-    origin: UpdateLocationInput
-    destination: UpdateLocationInput
-    company: InputFreightCompany
-    
-    vehicles: [String]
-    bodies: [String]
-  }
-
   input InputFreightCompany {
     _id: ID
     name: String
@@ -55,10 +45,20 @@ export default `
     freights(page: Int, perpage: Int, filter: InputFreights): OutputFreight!
   }
 
+  input InputFreights {
+    status: Boolean
+    origin: InputLocation
+    destination: InputLocation
+    company: InputFreightCompany
+    
+    vehicles: [String]
+    bodies: [String]
+  }
+
   type Mutation {
     createFreight(freight: CreateFreightInput!): Freight!
-    updateFreight(_id: ID!, freight: UpdateFreightInput!): Freight!
-    deleteFreight(_id: ID!): Freight!
+    updateFreight(_id: ID!, freight: UpdateFreightInput!): Boolean!
+    deleteFreight(_id: ID!): Boolean!
   }
 
   input CreateFreightInput {

graphql/types/Location/index.js

@@ -16,62 +16,26 @@ export default `
     coordinates: [Float]!
   }
 
-  input InputStateOptional {
-    uf: String
-    name: String
-  }
-
-  input InputStateRequired {
-    uf: String!
-    name: String!
+  type Query {
+    location(filter: InputLocation): Location!
+    locations(page: Int, perpage: Int, filter: InputLocations): OutputLocations
   }
 
-  input InputQueryLocation {
+  input InputLocation {
     _id: ID
     code: String
     city: String
     state: InputStateOptional
-  } 
-
-  input InputQueryLocations {
-    city: String,
-    state: InputStateOptional
-  }
-
-  type Query {
-    location(filter: InputQueryLocation): Location!
-    locations(page: Int, perpage: Int, filter: InputQueryLocations): OutputLocations
-  }
-
-  type Mutation {
-    createLocation(location: CreateLocationInput): Location!
-    updateLocation(_id: ID!, location: UpdateLocationInput): Location!
-    deleteLocation(_id: ID!): Location!
   }
 
-  input InputPositionRequired {
-    type: String!
-    coordinates: [Float]!
-  }
-
-  input InputPositionOptional {
-    type: String
-    coordinates: [Float]!
-  }
-
-  input CreateLocationInput {
-    code: String!
-    city: String!
-    state: InputStateRequired!
-    location: InputPositionRequired!
+  input InputStateOptional {
+    uf: String
+    name: String
   }
 
-  input UpdateLocationInput {
-    _id: ID
-    code: String
-    city: String
+  input InputLocations {
+    city: String,
     state: InputStateOptional
-    location: InputPositionOptional
   }
 
   type OutputLocations {