Skip to content
This repository was archived by the owner on Feb 26, 2020. It is now read-only.

Commit 9e27e91

Browse files
committed
Fixed delete calls for MongoDB
1 parent f80a9b2 commit 9e27e91

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

node-server/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
"async": "~0.2.7",
4444
"request": "~2.16.6",
4545
"underscore": "~1.4.4",
46-
"xtend": "~2.0.3"
46+
"xtend": "~2.0.3",
47+
"bunyan": "*"
4748

4849
},
4950
"devDependencies": {

node-server/server.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'use strict';
1919

2020
/**
21-
* Module dependencies.
21+
* Module dependencies.
2222
*/
2323

2424
var fs = require('fs');
@@ -29,7 +29,6 @@
2929
var getopt = require('posix-getopt');
3030
var mongoose = require('mongoose/');
3131
var restify = require('restify');
32-
var restifyOAuth2 = require('restify-oauth2');
3332
var config = require('./config');
3433
var aadutils = require('./aadutils');
3534
var Metadata = require('./metadata').Metadata;
@@ -132,10 +131,11 @@ function createTask(req, res, next) {
132131
* Deletes a Task by name
133132
*/
134133
function removeTask(req, res, next) {
135-
Task.remove(req.params.task, function (err) {
134+
135+
Task.remove( { task:req.params.task }, function (err) {
136136
if (err) {
137137
req.log.warn(err,
138-
'deleteTask: unable to delete %s',
138+
'removeTask: unable to delete %s',
139139
req.params.task);
140140
next(err);
141141
} else {
@@ -145,6 +145,15 @@ function removeTask(req, res, next) {
145145
});
146146
}
147147

148+
/**
149+
* Deletes all Tasks. A wipe
150+
*/
151+
function removeAll(req, res, next) {
152+
Task.remove();
153+
res.send(204);
154+
return next();
155+
}
156+
148157

149158
/**
150159
*
@@ -326,7 +335,9 @@ var server = restify.createServer({
326335
server.get('/tasks/:name', getTask);
327336
server.head('/tasks/:name', getTask);
328337
server.post('/tasks/:name/:task', createTask);
329-
server.post('/tasks/:name/:task', removeTask);
338+
server.del('/tasks/:name/:task', removeTask);
339+
server.del('/tasks/:name', removeTask);
340+
server.del('/tasks', removeAll, function respond(req, res, next) { res.send(204); next(); });
330341

331342

332343
// Register a default '/' handler

0 commit comments

Comments
 (0)