Merge branch 'maxceem-dev' into dev

Author: gondzo

common/Permission.js

@@ -37,10 +37,35 @@ function providerRoleCheck(req, res, next) {
     next();
   });
 }
+/**
+ * check the user permission
+ * if user role not pilot, then cannot perform pilot actions
+ * @param req
+ * @param res
+ * @param next
+ */
+function pilotRoleCheck(req, res, next) {
+  User.findOne({_id: req.auth.sub}, (err, user) => {
+    if (!user) {
+      throw new errors.AuthenticationRequiredError('Anonymous is not allowed to access', 401);
+    }
+
+    if (user.role !== Role.PILOT) {
+      throw new errors.NotPermittedError('Non-pilot is not allowed to access', 403);
+    }
+    req.auth.payload = {
+      role: Role.PILOT,
+    };
+    next();
+  });
+}
 
 
 module.exports = {
   providerRole() {
     return providerRoleCheck;
   },
+  pilotRole() {
+    return pilotRoleCheck;
+  },
 };

controllers/MissionController.js

@@ -23,6 +23,9 @@ module.exports = {
   getAllByDrone,
   download,
   remove,
+  getPilotChecklist,
+  updatePilotChecklist,
+  fetchPilotMissions,
 };
 
 /**
@@ -98,3 +101,33 @@ function* monthlyCountByDrone(req, res) {
 function* getAllByDrone(req, res) {
   res.json(yield MissionService.getAllByDrone(req.params.droneId, req.query));
 }
+
+/**
+ * Get a pilot checklist
+ *
+ * @param req the request
+ * @param res the response
+ */
+function* getPilotChecklist(req, res) {
+  res.json(yield MissionService.getPilotChecklist(req.params.id, req.auth.sub));
+}
+
+/**
+ * Update a pilot checklist
+ *
+ * @param req the request
+ * @param res the response
+ */
+function* updatePilotChecklist(req, res) {
+  res.json(yield MissionService.updatePilotChecklist(req.params.id, req.auth.sub, req.body));
+}
+
+/**
+ * Fetch pilot mission list
+ *
+ * @param req the request
+ * @param res the response
+ */
+function* fetchPilotMissions(req, res) {
+  res.json(yield MissionService.fetchPilotMissions(req.auth.sub, req.query));
+}

data/questions.json

@@ -0,0 +1,10 @@
+[
+  {"text": "Check your drone battery charge"},
+  {"text": "Check for potential equipment damage"},
+  {"text": "Check the current and anticipated weather"},
+  {"text": "Check your available file storage"},
+  {"text": "Determine ideal starting and landing spots"},
+  {"text": "Ensure a strong signal from drone to controller"},
+  {"text": "Scout the space you’re about to shoot"},
+  {"text": "Inform others of your project'"}
+]

data/users.json

@@ -27,5 +27,26 @@
     "socialNetworkType": "google-oauth2",
     "socialNetworkId": 1,
     "socialNetworkAccessToken": "123456"
+  },
+  {
+    "name": "pilot",
+    "firstName": "fisrt",
+    "lastName": "last",
+    "email": "[email protected]",
+    "password": "pilot",
+    "avatarUrl": "http://google.com",
+    "phone": "+1 123-1234-123",
+    "address": {
+      "coordinates": [
+        73,
+        56
+      ],
+      "line1": "Address 1",
+      "city": "City 1",
+      "postalCode": "10000",
+      "state": "state",
+      "primary": true
+    },
+    "role": "pilot"
   }
 ]

enum.js

@@ -66,6 +66,12 @@ const DroneType = {
   type2: 'type2',
 };
 
