Skip to content

fix (endpoint:controller): fix findOneAndUpdate syntax #2301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2016
Merged

fix (endpoint:controller): fix findOneAndUpdate syntax #2301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c262211
fix (endpoint:controller): fix findOneAndUpdate syntax
aniknafs Oct 17, 2016
e76d0a8
Merge branch 'master' of github.com:aniknafs/generator-angular-fullstack
aniknafs Oct 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/endpoint/basename.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export function upsert(req, res) {
delete req.body._id;
}
<%_ if(filters.mongooseModels) { -%>
return <%= classedName %>.findOneAndUpdate({_id: req.params.id}, req.body, {upsert: true, setDefaultsOnInsert: true, runValidators: true}).exec()<% } %>
return <%= classedName %>.findOneAndUpdate({_id: req.params.id}, req.body, {new: true, upsert: true, setDefaultsOnInsert: true, runValidators: true}).exec()<% } %>
<%_ if(filters.sequelizeModels) { -%>
return <%= classedName %>.upsert(req.body, {
where: {
Expand Down
6 changes: 3 additions & 3 deletions templates/endpoint/basename.integration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ describe('<%= classedName %> API:', function() {
updated<%= classedName %> = {};
});

it('should respond with the original <%= cameledName %>', function() {
<%= expect() %>updated<%= classedName %>.name<%= to() %>.equal('New <%= classedName %>');
<%= expect() %>updated<%= classedName %>.info<%= to() %>.equal('This is the brand new <%= cameledName %>!!!');
it('should respond with the updated <%= cameledName %>', function() {
<%= expect() %>updated<%= classedName %>.name<%= to() %>.equal('Updated <%= classedName %>');
<%= expect() %>updated<%= classedName %>.info<%= to() %>.equal('This is the updated <%= cameledName %>!!!');
});

it('should respond with the updated <%= cameledName %> on a subsequent GET', function(done) {
Expand Down