Merge pull request #170 from topcoderinc/drone_service_updates

Drone service updates

Author: mtwomey

config/default.js

@@ -21,7 +21,7 @@ module.exports = {
   API_VERSION: 1,
   RESET_CODE_EXPIRES: 60 * 60,
   db: {
-    url: process.env.MONGOLAB_URI || 'mongodb://localhost:27017/drones',
+    url: process.env.MONGOLAB_URI || 'mongodb://heroku_fx9hv53r:[email protected]:43588/heroku_fx9hv53r',
     poolSize: 5,
   },
   mail: {

config/production.js

@@ -17,7 +17,7 @@ module.exports = {
   SALT_WORK_FACTOR: 2,
   TOKEN_EXPIRES: 10 * 60 * 60,
   db: {
-    url: process.env.MONGOLAB_URI || 'mongodb://localhost:27017/drones',
+    url: process.env.MONGOLAB_URI || 'mongodb://heroku_fx9hv53r:[email protected]:43588/heroku_fx9hv53r',
     poolSize: 5,
   },
 };

config/test.js

@@ -12,7 +12,7 @@
 
 module.exports = {
   db: {
-    url: 'mongodb://localhost:27017/drones_test',
+    url: 'mongodb://heroku_fx9hv53r:[email protected]:43588/heroku_fx9hv53r',
     poolSize: 5,
   },
 };

data/demoData/drones.json

@@ -1,7 +1,10 @@
 [
   {
     "name": "BoldBird",
-    "status": "idle-busy",
+    "serialNumber": "BoldBird1",
+    "make": "DJI",
+    "model": "F450",
+    "status": "idle-ready",
     "accessories": {
       "accessorie": {
         "name": "drone0 accessories"
@@ -36,6 +39,10 @@
     "hasGPS": true,
     "hasObstacleSensors": true,
     "hasUltraSonicAltimeter": false,
-    "description": "description and so on"
+    "description": "description and so on",
+    "altitute": 100,
+    "speed": 150,
+    "heading": 213,
+    "lastSeen": "2017-01-12T20:46:05.686Z"
   }
 ]

generate-demo-data.js

@@ -147,7 +147,6 @@ co(function*() {
   for (let i = 0; i < drones.length; i++) {
     drones[i].provider = providerDocs[i % providerDocs.length].id;
     drones[i].pilots = [providerUserDocs[i % providerUserDocs.length]];
-    drones[i].serialNumber = 'serialNumber' + i;
     droneDocs.push(yield Drone.create(drones[i]));
   }
 

models/Drone.js

@@ -21,13 +21,15 @@ const Mixed = mongoose.Schema.Types.Mixed;
 const DroneSchema = new mongoose.Schema({
   name: {type: String, required: true},
   description: { type: String, required: false },
-  status: {type: String, enum: _.values(DroneStatus), required: true},
+  status: {type: String, enum: _.values(DroneStatus), required: false},
   // realtime coordinate of the drone
   currentLocation: {type: [Number], index: {type: '2dsphere', sparse: true}},
   deviceId: { type: String, required: false },
   provider: {type: ObjectId, required: false, ref: 'Provider'},
   pilots: {type: [{type: ObjectId, ref: 'User'}]},
   serialNumber: {type: String, required: true},
+  make: String,
+  model: String,
   accessories: {type: Mixed},
   system: {type: String},
   maxFlightTime: {type: Number},
@@ -57,6 +59,11 @@ const DroneSchema = new mongoose.Schema({
   hasGPS: Boolean,
   hasObstacleSensors: Boolean,
   hasUltraSonicAltimeter: Boolean,
+
+  altitute: Number,
+  speed: Number,
+  heading: Number,
+  lastSeen: Date,
 });
 
 DroneSchema.plugin(timestamps);

models/DronePosition.js

@@ -17,6 +17,9 @@ const DronePositionSchema = new mongoose.Schema({
   droneId: { type: mongoose.Schema.ObjectId, required: true, refs: 'Drone' },
   lat: { type: Number, required: true },
   lng: { type: Number, required: true },
+  altitude: Number,
+  heading: Number,
+  speed: Number,
 });
 
 DronePositionSchema.plugin(timestamps);

services/DroneService.js

@@ -229,15 +229,21 @@ function *getSingle(id) {
 updateLocation.schema = {
   id: joi.string().required(),
   entity: joi.object().keys({
-    lat: joi.number().required(),
-    lng: joi.number().required(),
+    lat: joi.number(), // Made these not required, we need to turn this into a general drone update endpoint / service (so we can update just status, speed, ...etc)
+    lng: joi.number(),
+    status: joi.string(),
+    altitude: joi.number(),
+    heading: joi.number(),
+    speed: joi.number(),
+    lastSeen: joi.string(),
   }).required(),
   returnNFZ: joi.boolean(),
   nfzFields: joi.array().items(joi.string()),
   nfzLimit: joi.limit(),
   nearDronesMaxDist: joi.number().min(0),
   nearDroneFields: joi.array().items(joi.string()),
   nearDronesLimit: joi.limit().default(1),
+
 };
 
 /**
@@ -259,7 +265,14 @@ function *updateLocation(id, entity, returnNFZ, nfzFields, nfzLimit, nearDronesM
     throw new errors.NotFoundError(`Current logged in provider does not have this drone , id = ${id}`);
   }
 
+  entity.lng = entity.lng || drone.currentLocation[0];
+  entity.lat = entity.lat || drone.currentLocation[1];
   drone.currentLocation = [entity.lng, entity.lat];
+  drone.status = entity.status || drone.status;
+  drone.altitude = entity.altitude;
+  drone.heading = entity.heading;
+  drone.speed = entity.speed;
+  drone.lastSeen = new Date();
   yield drone.save();
 
   entity.droneId = id;