diff --git a/package-lock.json b/package-lock.json index 1590c8a..81e67de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -831,6 +831,12 @@ "lower-case": "^1.1.1" } }, + "node-fetch": { + "version": "2.3.0", + "resolved": "https://gizaartifactory.jfrog.io/gizaartifactory/api/npm/npm-release/node-fetch/-/node-fetch-2.3.0.tgz", + "integrity": "sha1-Gh2UC7+5FqHT4CGfA36J5x+MX6U=", + "dev": true + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", diff --git a/package.json b/package.json index 4d5e016..b11fd71 100644 --- a/package.json +++ b/package.json @@ -16,5 +16,8 @@ "express": "^4.16.4", "istanbul": "^0.4.5", "supertest": "^3.4.2" + }, + "devDependencies": { + "node-fetch": "^2.3.0" } } diff --git a/scripts/start-sample-node-api.sh b/scripts/start-sample-node-api.sh index c7e10e0..620a35c 100644 --- a/scripts/start-sample-node-api.sh +++ b/scripts/start-sample-node-api.sh @@ -3,6 +3,7 @@ # find node bin # export NODE_HOME=/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x # export NODE_HOME=/Z23B/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x +# export NODE_HOME=/u/nodejs/node-v6.16.0-os390-s390x echo 'starting sample node api...' if [ ! -z "$NODE_HOME" ]; then diff --git a/scripts/testNodeAPI.js b/scripts/testNodeAPI.js new file mode 100644 index 0000000..b45ca89 --- /dev/null +++ b/scripts/testNodeAPI.js @@ -0,0 +1,4 @@ +const fetch = require('node-fetch'); +fetch('https://mymainframe.ibm.com:18000/accounts', { method: 'GET' }) + .then(res => res.json()) // expecting a json response + .then(json => console.log(json)); \ No newline at end of file diff --git a/server/app.js b/server/app.js index f104649..64932c6 100644 --- a/server/app.js +++ b/server/app.js @@ -16,8 +16,11 @@ const app = express(); //TODO: use for whitelist only app.use(cors()); const routes = require('./routes/index.route'); +const cli = require('./cli/index.route'); + app.get('/', (req, res) => res.send('Hello World!')); app.use(routes); +app.use('/cli', cli); // const httpServer = http.createServer(app); const httpsServer = https.createServer(credentials, app); diff --git a/server/cli/accounts.route.js b/server/cli/accounts.route.js new file mode 100644 index 0000000..f05862b --- /dev/null +++ b/server/cli/accounts.route.js @@ -0,0 +1,15 @@ +const express = require('express'); +const router = express.Router({ mergeParams: true }); + +const accountsController = require('../controllers/accounts.controller'); +const accountsCarsRoute = require('./accountsCars.route'); + +router.route('/') + .get(accountsController.getAll); + +router.route('/:_id') + .get(accountsController.get); + +router.use('/:Account_id', accountsCarsRoute); + +module.exports = router; \ No newline at end of file diff --git a/server/cli/accountsCars.route.js b/server/cli/accountsCars.route.js new file mode 100644 index 0000000..34f1239 --- /dev/null +++ b/server/cli/accountsCars.route.js @@ -0,0 +1,12 @@ +const express = require('express'); +const router = express.Router({ mergeParams: true }); + +const accountsCarsController = require('../controllers/accountsCars.controller'); + +router.route('/cars') + .get(accountsCarsController.getAll); + +router.route('/cars/:_id') + .get(accountsCarsController.get); + +module.exports = router; \ No newline at end of file diff --git a/server/cli/cars.route.js b/server/cli/cars.route.js new file mode 100644 index 0000000..db55308 --- /dev/null +++ b/server/cli/cars.route.js @@ -0,0 +1,12 @@ +const express = require('express'); +const router = express.Router({ mergeParams: true }); + +const carsController = require('../controllers/cars.controller'); + +router.route('/') + .get(carsController.getAll); + +router.route('/:_id') + .get(carsController.get); + +module.exports = router; \ No newline at end of file diff --git a/server/cli/index.route.js b/server/cli/index.route.js new file mode 100644 index 0000000..f3b9dd9 --- /dev/null +++ b/server/cli/index.route.js @@ -0,0 +1,10 @@ +const express = require('express'); +const cars = require('./cars.route'); +const accounts = require('./accounts.route'); + +const router = express.Router(); + +router.use('/cars', cars); +router.use('/accounts', accounts); + +module.exports = router; \ No newline at end of file