Changeset 531 for Dev/trunk/src/server/api

Timestamp:

03/27/14 14:44:36 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Return to using truly ISO formatted dates, including milliseconds.
• Also set constraint on surveyrun dates when value is initially set.
• Separate runs & results from surveys and questions.
• Moved date & email format to schema itself.

Location:

Dev/trunk/src/server/api

Files:

• responses.js (modified) (1 diff)
• surveyRuns.js (modified) (1 diff)
• util.js (modified) (1 diff)

Dev/trunk/src/server/api/responses.js

@@ -13 +13 @@
 
     var getResponsesBySurveyRunId = exports.getResponsesBySurveyRunId = function(surveyRunId) {
-        var url = '_design/responses/_view/by_surveyrun?key='+JSON.stringify(surveyRunId);
-        return couch.get(url)
+        return couch.get('_design/responses/_view/by_surveyrun',
+                         {query:{key:surveyRunId,reduce:false,include_docs:true}})
         .handle({
             '-1': _.identity,
-            200: util.handleRowValues,
+            200: util.handleRowDocs,
             default: util.handleUnknownResponse
         });

Dev/trunk/src/server/api/surveyRuns.js

@@ -15 +15 @@
     app.get('/',
         util.ensureMIME(util.JSON_MIME),
-        util.makeDocsGet('SurveyRun'));
+        function(req,res) {
+            var qs = {reduce:false,include_docs:true};
+            var now = new Date().toISOString();
+            var hr;
+            if ( 'current' in req.query ) {
+                // we make the assumption that there will be fewer
+                // runs with no or a future enddate than with a
+                // startdate in the past, i.e. we assume fewer future
+                // surveys are planned than past surveys are run.
+                hr = couch.get('_design/surveyRuns/_view/by_end_date',{
+                    query: {startkey:now,reduce:false,include_docs:true}
+                }).handle({
+                    '-1': _.identity,
+                    200: function(result) {
+                        return _.filter(
+                            util.handleRowDocs(result),
+                            function(doc){
+                                return !doc.startDate ||
+                                       doc.startDate <= now;
+                            });
+                    },
+                    default: util.handleUnknownResponse
+                });
+            } else if ( 'future' in req.query ) {
+                hr = couch.get('_design/surveyRuns/_view/by_start_date',{
+                    query: {startkey:now,reduce:false,include_docs:true}
+                }).handle({
+                    '-1': _.identity,
+                    200: util.handleRowDocs,
+                    default: util.handleUnknownResponse
+                });
+            } else if ( 'past' in req.query ) {
+                hr = couch.get('_design/surveyRuns/_view/by_end_date',{
+                    query: {endkey:now,reduce:false,include_docs:true}
+                }).handle({
+                    '-1': _.identity,
+                    200: util.handleRowDocs,
+                    default: util.handleUnknownResponse
+                });
+            } else {
+                hr = util.getDocumentsOfType('SurveyRun');
+            }
+            hr.handle({'-1': util.handleException})
+            .handle(res.send.bind(res));
+        });
     app.post('/',
         util.ensureMIME(util.JSON_MIME),

Dev/trunk/src/server/api/util.js

@@ -81 +81 @@
 
     var getDocumentsOfType = exports.getDocumentsOfType = function(type) {
-        var url = '_design/default/_view/by_type?key='+JSON.stringify(type);
-        return couch.get(url)
+        return couch.get('_design/default/_view/by_type',
+                         {query:{reduce:false,include_docs:true,key:type}})
         .handle({
             '-1': _.identity,
-            200: handleRowValues,
+            200: handleRowDocs,
             404: function() { return {error: "Cannot find collection of type "+type}; },
             default: handleUnknownResponse