From 5dab7fddbc55a87eee66378587e87296b7d2836b Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Mon, 29 Feb 2016 17:04:45 -0800
Subject: [PATCH] Fix jobs list and refetching

---
 common/app/routes/Jobs/components/Jobs.jsx      |  2 +-
 common/app/routes/Jobs/redux/fetch-jobs-saga.js |  2 +-
 server/services/job.js                          | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/common/app/routes/Jobs/components/Jobs.jsx b/common/app/routes/Jobs/components/Jobs.jsx
index 89d19a4931..f12e0ff91f 100644
--- a/common/app/routes/Jobs/components/Jobs.jsx
+++ b/common/app/routes/Jobs/components/Jobs.jsx
@@ -32,7 +32,7 @@ const bindableActions = {
 const fetchOptions = {
   fetchAction: 'fetchJobs',
   isPrimed({ jobs }) {
-    return !!jobs.length;
+    return jobs.length > 1;
   }
 };
 
diff --git a/common/app/routes/Jobs/redux/fetch-jobs-saga.js b/common/app/routes/Jobs/redux/fetch-jobs-saga.js
index 676bd3c8e9..a959605fbf 100644
--- a/common/app/routes/Jobs/redux/fetch-jobs-saga.js
+++ b/common/app/routes/Jobs/redux/fetch-jobs-saga.js
@@ -16,7 +16,7 @@ export default ({ services }) => ({ dispatch }) => next => {
     const { payload: id } = action;
     const data = { service: 'jobs' };
     if (id) {
-      data.id = id;
+      data.params = { id };
     }
 
     return services.readService$(data)
diff --git a/server/services/job.js b/server/services/job.js
index 78d7988885..e5fdf87392 100644
--- a/server/services/job.js
+++ b/server/services/job.js
@@ -23,17 +23,20 @@ export default function getJobServices(app) {
       });
 
       Job.create(job, (err, savedJob) => {
-        cb(err, savedJob);
+        cb(err, savedJob.toJSON());
       });
     },
     read(req, resource, params, config, cb) {
       const id = params ? params.id : null;
+      console.log('params', params);
       if (id) {
-        return Job.findById(id, cb);
+        return Job.findById(id)
+          .then(job => cb(null, job.toJSON()))
+          .catch(cb);
       }
-      Job.find(whereFilt, (err, jobs) => {
-        cb(err, jobs.map(job => job.toJSON()));
-      });
+      Job.find(whereFilt)
+        .then(jobs => cb(null, jobs.map(job => job.toJSON())))
+        .catch(cb);
     }
   };
 }