Merge pull request #14 from ucfcs/feature/get-apis

get all api routes

Author: RandyT97

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

@@ -0,0 +1,14 @@
+const Entry = require('../daos/entrydao');
+
+exports.getEntries = function (req, res, next) {
+  Entry.get({}, (err, entry) => {
+    if (err) {
+      res.json({
+        error: err,
+      });
+    }
+    res.json({
+      ...entry,
+    });
+  });
+};

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

@@ -0,0 +1,14 @@
+const map = require('../daos/mapdao');
+
+exports.getMaps = function (req, res, next) {
+  map.get({}, (err, map) => {
+    if (err) {
+      res.json({
+        error: err,
+      });
+    }
+    res.json({
+      ...map,
+    });
+  });
+};

duct-drone-app/server/daos/entrydao.js

@@ -0,0 +1,16 @@
+const mongoose = require('mongoose');
+
+const entrySchema = require('../models/entryModel');
+
+entrySchema.statics = {
+  create(data, cb) {
+    const entry = new this(data);
+    entry.save(cb);
+  },
+  get(query, cb) {
+    this.find(query, cb);
+  },
+};
+
+const entryModel = mongoose.model('Entry', entrySchema);
+module.exports = entryModel;

duct-drone-app/server/daos/mapdao.js

@@ -0,0 +1,16 @@
+const mongoose = require('mongoose');
+
+const mapSchema = require('../models/mapModel');
+
+mapSchema.statics = {
+  create(data, cb) {
+    const map = new this(data);
+    map.save(cb);
+  },
+  get(query, cb) {
+    this.find(query, cb);
+  },
+};
+
+const mapModel = mongoose.model('Map', mapSchema);
+module.exports = mapModel;

duct-drone-app/server/database.js

@@ -1,54 +1,32 @@
-let Entry = require('./models/entrymodel');
-let Floor= require('./models/floormodel');
-var express = require('express');
+const express = require('express');
 const path = require('path');
-var app = express();
-const server = '127.0.0.1:27017';      //DB SERVER
-const database = 'test';    //DB NAME
+const mongoose = require('mongoose');
 
+const entryRoute = require('./routes/entry');
+const mapRoute = require('./routes/map');
 
- //respond with "hello world" when a GET request is made to the homepage
-app.use(express.static(path.join(__dirname, '../build')));
-
+const app = express();
+const server = '127.0.0.1:27017'; // DB SERVER
+const database = 'test'; // DB NAME
 const port = process.env.PORT || 5000;
 
-// console.log that your server is up and running
-app.listen(port, () => console.log(`Listening on port ${port}`));
+// respond with "hello world" when a GET request is made to the homepage
+app.use(express.static(path.join(__dirname, '../build')));
 
 // create a GET route
 app.get('/express_backend', (req, res) => {
   res.send({ express: 'YOUR EXPRESS BACKEND IS CONNECTED TO REACT' });
 });
 
-var mongoose = require('mongoose');
-var mongoDB = `mongodb://${server}/${database}`;
+const mongoDB = `mongodb://${server}/${database}`;
 mongoose.connect(mongoDB, { useNewUrlParser: true });
-var db = mongoose.connection;
+const db = mongoose.connection;
 db.on('error', console.error.bind(console, 'MongoDB connection error:'));
 
-
-var testdata = new Entry({
-	coordinate:[{ x:32, y:32, z:23}],
-	time: new Date(),
-	temperature: 32.3,
-	air_velocity: 35.2,
-});
-testdata.save(function (err) {
-  if (err) return handleError(err);
-  console.log("SAVED");
-});
-app.get("/adddata", (req, res) => {
-	var testdata = new Entry({
-	coordinate:[{ x:32, y:32, z:23}],
-	time: new Date(),
-	temperature: 32.3,
-	air_velocity: 35.2,
-	});
-	testdata.save()
-		.then(item => {
-			res.send("Saved to db");
-		})
-		.catch(err => {
-			res.status(400).send("unable to save to db");
-		});
+const router = express.Router();
+app.use('/api', router);
+entryRoute(router);
+mapRoute(router);
+app.listen(port, (req, res) => {
+  console.log(`Server is running on ${port}`);
 });

duct-drone-app/server/index.js

@@ -1,11 +1,11 @@
-var mongoose = require('mongoose');
-const Schema = mongoose.Schema;
+const mongoose = require('mongoose');
 
+const { Schema } = mongoose;
 const entrySchema = new Schema({
-    coordinate: [{ x: Number, y: Number, z: Number }],
-    time: Date,
-    temperature: Schema.Types.Decimal128,
-    air_velocity: Schema.Types.Decimal128
+  coordinate: [{ x: Number, y: Number, z: Number }],
+  time: Date,
+  temperature: Schema.Types.Decimal128,
+  air_velocity: Schema.Types.Decimal128,
 });
 
-module.exports = mongoose.model('Entry', entrySchema);
+module.exports = entrySchema;

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

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

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

@@ -0,0 +1,5 @@
+const Entry = require('../controllers/entryController');
+
+module.exports = function (router) {
+  router.get('/get/entries', Entry.getEntries);
+};