Changeset 492 for Dev/trunk/src/server

Timestamp:

03/09/14 14:23:42 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Enable/disable buttons on content change.
• One place to do date formatting, because it was going wrong again.
• Serialize questions in survey properly.
• _ComplexValueMixin consumes submit events, but does trigger outer forms if present.
• Trigger dialog show/hide for login only after previous effect is finished.
• Check that documents are actually valid, not just that validator returned a result.
• Validate email and timestamp formats.
• Prepared for live runs.

Location:

Dev/trunk/src/server

Files:

• app.js (modified) (7 diffs)
• config/check-couchdb.js (modified) (3 diffs)
• config/couchdb-design-docs.js (modified) (1 diff)
• config/couchdb-schema.json (modified) (4 diffs)
• config/upgrade-couchdb.js (modified) (1 diff)
• util/validator.js (added)

Dev/trunk/src/server/app.js

@@ -8 +8 @@
   , CouchDB = require('./util/couch').CouchDB
   , _ = require("underscore")
-  , tv4 = require("tv4")
+  , validator = require("./util/validator")
   , HTTPResult = require("./util/http-result")
   , etags = require("./util/etags")
@@ -151 +151 @@
         return new HTTPResult(500,{error: error.reason});
     }
-    function handleUnknownError(error){
+    function handleUnknownError(error) {
         return new HTTPResult(500, {error: "Unknown error", innerError: error});
     }
@@ -159 +159 @@
     function handleRowDocs(result) {
         return _.map(result.rows, function(item) { return item.doc; });
+    }
+    function handleRowFirstDoc(result) {
+        if ( result.rows.length > 0 ) {
+            return result.rows[0].doc;
+        } else {
+            return new HTTPResult(404,{error:"No document found."});
+        }
+    }
+    function handleRowFirstValue(result) {
+        if ( result.rows.length > 0 ) {
+            return result.rows[0].value;
+        } else {
+            return new HTTPResult(404,{error:"No document found."});
+        }
+    }
+    function handleRowDictOfDocs(result) {
+        return _.reduce(result.rows, function(dict,item) {
+            dict[item.key] = item.doc;
+            return dict;
+        }, {});
+    }
+    function handleRowDictOfValues(result) {
+        return _.reduce(result.rows, function(dict,item) {
+            dict[item.key] = item.value;
+            return dict;
+        }, {});
     }
 
@@ -199 +225 @@
     function putDocument(id,rev,type,doc) {
         var priv = stripAndReturnPrivates(doc);
-        if ( doc.type === type && tv4.validateResult(doc, schema) ) {
+        if ( doc.type === type && validator(doc, schema).valid ) {
             var opts = rev ? {headers:{'If-Match':'"'+rev+'"'}} : {};
             return HTTPResult.fromResponsePromise(couch.put(id,doc,opts).response,
@@ -236 +262 @@
     function postDocument(type,doc) {
         var priv = stripAndReturnPrivates(doc);
-        if ( doc.type === type && tv4.validateResult(doc, schema) ) {
+        if ( doc.type === type && validator(doc, schema).valid ) {
             return HTTPResult.fromResponsePromise(couch.post(doc).response,
                                                   handleUnknownError)
@@ -321 +347 @@
         .handle({
             200: handleRowDocs,
+            default: handleUnknownResponse
+        });
+    }
+    function getQuestionsAndCodes() {
+        var url = '_design/questions/_view/by_code';
+        var query = {include_docs:true};
+        return HTTPResult.fromResponsePromise(couch.get(url,{query:query}).response,
+                                              handleUnknownError)
+        .handle({
+            200: handleRowDictOfDocs,
             default: handleUnknownResponse
         });
@@ -760 +796 @@
                         return new HTTPResult(403,{error: "Secrets are not the same."});
                     } else {
-                        return deleteDocument(id,rev,doc);
+                        return getDocument(doc.surveyRunId,[],'SurveyRun')
+                        .handle({
+                            200: function(surveyRun) {
+                                if ( surveyRun.respondentCanDeleteOwnResponse === true ) {
+                                    return deleteDocument(id,rev,doc);
+                                } else {
+                                    return new HTTPResult(403,{error:"Not allowed to delete response."});
+                                }
+                            }
+                        });
                     }
                 }

Dev/trunk/src/server/config/check-couchdb.js

@@ -1 +1 @@
 var Q = require('q')
   , _ = require('underscore')
-  , tv4 = require('tv4')
+  , validator = require('../util/validator')
   , CouchDB = require('../util/couch').CouchDB
   ;
@@ -10 +10 @@
     var server = new CouchDB(couchServerURL,dbName);
     var designRe = /^_design\//;
+
+    var codes = {};
+    function codeUnique(code) {
+        if ( code in codes ) {
+            return false;
+        } else {
+            codes[code] = true;
+            return true;
+        }
+    }
+
     return server.get('/_all_docs')
     .then(function(allDocs){
@@ -20 +31 @@
                 return server.get(doc.id)
                 .then(function(doc){
-                    var valid = tv4.validateResult(doc,schema);
+                    var valid = validator(doc,schema);
+                    if ( doc.type === "Question" && !codeUnique(doc.code) ) {
+                        valid.valid = false;
+                        valid.error = "Question code "+doc.code+" is not unique.";
+                    }
                     result[doc._id] = valid;
                     return result;

Dev/trunk/src/server/config/couchdb-design-docs.js

@@ -125 +125 @@
     },
 
+    "qed/_design/surveyRuns": {
+        __configAction: "replace",
+        _id: "_design/surveys",
+        language: "javascript",
+        views: {
+            by_dates: {
+                map: function(doc){
+                    if ( doc.type !== 'SurveyRun' ) { return; }
+                    var startDate = doc.startDate || "";
+                    var endDate = doc.endDate || {};
+                    emit([startDate,endDate,doc.liveName||null],doc);
+                }
+            }
+        }
+    },
+
     "qed/_design/responses": {
         __configAction: "replace",

Dev/trunk/src/server/config/couchdb-schema.json

@@ -36 +36 @@
           "_rev": { "type": "string" },
           "categories": { "type": "array", "items": { "type": "string" } },
-          "code": { "type": "string" },
+          "code": { "type": "string", "minLength": 1 },
           "content": { "type": "array", "items": { "$ref": "#/definitions/content/any" } },
           "description": { "type": "string" },
@@ -52 +52 @@
           "_id": { "type": "string" },
           "_rev": { "type": "string" },
+          "description": { "type": "string" },
           "publicationDate": { "type": "string", "format": "datetime" },
           "questions": { "type": "array", "items": { "$ref": "#/definitions/docs/Question" } },
@@ -67 +68 @@
           "description": { "type": "string" },
           "endDate": { "type": "string", "format": "datetime" },
+          "liveName": { "type": "string" },
           "mode": { "type": "string", "enum": [ "open", "closed" ] },
-          "secret": { "type": "string", "minLength": 8 },
+          "respondentCanDeleteOwnResponse": { "type": "boolean" },
+          "secret": { "type": "string", "minLength": 1 },
           "startDate": { "type": "string", "format": "datetime" },
           "survey": { "$ref": "#/definitions/docs/Survey" },
@@ -83 +86 @@
           "_rev": { "type": "string" },
           "answers": { "type": "object" },
+          "email": { "type": "string", "format": "email" },
           "publicationDate": { "type": "string", "format": "datetime" },
-          "secret": { "type": "string", "minLength": 8 },
+          "secret": { "type": "string", "minLength": 1 },
           "surveyRunId": { "type": "string" }
         },

Dev/trunk/src/server/config/upgrade-couchdb.js

@@ -1 +1 @@
 var Q = require('q')
   , _ = require('underscore')
-  , tv4 = require('tv4')
   , CouchDB = require('../util/couch').CouchDB
   ;