Merge pull request #15 from ucfcs/feature/post-requests

Feature/post requests

Author: RandyT97

.gitignore

@@ -1,19 +1,20 @@
-/duct-drone-app/node_modules
-/duct-drone-app/test/js
-/duct-drone-app/test/browsertest/js
-/duct-drone-app/test/fixtures/temp-cache-fixture
-/duct-drone-app/benchmark/js
-/benchmark/fixtures
-/duct-drone-app/examples/**/dist
-/duct-drone-app/coverage
-/duct-drone-app/.DS_Store
-/duct-drone-app/*.log
-/duct-drone-app/.idea
-/duct-drone-app/.vscode
-/duct-drone-app/.eslintcache
-/duct-drone-app/package-lock.json
-/Documents/*
-/duct-drone-app/.vs/
-duct-drone-app/src/.vs/
-/.vs/
-/duct-drone-app/build/
+/duct-drone-app/node_modules
+/duct-drone-app/test/js
+/duct-drone-app/test/browsertest/js
+/duct-drone-app/test/fixtures/temp-cache-fixture
+/duct-drone-app/benchmark/js
+/benchmark/fixtures
+/duct-drone-app/examples/**/dist
+/duct-drone-app/coverage
+/duct-drone-app/.DS_Store
+/duct-drone-app/*.log
+/duct-drone-app/.idea
+/duct-drone-app/.vscode
+/duct-drone-app/.eslintcache
+/duct-drone-app/package-lock.json
+/duct-drone-app/server/mocks.json
+/Documents/*
+/duct-drone-app/.vs/
+duct-drone-app/src/.vs/
+/.vs/
+/duct-drone-app/build/

duct-drone-app/package.json

@@ -31,6 +31,7 @@
     "webpack-dev-server": "^3.2.1"
   },
   "dependencies": {
+    "body-parser": "^1.19.0",
     "express": "^4.16.4",
     "mongodb": "^3.2.2",
     "mongoose": "^5.4.22",

duct-drone-app/server/controllers/entryController.js

@@ -1,5 +1,29 @@
 const Entry = require('../daos/entrydao');
 
+exports.createEntry = function (req, res, next) {
+  const entry = {
+    time: req.body.time,
+    temperature: req.body.temperature,
+    air_velocity: req.body.air_velocity,
+    coordinates:
+      {
+        x: req.body.coordinates.x,
+        y: req.body.coordinates.y,
+        z: req.body.coordinates.z,
+      },
+  };
+  Entry.create(entry, (err, entry) => {
+    if (err) {
+      res.json({
+        error: err,
+      });
+    }
+    res.json({
+      message: 'Entry created successfully',
+    });
+  });
+};
+
 exports.getEntries = function (req, res, next) {
   Entry.get({}, (err, entry) => {
     if (err) {

duct-drone-app/server/controllers/mapController.js

@@ -1,7 +1,27 @@
-const map = require('../daos/mapdao');
+const Map = require('../daos/mapdao');
+
+exports.createMap = function (req, res, next) {
+  console.log(req.body);
+  const map = {
+    name: req.body.name,
+    map_link: req.body.map_link,
+    date: req.body.date,
+    sensorData: req.body.sensorData,
+  };
+  Map.create(map, (err, map) => {
+    if (err) {
+      res.json({
+        error: err,
+      });
+    }
+    res.json({
+      message: 'Map created successfully',
+    });
+  });
+};
 
 exports.getMaps = function (req, res, next) {
-  map.get({}, (err, map) => {
+  Map.get({}, (err, map) => {
     if (err) {
       res.json({
         error: err,

duct-drone-app/server/index.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const path = require('path');
 const mongoose = require('mongoose');
-
+const bodyParser = require('body-parser');
 const entryRoute = require('./routes/entry');
 const mapRoute = require('./routes/map');
 
@@ -10,6 +10,9 @@ const server = '127.0.0.1:27017'; // DB SERVER
 const database = 'test'; // DB NAME
 const port = process.env.PORT || 5000;
 
+
+const bodyParserJSON = bodyParser.json();
+const bodyParserURLEncoded = bodyParser.urlencoded({ extended: true });
 // respond with "hello world" when a GET request is made to the homepage
 app.use(express.static(path.join(__dirname, '../build')));
 
@@ -24,6 +27,8 @@ const db = mongoose.connection;
 db.on('error', console.error.bind(console, 'MongoDB connection error:'));
 
 const router = express.Router();
+app.use(bodyParserJSON);
+app.use(bodyParserURLEncoded);
 app.use('/api', router);
 entryRoute(router);
 mapRoute(router);

duct-drone-app/server/models/entrymodel.js

@@ -2,7 +2,7 @@ const mongoose = require('mongoose');
 
 const { Schema } = mongoose;
 const entrySchema = new Schema({
-  coordinate: [{ x: Number, y: Number, z: Number }],
+  coordinates: { x: Number, y: Number, z: Number },
   time: Date,
   temperature: Schema.Types.Decimal128,
   air_velocity: Schema.Types.Decimal128,

duct-drone-app/server/models/mapModel.js

@@ -1,12 +1,13 @@
 const mongoose = require('mongoose');
+const entrySchema = require('./entrymodel');
 
 const { Schema } = mongoose;
 
 const mapSchema = new Schema({
   name: String,
   map_link: String,
   date: Date,
-  sensorData: [{ type: Schema.Types.ObjectId, ref: 'Entry' }],
+  sensorData: [entrySchema],
 });
 
 module.exports = mapSchema;

duct-drone-app/server/routes/entry.js

@@ -2,4 +2,5 @@ const Entry = require('../controllers/entryController');
 
 module.exports = function (router) {
   router.get('/get/entries', Entry.getEntries);
+  router.post('/create/entry', Entry.createEntry);
 };

duct-drone-app/server/routes/map.js

@@ -2,4 +2,5 @@ const Map = require('../controllers/mapController');
 
 module.exports = function (router) {
   router.get('/get/maps', Map.getMaps);
+  router.post('/create/map', Map.createMap);
 };