Update our updates' callbacks' argument signature for Mongoose 4

This commit is contained in:
Nick Winter 2015-12-09 11:56:18 -08:00
parent 163a701188
commit 7269dc85d4
7 changed files with 16 additions and 16 deletions

View file

@ -40,7 +40,7 @@ EarnedAchievementSchema.statics.createForAchievement = (achievement, doc, origin
if rewards.length
update.$addToSet ?= {}
update.$addToSet["earned.#{rewardType}"] = $each: rewards
User.update {_id: mongoose.Types.ObjectId(userID)}, update, {}, (err, count) ->
User.update {_id: mongoose.Types.ObjectId(userID)}, update, {}, (err, result) ->
log.error err if err?
done?(earnedAchievementDoc)

View file

@ -108,7 +108,7 @@ class EarnedAchievementHandler extends Handler
if rewards.length
update.$addToSet ?= {}
update.$addToSet["earned.#{rewardType}"] = $each: rewards
User.update {_id: user._id}, update, {}, (err, count) ->
User.update {_id: user._id}, update, {}, (err, result) ->
log.error err if err?
done?(err)

View file

@ -247,9 +247,9 @@ CourseInstanceHandler = class CourseInstanceHandler extends Handler
'redeemers.userID': { $ne: req.user.get('_id') }
$where: "this.redeemers.length < #{prepaid.get('maxRedeemers')}"
update = { $push: { redeemers : { date: new Date(), userID: req.user.get('_id') } }}
Prepaid.update query, update, (err, nMatched) =>
Prepaid.update query, update, (err, result) =>
return @sendDatabaseError(res, err) if err
if nMatched is 0
if result?.nModified is 0
@logError(req.user, "Course instance update prepaid lost race on maxRedeemers")
return @sendForbiddenError(res)

View file

@ -224,12 +224,12 @@ class SubscriptionHandler extends Handler
newRedeemerPush = { $push: { redeemers : { date: new Date(), userID: req.user._id } }}
Prepaid.update { 'code': req.body.ppc, 'redeemers.userID': { $ne: req.user._id }, '$where': 'this.redeemers.length < this.maxRedeemers'}, newRedeemerPush, (err, num, info) =>
Prepaid.update { 'code': req.body.ppc, 'redeemers.userID': { $ne: req.user._id }, '$where': 'this.redeemers.length < this.maxRedeemers'}, newRedeemerPush, (err, result) =>
if err
@logSubscriptionError(req.user, "Subscribe with Prepaid Code update: #{JSON.stringify(err)}")
return @sendDatabaseError(res, err)
return @sendError(res, 403, "Can't add user to prepaid redeemers") if num isnt 1
return @sendError(res, 403, "Can't add user to prepaid redeemers") if result.nModified isnt 1
customerID = req.user.get('stripe')?.customerID
subscriptionID = req.user.get('stripe')?.subscriptionID
@ -348,14 +348,14 @@ class SubscriptionHandler extends Handler
userID: user.get('_id')
date: new Date()
update = {redeemers: redeemers}
Prepaid.update query, update, {}, (err, numAffected) =>
Prepaid.update query, update, {}, (err, result) =>
if err
@logSubscriptionError(user, 'Prepaid update error. ' + err)
return done({res: 'Database error.', code: 500})
if numAffected > 1
@logSubscriptionError(user, "Prepaid numAffected=#{numAffected} error.")
if result.nModified > 1
@logSubscriptionError(user, "Prepaid nModified=#{result.nModified} error.")
return done({res: 'Database error.', code: 500})
if numAffected < 1
if result.nModified < 1
return done({res: 'Prepaid not active', code: 403})
# Update user

View file

@ -37,18 +37,18 @@ updatePollVotes = (userID, pollID, answer, previousAnswer) ->
_.find(answers, key: previousAnswer)?.votes-- if previousAnswer
poll.set 'answers', answers
poll.markModified 'answers'
poll.save (err, newPoll, numberAffected) ->
poll.save (err, newPoll, result) ->
return log.error err if err
updateUserProperty userID, userProperty, answer if userProperty = poll.get 'userProperty'
updateUserProperty = (userID, userProperty, answer) ->
update = $set: {"#{userProperty}": answer}
User.update {_id: mongoose.Types.ObjectId(userID)}, update, (err, numberAffected) ->
User.update {_id: mongoose.Types.ObjectId(userID)}, update, (err, result) ->
return log.error err if err
updateUserGems = (userID, gemDelta) ->
update = $inc: {'earned.gems': gemDelta}
User.update {_id: mongoose.Types.ObjectId(userID)}, update, (err, numberAffected) ->
User.update {_id: mongoose.Types.ObjectId(userID)}, update, (err, result) ->
return log.error err if err
UserPollsRecordSchema.statics.privateProperties = []

View file

@ -88,9 +88,9 @@ PrepaidHandler = class PrepaidHandler extends Handler
'redeemers.userID': { $ne: user.get('_id') }
$where: "this.maxRedeemers > 0 && (!this.redeemers || this.redeemers.length < #{prepaid.get('maxRedeemers')})"
update = { $push: { redeemers : { date: new Date(), userID: userID } }}
Prepaid.update query, update, (err, nMatched) =>
Prepaid.update query, update, (err, result) =>
return @sendDatabaseError(res, err) if err
if nMatched is 0
if result.nModified is 0
@logError(req.user, "POST prepaid redeemer lost race on maxRedeemers")
return @sendForbiddenError(res)

View file

@ -210,7 +210,7 @@ incrementUserSimulationCount = (userID, type, callback) =>
return callback null unless userID
inc = {}
inc[type] = 1
User.update {_id: userID}, {$inc: inc}, (err, affected) ->
User.update {_id: userID}, {$inc: inc}, (err, result) ->
log.error "Error incrementing #{type} for #{userID}: #{err}" if err
callback err