Skip to content

Commit 0af7c3e

Browse files
committed
fix(endpoint): refactor handleError for promise use
1 parent 1bcffd6 commit 0af7c3e

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

endpoint/templates/name.controller.js

+10-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
var _ = require('lodash');
44
var <%= classedName %> = require('./<%= name %>.model');
55

6-
function handleError(res, err) {
7-
return res.status(500).send(err);
6+
function handleError(res, statusCode) {
7+
statusCode = statusCode || 500;
8+
return function(err) {
9+
res.status(statusCode).send(err);
10+
};
811
}
912

1013
function responseWithResult(res, statusCode) {
@@ -19,7 +22,7 @@ function responseWithResult(res, statusCode) {
1922
function handleEntityNotFound(res) {
2023
return function(entity) {
2124
if (!entity) {
22-
res.send(404);
25+
res.status(404).end();
2326
return null;
2427
}
2528
return entity;
@@ -41,7 +44,7 @@ function removeEntity(res) {
4144
if (entity) {
4245
return entity.removeAsync()
4346
.then(function() {
44-
return res.status(204);
47+
res.status(204).end();
4548
});
4649
}
4750
};
@@ -50,10 +53,9 @@ function removeEntity(res) {
5053
// Get list of <%= name %>s
5154
exports.index = function(req, res) {<% if (!filters.mongoose) { %>
5255
res.json([]);<% } %><% if (filters.mongoose) { %>
53-
<%= classedName %>.find(function(err, <%= name %>s) {
54-
if (err) { return handleError(res, err); }
55-
return res.status(200).json(<%= name %>s);
56-
});<% } %>
56+
<%= classedName %>.findAsync()
57+
.then(responseWithResult(res))
58+
.catch(handleError(res));<% } %>
5759
};<% if (filters.mongoose) { %>
5860

5961
// Gets a single <%= name %> from the DB.

0 commit comments

Comments
 (0)