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

Timestamp:

03/10/14 00:47:38 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Factored TabbedBrowser? out of TabbedQuestionBrowser?.
• Remove questions from overview when deleted.
• Only return topics that are inhabited in a category when one is specified.

File:

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

Dev/trunk/src/server/app.js

@@ -148 +148 @@
 
     function identity(obj) { return obj; }
-    function handleUnknownResponse(status,error){
+    function handleUnknownResponse(status,error) {
         return new HTTPResult(500,{error: error.reason});
     }
@@ -444 +444 @@
 
     // Categories and topics
+    function getTopicsWithCategory(category) {
+        var url = '_design/questions/_view/all';
+        return HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true,group_level:2,startkey:[category],endkey:[category,{}]}}).response,
+                                       handleUnknownError)
+        .handle({
+            200: function(result) {
+                return _.map(result.rows, function(item) { return { name:item.key[1], count:item.value }; });
+            },
+            default: handleUnknownResponse
+        });
+    }
     app.get('/api/categories',
         ensureAuthenticated,
@@ -466 +477 @@
         function(req,res) {
             var category = req.params.category;
-            var url = '_design/questions/_view/all';
-            HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true,group_level:2,startkey:[category],endkey:[category,{}]}}).response,
-                                           handleUnknownError)
-            .handle({
-                200: function(result) {
-                    return _.map(result.rows, function(item) { return { name:item.key[1], count:item.value }; });
-                },
-                default: handleUnknownResponse
-            })
+            getTopicsWithCategory(category)
             .handle(res.send.bind(res));
         });
@@ -482 +485 @@
         function(req,res) {
             var url = '_design/questions/_view/all_topics';
-            HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true}}).response,
-                                           handleUnknownError)
-            .handle({
-                200: function(result) {
-                    return _.map(result.rows, function(item) { return {name:item.key, count:item.value}; });
-                },
-                default: handleUnknownResponse
-            })
-            .handle(res.send.bind(res));
+            var hr;
+            if ( 'category' in req.query ) {
+                hr = getTopicsWithCategory(req.query.category);
+            } else {
+                hr = HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true}}).response,
+                                                    handleUnknownError)
+                .handle({
+                    200: function(result) {
+                        return _.map(result.rows, function(item) { return {name:item.key, count:item.value}; });
+                    },
+                    default: handleUnknownResponse
+                });
+            }
+            hr.handle(res.send.bind(res));
         });