Merge pull request #2653 from ps2/respond-with-created-treatments

Track objects created in upsert, so we can generate response with ids…

lib/api/treatments/index.js

@@ -37,7 +37,6 @@ function configure (app, wares, ctx) {
           console.log('Error adding treatment', err);
           res.sendJSONStatus(res, consts.HTTP_INTERNAL_ERROR, 'Mongo Error', err);
         } else {
-          console.log('Treatment created');
           res.json(created);
         }
       });
@@ -73,4 +72,3 @@ function configure (app, wares, ctx) {
 }
 
 module.exports = configure;
-

lib/data/dataloader.js

@@ -59,7 +59,7 @@ function init(env, ctx) {
 
     // clear treatments, we're going to merge from more queries
     ddata.treatments = [];
-    
+
     async.parallel([
       loadEntries.bind(null, ddata, ctx)
       , loadTreatments.bind(null, ddata, ctx)
@@ -157,7 +157,7 @@ function loadTreatments (ddata, ctx, callback) {
     , sort: {created_at: 1}
   };
 
-  console.log('searching tretaments q', tq);
+  console.log('searching treatments q', tq);
   ctx.treatments.list(tq, function (err, results) {
     if (!err && results) {
       mergeToTreatments(ddata, results);
@@ -171,11 +171,11 @@ function loadProfileSwitchTreatments (ddata, ctx, callback) {
   var dateRange = {
     $gte: new Date(ddata.lastUpdated - (ONE_DAY * 31 * 12)).toISOString()
   };
-  
+
   if (ddata.page && ddata.page.frame) {
     dateRange['$lte'] = new Date(ddata.lastUpdated).toISOString( );
   }
-  
+
   var tq = {
     find: {
       eventType: 'Profile Switch'
@@ -201,7 +201,7 @@ function loadProfileSwitchTreatments (ddata, ctx, callback) {
         }
       }
     }
-    
+
     callback();
   });
 }
@@ -210,11 +210,11 @@ function loadSensorAndInsulinTreatments (ddata, ctx, callback) {
   var dateRange = {
     $gte: new Date(ddata.lastUpdated - (ONE_DAY * 32)).toISOString()
   };
-  
+
   if (ddata.page && ddata.page.frame) {
     dateRange['$lte'] = new Date(ddata.lastUpdated).toISOString( );
   }
-  
+
   var tq = {
     find: {
       eventType: {

lib/treatments.js

@@ -16,12 +16,17 @@ function storage (env, ctx) {
     }
 
     if (_.isArray(objOrArray)) {
+      var allDocs = [];
+      var errs = [];
       async.eachSeries(objOrArray, function (obj, callback) {
         upsert(obj, function upserted (err, docs) {
+          allDocs = allDocs.concat(docs);
+          errs.push(err);
           callback(err, docs)
         });
       }, function (err, docs) {
-        done(err, docs);
+        errs = _.compact(errs);
+        done(errs.length > 0 ? errs : null, allDocs);
       });
     } else {
       upsert(objOrArray, function upserted (err, docs) {