adjust food api for updated mongo and add test

lib/api/food/index.js

@@ -71,7 +71,7 @@ function configure (app, wares, ctx) {
       });
       // delete record
       api.delete('/food/:_id', ctx.authorization.isPermitted('api:food:delete'), function(req, res) {
-        ctx.food.deleteOne(req.params._id, function ( ) {
+        ctx.food.remove(req.params._id, function ( ) {
         res.json({ });
         });
       });

lib/server/food.js

@@ -5,13 +5,13 @@ function storage (env, ctx) {
 
   function create (obj, fn) {
     obj.created_at = (new Date( )).toISOString( );
-    api().insert(obj, function (err, doc) {
-      if (err != null && err.message) {
-        console.log('Data insertion error', err.message);
-        fn(err.message, null);
-        return;
+    api().insertOne(obj, function (err, doc) {
+      if (err) {
+        console.log('Data insertion error', err, err.message);
+
       }
-      fn(null, doc.ops);
+
+      fn(err, obj);
     });
   }
 
@@ -22,9 +22,13 @@ function storage (env, ctx) {
       console.error(err);
       obj._id = new ObjectID();
     }
-    obj.created_at = (new Date( )).toISOString( );
-    api().save(obj, function (err, doc) {
-      fn(err, doc);
+    if (!obj.created_at) {
+      obj.created_at = (new Date( )).toISOString( );
+    }
+
+    var query = (obj.created_at && obj._id) ? { _id: obj._id, created_at: obj.created_at } : obj;
+    api().replaceOne(query, obj, { upsert: true }, function(err, updateResults) {
+      fn(err, obj);
     });
   }
 

tests/api.food.js

@@ -0,0 +1,148 @@
+'use strict';
+
+var _ = require('lodash');
+var request = require('supertest');
+var should = require('should');
+var language = require('../lib/language')();
+
+describe('Food API', function ( ) {
+  this.timeout(10000);
+  var self = this;
+  var known = 'b723e97aa97846eb92d5264f084b2823f57c4aa1';
+
+  var api = require('../lib/api/');
+  beforeEach(function (done) {
+    process.env.API_SECRET = 'this is my long pass phrase';
+    self.env = require('../lib/server/env')();
+    self.env.settings.authDefaultRoles = 'readable';
+    self.env.settings.enable = ['careportal', 'api'];
+    this.wares = require('../lib/middleware/')(self.env);
+    self.app = require('express')();
+    self.app.enable('api');
+    require('../lib/server/bootevent')(self.env, language).boot(function booted(ctx) {
+      self.ctx = ctx;
+      self.ctx.ddata = require('../lib/data/ddata')();
+      self.app.use('/api', api(self.env, ctx));
+      done();
+    });
+  });
+
+  it('put a food, query, delete, verify gone', function (done) {
+    // insert a sample food - needs to be unique from example data
+    var sample_food = "type=food&category=snack&subcategory=fast&name=a+food&portion=0&carbs=10&fat=0&protein=0&energy=0&gi=2&unit=g"
+    console.log('Inserting food entry');
+    request(self.app)
+      .put('/api/food/')
+      .set('api-secret', known || '')
+      .send(sample_food)
+      .expect(200)
+      .end(function (err) {
+        if (err) {
+          done(err);
+        } else {
+          // make sure devicestatus was inserted successfully
+          console.log('Ensuring food was inserted successfully');
+          request(self.app)
+            .get('/api/food/')
+            .query('find[created_at][$gte]=2024-10-27T20:32&find[created_at][$lte]=2024-10-25T20:322')
+            .set('api-secret', known || '')
+            .expect(200)
+            .expect(function (response) {
+              console.log(JSON.stringify(response.body[0]));
+            })
+            .end(function (err, res) {
+              if (err) {
+                done(err);
+              } else {
+                // delete the treatment
+                console.log('Deleting test food entry', res.body.length);
+                var food_to_delete = res.body[0]._id;
+                var total_foods_available = res.body.length;
+                request(self.app)
+                  .delete('/api/food/' + food_to_delete)
+                  .set('api-secret', known || '')
+                  .expect(200)
+                  .end(function (err) {
+                    if (err) {
+                      done(err);
+                    } else {
+                      // make sure it was deleted
+                      console.log('Testing if food was deleted');
+                      request(self.app)
+                        // .get('/api/food/' + food_to_delete)
+                        .get('/api/food/')
+                        // TODO: apparently food does not accept search params
+                        .query('find[created_at][$gte]=2024-10-27T20:32&find[created_at][$lte]=2024-10-25T20:322')
+                        .set('api-secret', known || '')
+                        .expect(200)
+                        .expect(function (response) {
+                          response.body.length.should.equal(total_foods_available - 1);
+                        })
+                        .end(done);
+                    }
+                  });
+              }
+            });
+        }
+      });
+  });
+  it('post a food, query, delete, verify gone', function (done) {
+    // insert a sample food - needs to be unique from example data
+    var sample_food = "type=food&category=snack&subcategory=fast&name=a+food&portion=0&carbs=10&fat=0&protein=0&energy=0&gi=2&unit=g"
+    console.log('Inserting food entry');
+    request(self.app)
+      .post('/api/food/')
+      .set('api-secret', known || '')
+      .send(sample_food)
+      .expect(200)
+      .end(function (err) {
+        if (err) {
+          done(err);
+        } else {
+          // make sure devicestatus was inserted successfully
+          console.log('Ensuring food was inserted successfully');
+          request(self.app)
+            .get('/api/food/')
+            .query('find[created_at][$gte]=2024-10-27T20:32&find[created_at][$lte]=2024-10-25T20:322')
+            .set('api-secret', known || '')
+            .expect(200)
+            .expect(function (response) {
+              console.log(JSON.stringify(response.body[0]));
+            })
+            .end(function (err, res) {
+              if (err) {
+                done(err);
+              } else {
+                // delete the treatment
+                console.log('Deleting test food entry', res.body.length);
+                var food_to_delete = res.body[0]._id;
+                var total_foods_available = res.body.length;
+                request(self.app)
+                  .delete('/api/food/' + food_to_delete)
+                  .set('api-secret', known || '')
+                  .expect(200)
+                  .end(function (err) {
+                    if (err) {
+                      done(err);
+                    } else {
+                      // make sure it was deleted
+                      console.log('Testing if food was deleted');
+                      request(self.app)
+                        // .get('/api/food/' + food_to_delete)
+                        .get('/api/food/')
+                        // TODO: apparently food does not accept search params
+                        .query('find[created_at][$gte]=2024-10-27T20:32&find[created_at][$lte]=2024-10-25T20:322')
+                        .set('api-secret', known || '')
+                        .expect(200)
+                        .expect(function (response) {
+                          response.body.length.should.equal(total_foods_available - 1);
+                        })
+                        .end(done);
+                    }
+                  });
+              }
+            });
+        }
+      });
+  });
+});