From 188e4ff2710464386b672afc54722506aba412aa Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Sat, 9 Mar 2013 09:14:07 -0500 Subject: [PATCH] Remove one id from array of typeIds instead of rewriting whole array --- src/server/api.coffee | 8 ++++---- test/api.mocha.coffee | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/api.coffee b/src/server/api.coffee index f337b4964b..4c2fa2984a 100644 --- a/src/server/api.coffee +++ b/src/server/api.coffee @@ -91,10 +91,11 @@ router.put '/user/task/:id', auth, validateTask, (req, res) -> res.json 200, req.task router.delete '/user/task/:id', auth, validateTask, (req, res) -> - taskIds = req.user.get("#{req.task.type}Ids") - taskIds.splice(taskIds.indexOf(req.task.id),1) - req.user.set "#{req.task.type}Ids", taskIds + taskIds = req.user.get "#{req.task.type}Ids" + req.user.del "tasks.#{req.task.id}" + # Remove one id from array of typeIds + req.user.remove "#{req.task.type}Ids", taskIds.indexOf(req.task.id), 1 res.send 204 @@ -164,4 +165,3 @@ router.post '/user/tasks/:taskId/:direction', auth, scoreTask module.exports = router module.exports.auth = auth module.exports.scoreTask = scoreTask # export so deprecated can call it - diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index eed81aedac..0d01854733 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -257,8 +257,8 @@ describe 'API', -> expect(res.statusCode).to.be 204 query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken) query.fetch (err, user) -> - expect(user.get().habitIds.indexOf(tid)).to.be -1 - expect(user.get().tasks[tid]).to.be undefined + expect(user.get('habitIds').indexOf(tid)).to.be -1 + expect(user.get("tasks.#{tid}")).to.be undefined done() it 'DELETE /api/v1/user/task/:id (no task found)', (done) ->