Refactored some of the controllers code

webcast-io · Mar 30, 2014 · 91614e0 · 91614e0
1 parent b606fa8
commit 91614e0
Showing 1 changed file with 20 additions and 40 deletions.
diff --git a/lib/controllers/jobs.js b/lib/controllers/jobs.js
@@ -8,18 +8,27 @@
 //
 function main (app) {
 
+  function find (conditions, req, res) {
+    app.models.job
+    .find(conditions)
+    .sort('-priority')
+    .exec(function (err, jobs) {
+      if (err) {
+        res.json(422, err);
+      } else {
+        res.json(jobs);
+      }
+    });
+  }
+
+
   return {
 
 
     // GET /jobs
     //
     index: function (req,res) {
-      app.models.job
-      .find({})
-      .sort('-priority')
-      .exec(function (err, jobs){
-        res.json(jobs);
-      });
+      find({}, req, res);
     },
 
     // POST /jobs
@@ -40,68 +49,39 @@ function main (app) {
     // GET /jobs/search
     //
     search: function (req,res) {
-      app.models.job
-      .find(req.query)
-      .sort('-priority')
-      .exec(function (err, jobs){
-        if (err) {
-          res.json(422, err);
-        } else {
-          res.json(jobs);
-        }
-      });
+      find(req.query, req, res);
     },
 
 
 
     // GET /jobs/new
     //
     new: function (req,res) {
-      app.models.job
-      .find({status: 'new'})
-      .sort('-priority')
-      .exec(function (err, jobs){
-        res.json(jobs);
-      });
+      find({status: 'new'}, req, res);
     },
 
 
 
     // GET /jobs/processing
     //
     processing: function (req,res) {
-      app.models.job
-      .find({status: 'processing'})
-      .sort('-priority')
-      .exec(function (err, jobs){
-        res.json(jobs);
-      });
+      find({status: 'processing'}, req, res);
     },
 
 
 
     // GET /jobs/completed
     //
     completed: function (req,res) {
-      app.models.job
-      .find({status: 'completed'})
-      .sort('-priority')
-      .exec(function (err, jobs){
-        res.json(jobs);
-      });
+      find({status: 'completed'}, req, res);
     },
 
 
 
     // GET /jobs/failed
     //
     failed: function (req,res) {
-      app.models.job
-      .find({status: 'failed'})
-      .sort('-priority')
-      .exec(function (err, jobs){
-        res.json(jobs);
-      });
+      find({status: 'failed'}, req, res);
     },