chore(structure-data-flow): structure dataflow within the api

- re-organize routing components

[Finishes #167036068]

index.js

@@ -1,11 +1,10 @@
-import express from "express";
-import bodyParser from "body-parser";
-import session from "express-session";
-import cors from "cors";
-import swaggerUI from "swagger-ui-express";
-import swagger from "./swaggerSetUp/ah-92explorers-api";
-import welcomeRouter from "./routes/welcomeRouter";
-
+import express from 'express';
+import bodyParser from 'body-parser';
+import cors from 'cors';
+import swaggerUI from 'swagger-ui-express';
+import morgan from 'morgan';
+import swagger from './swaggerSetUp/ah-92explorers-api';
+import router from './routes';
 // Create global app object
 const app = express();
 
@@ -14,32 +13,25 @@ app.use(cors());
 // Normal express config defaults
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
+app.use(morgan('dev'));
+
+app.use(require('method-override')());
 
-app.use(require("method-override")());
-app.use(express.static(__dirname + "/public"));
+app.use(express.static(`${__dirname}/public`));
 
-app.get("/swagger.json", (req, res) => {
-  res.setHeader("Content-Type", "application/json");
+app.get('/swagger.json', (req, res) => {
+  res.setHeader('Content-Type', 'application/json');
   res.send(swagger.swaggerSpec);
 });
-app.use("/docs", swaggerUI.serve, swaggerUI.setup(swagger.swaggerSpec));
-
-app.use(
-  session({
-    secret: "authorshaven",
-    cookie: { maxAge: 60000 },
-    resave: false,
-    saveUninitialized: false
-  })
-);
+app.use('/docs', swaggerUI.serve, swaggerUI.setup(swagger.swaggerSpec));
 
-require("./models/User");
+require('./models/User');
 
-app.use("/welcome", welcomeRouter);
+app.use(router);
 
-/// catch 404 and forward to error handler
-app.use(function(_req, _res, next) {
-  const err = new Error("Not Found");
+// / catch 404 and forward to error handler
+app.use((_req, _res, next) => {
+  const err = new Error('Not Found');
   err.status = 404;
   next(err);
 });
@@ -59,8 +51,8 @@ app.use((err, res) => {
 });
 
 // finally, let's start our server...
-const server = app.listen(process.env.PORT || 3000, function() {
-  console.log("Listening on port " + server.address().port);
+const server = app.listen(process.env.PORT || 3000, () => {
+  console.log(`Listening on port ${server.address().port}`);
 });
 
 export default app;

package.json

@@ -4,7 +4,7 @@
   "description": "A Social platform for the creative at heart",
   "main": "index.js",
   "scripts": {
-    "start": "babel-node ./index.js",
+    "start": "nodemon ./index.js --exec babel-node",
     "test": "NODE_ENV=test mocha --require @babel/register ./tests --timeout 10000 --exit",
     "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
   },

routes/api/index.js

@@ -1 +1,8 @@
+import express from 'express';
+import welcome from './welcome';
 
+const router = express.Router();
+
+router.use('/', welcome);
+
+export default router;

routes/api/welcome.js

@@ -0,0 +1,7 @@
+import express from 'express';
+import welcomeController from '../../controllers/welcomeController';
+
+const router = express.Router();
+router.get('/welcome', welcomeController.welcome);
+
+export default router;

routes/index.js

@@ -0,0 +1,8 @@
+import express from 'express';
+import router from './api';
+
+const route = express.Router();
+
+route.use('/api/v1', router);
+
+export default route;

tests/welcome.test.js

@@ -3,7 +3,7 @@ import { assert } from 'chai';
 
 describe('Express Server', () => {
   it('should return 200', (done) => {
-    http.get('http://localhost:3000/welcome', (res) => {
+    http.get('http://localhost:3000/api/v1/welcome', (res) => {
       assert.equal(200, res.statusCode);
       done();
     });