Merge branch 'dev'

Author: gondzo

README.md

@@ -1,6 +1,8 @@
 DRONE SERIES - WEBAPI IMPLEMENT PRODUCER API
 ---
 
+
+
 # Setup
 - node v7 https://nodejs.org/en/
 - mongodb 3.2+ https://www.mongodb.com/
@@ -33,4 +35,4 @@ you also can export those values before run(data from forum).
 register and social login add role params
 default is `consumer` if role is empty
 #video
-https://youtu.be/rYBDekZ-hik
+https://youtu.be/rYBDekZ-hik

models/Drone.js

@@ -20,6 +20,7 @@ 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},
   // realtime coordinate of the drone
   currentLocation: {type: [Number]},
@@ -40,7 +41,6 @@ const DroneSchema = new mongoose.Schema({
   specificationImageUrl: String,
   specificationPDFUrl: String,
 
-
   minSpeed: Number,
   maxSpeed: Number,
   maxCargoWeight: Number,

services/DroneService.js

@@ -42,6 +42,7 @@ const droneCreateorUpdateEntityJoi = joi.object().keys({
   deviceId: joi.string(),
   serialNumber: joi.string().required(),
   name: joi.string().required(),
+  description: joi.string(),
   type: joi.string().valid(_.values(DroneType)).required(),
   minSpeed: joi.number(),
   maxSpeed: joi.number(),
@@ -178,8 +179,8 @@ function * _getAll(providerId, entity) {
   const docs = yield Drone.find(criteria).sort(sortBy).skip(entity.offset || 0).limit(entity.limit || 1000);
   return {
     total: yield Drone.find(criteria).count(),
-    items: _.map(docs, (d) => _.pick(d, 'id', 'imageUrl', 'status', 'thumbnailUrl', 'deviceId', 'serialNumber', 'name', 'type',
-      'mileage', 'minSpeed', 'maxSpeed', 'maxFlightTime', 'maxCargoWeight', 'currentLocation')),
+    items: _.map(docs, (d) => _.pick(d, 'id', 'imageUrl', 'status', 'thumbnailUrl', 'deviceId', 'serialNumber', 'name',
+      'description', 'type', 'mileage', 'minSpeed', 'maxSpeed', 'maxFlightTime', 'maxCargoWeight', 'currentLocation')),
   };
 }
 

services/NoFlyZoneService.js

@@ -43,7 +43,7 @@ function _assertExists(id, entity) {
  * @private
  */
 function* _validateMission(values) {
-  if (!values.mission) {
+  if (values.mission) {
     yield MissionService.getSingle(values.mission);
   }
   if (values.isPermanent) {

swagger.yaml

@@ -1917,6 +1917,8 @@ paths:
                       type: string
                     name:
                       type: string
+                    description:
+                      type: string
                     type:
                       type: string
                     mileage:
@@ -2772,6 +2774,8 @@ definitions:
         type: string
       name:
         type: string
+      description:
+        type: string
       type:
         type: string
       minSpeed: