refactor(server,endpoints): return promises

Author: Awk34

Diff for: app/templates/server/api/user(auth)/user.controller.js

@@ -25,8 +25,8 @@ function handleError(res, statusCode) {
  * restriction: 'admin'
  */
 export function index(req, res) {
-  <% if (filters.mongooseModels) { %>User.find({}, '-salt -password').exec()<% }
-     if (filters.sequelizeModels) { %>User.findAll({
+  <% if (filters.mongooseModels) { %>return User.find({}, '-salt -password').exec()<% }
+     if (filters.sequelizeModels) { %>return User.findAll({
     attributes: [
       '_id',
       'name',
@@ -52,7 +52,7 @@ export function create(req, res, next) {
      if (filters.sequelizeModels) { %>var newUser = User.build(req.body);
   newUser.setDataValue('provider', 'local');
   newUser.setDataValue('role', 'user');
-  newUser.save()<% } %>
+  return newUser.save()<% } %>
     .then(function(user) {
       var token = jwt.sign({ _id: user._id }, config.secrets.session, {
         expiresIn: 60 * 60 * 5
@@ -68,8 +68,8 @@ export function create(req, res, next) {
 export function show(req, res, next) {
   var userId = req.params.id;
 
-  <% if (filters.mongooseModels) { %>User.findById(userId).exec()<% }
-     if (filters.sequelizeModels) { %>User.find({
+  <% if (filters.mongooseModels) { %>return User.findById(userId).exec()<% }
+     if (filters.sequelizeModels) { %>return User.find({
     where: {
       _id: userId
     }
@@ -88,8 +88,8 @@ export function show(req, res, next) {
  * restriction: 'admin'
  */
 export function destroy(req, res) {
-  <% if (filters.mongooseModels) { %>User.findByIdAndRemove(req.params.id).exec()<% }
-     if (filters.sequelizeModels) { %>User.destroy({ _id: req.params.id })<% } %>
+  <% if (filters.mongooseModels) { %>return User.findByIdAndRemove(req.params.id).exec()<% }
+     if (filters.sequelizeModels) { %>return User.destroy({ _id: req.params.id })<% } %>
     .then(function() {
       res.status(204).end();
     })
@@ -104,8 +104,8 @@ export function changePassword(req, res, next) {
   var oldPass = String(req.body.oldPassword);
   var newPass = String(req.body.newPassword);
 
-  <% if (filters.mongooseModels) { %>User.findById(userId).exec()<% }
-     if (filters.sequelizeModels) { %>User.find({
+  <% if (filters.mongooseModels) { %>return User.findById(userId).exec()<% }
+     if (filters.sequelizeModels) { %>return User.find({
     where: {
       _id: userId
     }
@@ -130,8 +130,8 @@ export function changePassword(req, res, next) {
 export function me(req, res, next) {
   var userId = req.user._id;
 
-  <% if (filters.mongooseModels) { %>User.findOne({ _id: userId }, '-salt -password').exec()<% }
-     if (filters.sequelizeModels) { %>User.find({
+  <% if (filters.mongooseModels) { %>return User.findOne({ _id: userId }, '-salt -password').exec()<% }
+     if (filters.sequelizeModels) { %>return User.find({
     where: {
       _id: userId
     },

Diff for: endpoint/templates/basename.controller.js

@@ -66,16 +66,16 @@ function handleError(res, statusCode) {
 // Gets a list of <%= classedName %>s
 export function index(req, res) {<% if (!filters.models) { %>
   res.json([]);<% } else { %>
-  <% if (filters.mongooseModels) { %><%= classedName %>.find().exec()<% }
-     if (filters.sequelizeModels) { %><%= classedName %>.findAll()<% } %>
+  <% if (filters.mongooseModels) { %>return <%= classedName %>.find().exec()<% }
+     if (filters.sequelizeModels) { %>return <%= classedName %>.findAll()<% } %>
     .then(respondWithResult(res))
     .catch(handleError(res));<% } %>
 }<% if (filters.models) { %>
 
 // Gets a single <%= classedName %> from the DB
 export function show(req, res) {
-  <% if (filters.mongooseModels) { %><%= classedName %>.findById(req.params.id).exec()<% }
-     if (filters.sequelizeModels) { %><%= classedName %>.find({
+  <% if (filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
+     if (filters.sequelizeModels) { %>return <%= classedName %>.find({
     where: {
       _id: req.params.id
     }
@@ -87,8 +87,8 @@ export function show(req, res) {
 
 // Creates a new <%= classedName %> in the DB
 export function create(req, res) {
-  <% if (filters.mongooseModels) { %><%= classedName %>.create(req.body)<% }
-     if (filters.sequelizeModels) { %><%= classedName %>.create(req.body)<% } %>
+  <% if (filters.mongooseModels) { %>return <%= classedName %>.create(req.body)<% }
+     if (filters.sequelizeModels) { %>return <%= classedName %>.create(req.body)<% } %>
     .then(respondWithResult(res, 201))
     .catch(handleError(res));
 }
@@ -98,8 +98,8 @@ export function update(req, res) {
   if (req.body._id) {
     delete req.body._id;
   }
-  <% if (filters.mongooseModels) { %><%= classedName %>.findById(req.params.id).exec()<% }
-     if (filters.sequelizeModels) { %><%= classedName %>.find({
+  <% if (filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
+     if (filters.sequelizeModels) { %>return <%= classedName %>.find({
     where: {
       _id: req.params.id
     }
@@ -112,8 +112,8 @@ export function update(req, res) {
 
 // Deletes a <%= classedName %> from the DB
 export function destroy(req, res) {
-  <% if (filters.mongooseModels) { %><%= classedName %>.findById(req.params.id).exec()<% }
-     if (filters.sequelizeModels) { %><%= classedName %>.find({
+  <% if (filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
+     if (filters.sequelizeModels) { %>return <%= classedName %>.find({
     where: {
       _id: req.params.id
     }