+const PilotChecklistAnswers = {
+  YES: 'yes',
+  NO: 'no',
+  NOTE: 'note',
+};
+
 module.exports = {
   SocialType,
   DroneStatus,
@@ -77,4 +83,5 @@ module.exports = {
   MissionStatus,
   NotificationType,
   RequestStatus,
+  PilotChecklistAnswers,
 };

generate-test-data.js

@@ -29,6 +29,7 @@ const Notification = models.Notification;
 const Service = models.Service;
 const DronePosition = models.DronePosition;
 const NoFlyZone = models.NoFlyZone;
+const Question = models.Question;
 
 let drones;
 if (process.argv[2] === 'drones-within-area') {
@@ -47,6 +48,7 @@ const notifications = require('./data/notifications.json');
 const providerUsers = require('./data/provider-users.json');
 const positions = require('./data/dronePositions.json');
 const noFlyZones = require('./data/no-fly-zones.json');
+const questions = require('./data/questions.json');
 
 const MissionStatus = require('./enum').MissionStatus;
 const RequestStatus = require('./enum').RequestStatus;
@@ -74,6 +76,7 @@ co(function*() {
   yield Notification.remove({});
   yield DronePosition.remove({});
   yield NoFlyZone.remove({});
+  yield Question.remove({});
 
     // encrypt password
   yield _.map(users, (u) => function* () {
@@ -147,7 +150,7 @@ co(function*() {
 
   _.each(missions, (m, i) => {
     m.provider = packageDocs[i % packageDocs.length].provider;
-    m.pilot = userDocs[0].id; // setting all to first user for testing convinience
+    m.pilot = userDocs[0].id; // setting all to first user for testing convenience
     m.drone = droneDocs[i % droneDocs.length].id;
     m.status = _.values(MissionStatus)[Math.floor(Math.random() * _.values(MissionStatus).length)];
     m.telemetry = {
@@ -166,18 +169,20 @@ co(function*() {
     }];
   });
   logger.info(`creating ${missions.length} missions`);
-  const missionDocs = yield Mission.create(missions);
+  const missionDocs = yield Mission.create(
+    _.map(missions, (mission, index) => _.assign(mission, {missionName: mission.missionName + ' ' + index}))
+  );
 
   _.each(reviews, (r, i) => {
-    r.user = userDocs[0].id; // setting all to first user for testing convinience
+    r.user = userDocs[0].id; // setting all to first user for testing convenience
     r.mission = missionDocs[i % missionDocs.length].id;
     r.provider = missionDocs[i % missionDocs.length].provider;
   });
   logger.info(`creating ${reviews.length} reviews`);
   yield Review.create(reviews);
 
   _.each(requests, (r, i) => {
-    r.user = userDocs[0].id; // setting all to first user for testing convinience
+    r.user = userDocs[0].id; // setting all to first user for testing convenience
     r.package = packageDocs[i % packageDocs.length].id;
     r.provider = packageDocs[i % packageDocs.length].provider;
   });
@@ -205,8 +210,16 @@ co(function*() {
     const mindex = i % missionDocs.length;
     missionDocs[mindex].packageRequest = requestDocs[i].id;
     missionDocs[mindex].provider = requestDocs[i].provider;
-    missionDocs[mindex].status = i % 2 ? MissionStatus.IN_PROGRESS : MissionStatus.COMPLETED;
-    missionDocs[mindex].pilot = providerUserDocs[i % providerDocs.length].id;
+    // add some missions to the pilot user
+    if (i % (providerDocs.length + 1) !== providerDocs.length) {
+      missionDocs[mindex].pilot = providerUserDocs[i % (providerDocs.length + 1)].id;
+      // for provider user use same statuses as for providerRequests
+      missionDocs[mindex].status = i % 2 ? MissionStatus.IN_PROGRESS : MissionStatus.COMPLETED;
+    } else {
+      missionDocs[mindex].pilot = userDocs[2].id; // pilot user
+      // for pilot user use all possible statuses
+      missionDocs[mindex].status = MissionStatus[_.keys(MissionStatus)[Math.floor(_.keys(MissionStatus).length * Math.random())]];
+    }
     missionDocs[mindex].scheduledAt = today.add(1, 'h').toDate(); // +1 hour
     missionDocs[mindex].startedAt = today.add(2, 'h').toDate(); // +2 hours
     missionDocs[mindex].launchDate = today.toDate();
@@ -218,7 +231,7 @@ co(function*() {
     yield missionDocs[mindex].save();
   }
   _.each(notifications, (n) => {
-    n.user = userDocs[0].id; // setting all to first user for testing convinience
+    n.user = userDocs[0].id; // setting all to first user for testing convenience
   });
   logger.info(`creating ${notifications.length} notifications`);
   yield Notification.create(notifications);
@@ -232,6 +245,9 @@ co(function*() {
   logger.info(`creating ${noFlyZones.length} no fly zones`);
   yield NoFlyZone.create(noFlyZones);
 
+  logger.info(`creating ${questions.length} questions`);
+  const questionDocs = yield Question.create(questions);
+
   logger.info('data created successfully');
 }).then(() => {
   logger.info('Done');

models/Mission.js

@@ -42,6 +42,39 @@ const ZoneSchema = new Schema({
   style: {type: Mixed, default: {}},
 });
 
+// Pilot checklist answer schema
+const PilotChecklistAnswerSchema = new Schema({
+  question: {type: Schema.Types.ObjectId, required: true, unique: true, ref: 'Question'},
+  answer: {type: String, enum: _.values(enums.PilotChecklistAnswers)},
+  note: String,
+});
+
+if (!PilotChecklistAnswerSchema.options.toObject) {
+  PilotChecklistAnswerSchema.options.toObject = {};
+}
+
+PilotChecklistAnswerSchema.options.toObject.transform = function (doc, ret, options) {
+  const sanitized = _.omit(ret, '__v', '_id');
+  return sanitized;
+};
+
+// Pilot checklist schema
+const PilotChecklistSchema = new Schema({
+  answers: {type: [PilotChecklistAnswerSchema]},
+  user: {type: Schema.Types.ObjectId, required: true, ref: 'User'},
+});
+
+PilotChecklistSchema.plugin(timestamps);
+
+if (!PilotChecklistSchema.options.toObject) {
+  PilotChecklistSchema.options.toObject = {};
+}
+
+PilotChecklistSchema.options.toObject.transform = function (doc, ret, options) {
+  const sanitized = _.omit(ret, '__v', '_id');
+  return sanitized;
+};
+
 const MissionSchema = new mongoose.Schema({
   missionName: { type: String, required: false },
   plannedHomePosition: { type: mongoose.Schema.Types.Mixed, required: false },
@@ -51,6 +84,7 @@ const MissionSchema = new mongoose.Schema({
   provider: {type: Schema.Types.ObjectId, required: false, ref: 'Provider'},
   packageRequest: {type: Schema.Types.ObjectId, required: false, ref: 'PackageRequest'},
   pilot: {type: Schema.Types.ObjectId, required: false, ref: 'User'},
+  pilotChecklist: PilotChecklistSchema,
   startingPoint: {type: Address, required: false},
   destinationPoint: {type: Address, required: false},
 
@@ -119,7 +153,7 @@ if (!MissionSchema.options.toObject) {
  * @param  {Object}   options     the transform options
  */
 MissionSchema.options.toObject.transform = function (doc, ret, options) { // eslint-disable-line no-unused-vars
-  const sanitized = _.omit(ret, '__v', '_id', 'createdAt', 'updatedAt', 'packageRequest', 'pilot', 'drone');
+  const sanitized = _.omit(ret, '__v', '_id', 'createdAt', 'updatedAt', 'packageRequest', 'pilot', 'pilotChecklist', 'drone');
   sanitized.startingPoint = _.omit(sanitized.startingPoint, '_id');
   sanitized.destinationPoint = _.omit(sanitized.destinationPoint, '_id');
   sanitized.id = doc._id;

models/Question.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2016 TopCoder Inc., All Rights Reserved.
+ */
+'use strict';
+/**
+ * The Question model
+ *
+ * @author      TSCCODER
+ * @version     1.0
+ */
+
+const mongoose = require('../datasource').getMongoose();
+const helper = require('../common/helper');
+
+const QuestionSchema = new mongoose.Schema({
+  text: { type: String, required: true },
+});
+
+helper.sanitizeSchema(QuestionSchema);
+
+module.exports = {
+  QuestionSchema,
+};

models/index.js

@@ -83,6 +83,11 @@ const NoFlyZoneSchema = require('./NoFlyZone').NoFlyZoneSchema;
 
 const NoFlyZone = db.model('NoFlyZone', NoFlyZoneSchema);
 
+// Question model
+const QuestionSchema = require('./Question').QuestionSchema;
+
+const Question = db.model('Question', QuestionSchema);
+
 module.exports = {
   Drone,
   DronePosition,
@@ -98,4 +103,5 @@ module.exports = {
   Service,
   Address,
   NoFlyZone,
+  Question,
 };

routes.js

@@ -12,6 +12,7 @@
 
 const auth = require('./common/Auth.js');
 const providerRole = require('./common/Permission').providerRole;
+const pilotRole = require('./common/Permission').pilotRole;
 
 module.exports = {
   '/login': {
@@ -389,4 +390,23 @@ module.exports = {
       method: 'remove',
     },
   },
+  '/pilot/checklist/:id': {
+    get: {
+      controller: 'MissionController',
+      middleware: [auth(), pilotRole()],
+      method: 'getPilotChecklist',
+    },
+    put: {
+      controller: 'MissionController',
+      middleware: [auth(), pilotRole()],
+      method: 'updatePilotChecklist',
+    },
+  },
+  '/pilot/missions': {
+    get: {
+      controller: 'MissionController',
+      middleware: [auth(), pilotRole()],
+      method: 'fetchPilotMissions',
+    },
+  },
 };