Changeset 478 for Dev/trunk/src/server/app.js

Timestamp:

10/16/13 16:05:39 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Changes for response submission & deletion.

File:

• Dev/trunk/src/server/app.js (modified) (6 diffs)

Dev/trunk/src/server/app.js

@@ -48 +48 @@
 
     // cookies and session
-    app.use('/api',express.bodyParser());
     app.use(express.cookieParser());
     app.use(express.session({ secret: "quasi experimental design" }));
+    app.use('/api',express.bodyParser());
 
     // passport
@@ -77 +77 @@
     });
 
+    // data is proxied to couch
+    app.use('/data', ensureAuthenticated);
+    app.use('/data', proxy(settings.couchDbURL));
 
     // post to this url to login
@@ -99 +102 @@
         });
 
-    // expose everything needed to fill in responses
-    // FIXME : this needs more security, now you can guess ids
-    //         and get actual survey and response data!
-    app.get(
-        '/live',
-        function(req,res){
-            res.redirect('/response.html#!/55704d6a84194c2d7ba9bec93c000e75');
-        });
     app.get(
         '/api/surveyRuns/:id',
@@ -155 +150 @@
             });
         });
+    app.delete(
+        '/api/responses/:id',
+        function(req,res){
+            var id = req.params.id;
+            var rev = req.query.rev;
+            couch.delete(id,rev).then(function(result){
+                res.send(200, result);
+            }, function(error){
+                res.send(500, error);
+            });
+        });
     
-    // data is proxied to couch
-    app.use('/api/data', ensureAuthenticated);
-    app.use('/api/data', proxy(settings.couchDbURL));
-
     // generate CSV download of responses
     app.get(
@@ -224 +226 @@
 }
 
-function writeObjectsToCSVStream(objects, stream) {
+function writeObjectsToCSVStream(objects, stream, prelude) {
     var keys = _.chain(objects)
                 .map(_.keys)
@@ -235 +237 @@
     });
     var writer = new CSV.CsvWriter(stream);
+    if ( prelude ) {
+        _.forEach(prelude, function(val,key){
+            writer.writeRecord([key,val]);
+        });
+    }
     writer.writeRecord(keys);
     _.forEach(objects, function(obj){