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

Timestamp:

03/12/14 02:23:11 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Server handles the new flat response format correctly.
• Client widgets and survey rendering creates a flat structure.
• Fixed logic error in checking if questions in survey are published.
• Restrict accepted properties in answers and reject empty strings as properties.

File:

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

Dev/trunk/src/server/app.js

@@ -154 +154 @@
     }
     function areDocsPublished(docs) {
-        return _.every(docs,isDocPublished);
+        return _.every(docs, isDocPublished);
     }
     function isDocPublished(doc) {
@@ -592 +592 @@
             if ( !areDocsUnique(doc.questions) ) {
                 hr = new HTTPResult(400,{error:"Survey contains duplicate questions."});
-            } else if ( !areDocsPublished(doc.questions) || isDocPublished(doc) ) {
+            } else if ( isDocPublished(doc) && !areDocsPublished(doc.questions) ) {
                 hr = new HTTPResult(400,{error:"Cannot publish Survey with unpublished questions."});
             } else {
@@ -610 +610 @@
             var doc = req.body;
             var rev = etags.parse(req.header('If-Match'))[0] || (doc && doc._rev);
-            var hr;
             if ( !areDocsUnique(doc.questions) ) {
                 new HTTPResult(400,{error:"Survey contains duplicate questions."})
                 .handle(res.send.bind(res));
-            } else if ( !areDocsPublished(doc.questions) || isDocPublished(doc) ) {
-                hr = new HTTPResult(400,{error:"Cannot publish Survey with unpublished questions."});
+            } else if ( isDocPublished(doc) && !areDocsPublished(doc.questions) ) {
+                new HTTPResult(400,{error:"Cannot publish Survey with unpublished questions."})
+                .handle(res.send.bind(res));
             } else {
                 putDocument(id,rev,'Survey',doc)
@@ -718 +718 @@
             .handle({
                 200: function(responses) {
-                    var flatResponses = responsesToVariables(responses);
+                    var answers = _.map(responses,function(response){
+                        return response.answers;
+                    });
                     res.set({
                         'Content-Disposition': 'attachment; filename=surveyRun-'+id+'-responses.csv'
                     });
                     res.status(200);
-                    writeObjectsToCSVStream(flatResponses, res);
+                    writeObjectsToCSVStream(answers, res);
                     res.end();
                 },
@@ -953 +955 @@
 }
 
-function responsesToVariables(responses) {
-    return _.map(responses, responseToVariables);
-}
-
-function responseToVariables(response) {
-    var result = flattenObject(response.answers);
-    return result;
-}
-
-function flattenObject(value) {
-    var result = {};
-    (function agg(val,key,res){
-        if ( _.isObject(val) ) {
-            var keys = _.keys(val);
-            // FIXME : dirty hack for questions with only one input
-            if ( keys.length === 1 ) {
-                agg(val[keys[0]],key,res);
-            } else {
-                _.forEach(val, function(v,k){
-                    agg(v,(key ? key+'.' : '')+k,res);
-                });
-            }
-        } else if ( _.isArray(val) ) {
-            // FIXME : dirty hack for questions with only one input
-            if ( val.length === 1 ) {
-                agg(val[0],key,res);
-            } else {
-                _.forEach(val, function(v,i){
-                    agg(v,(key ? key+'.' : '')+i,res);
-                });
-            }
-        } else {
-            res[key] = val;
-        }
-    })(value,null,result);
-    return result;
-}
-
 function writeObjectsToCSVStream(objects, stream, prelude) {
     var keys = _.chain(objects)