alex

nodejs-helloworld/package.json

@@ -3,9 +3,12 @@
   "version": "1.0.0",
   "description": "Hello World!",
   "main": "app.js",
+  "scripts": {
+    "start": "node app.js"
+  },
   "author": "Red Hat Training",
   "license": "ASL",
   "dependencies": {
-    "express": "~4.14.2"
+    "express": "^4.18.2"
   }
 }

todoapp/nodejs_api/README.md

@@ -1,18 +1,2 @@
-# DO276 JavaScript/Node.js To Do List App
-
-Based on Restify 4.0 and Sequelize 3.14. Tested on Node.js 0.10 from SCL with Mariadb 5.5.
-
-Do `npm install` do download dependencies.
-
-Run as `node app.js`
-
-* Don't do pagination yet.
-
-* Database connection parameters hardcoded (as a novice developer would usually do).
-
-* There is a lot of boiler plate code in the controller and the model. There should be a way to have more centralized error handling.
-
-* Have mysql database initialized and running, and front end deployed to apache and running
-
-* Access as http://localhost:30000/todo
-
+# TodoApp OpenShift
+Aplicación TodoApp con Node.js y MySQL lista para desplegar en OpenShift.

todoapp/nodejs_api/app.js

@@ -1,35 +1,21 @@
-var restify = require('restify');
+const express = require('express');
+const bodyParser = require('body-parser');
+const app = express();
+const db = require('./models/db');
+const itemsController = require('./controllers/items');
+const serverInfoController = require('./controllers/serverinfo');
 
-var controller = require('./controllers/items');
-var serverinfo = require('./controllers/serverinfo');
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: true }));
 
-var db = require('./models/db');
-var model = require('./models/items');
+itemsController(app);
+serverInfoController(app);
 
-model.connect(db.params, function(err) {
-    if (err) throw err;
+const port = process.env.PORT || 8080;
+db.sequelize.sync().then(() => {
+  app.listen(port, () => {
+    console.log(`TodoApp listening on port ${port}`);
+  });
+}).catch(err => {
+  console.error('Database sync failed:', err);
 });
-
-var server = restify.createServer() 
-    .use(restify.fullResponse())
-    .use(restify.queryParser())
-    .use(restify.bodyParser())
-    .use(restify.CORS());
-
-controller.context(server, '/todo/api', model); 
-serverinfo.context(server, '/todo/api'); 
-
-var port = process.env.PORT || 30080;
-server.listen(port, function (err) {
-    if (err)
-        console.error(err);
-    else
-        console.log('App is ready at : ' + port);
-});
-
-if (process.env.environment == 'production')
-    process.on('uncaughtException', function (err) {
-        console.error(JSON.parse(JSON.stringify(err, ['stack', 'message', 'inner'], 2)))
-    });
-
-

todoapp/nodejs_api/compile.sh

@@ -1,6 +1,2 @@
 #!/bin/bash
-
-source /opt/rh/nodejs010/enable
-
 npm install
-

todoapp/nodejs_api/controllers/items.js

@@ -1,118 +1,19 @@
-
-var model = undefined;
-
-exports.context = function(server, path, itemsModel) {
-    if (!server)
-        done('has to provide a restify server object');
-
-    var context = "/items";
-    if (path)
-        context = path + context;
-
-    server.get(context + '/', this.list);
-    server.get(context + '/:id', this.read);
-    server.post(context + '/', this.save);
-    server.del(context + '/:id', this.destroy);
-
-    model = itemsModel;
-};
-
-exports.list = function(req, res, next) {
-    var page_no = req.query.page || 1;
-    var sortField = req.query.sortFields || "id";
-    var sortDirection = req.query.sortDirections || "asc";
-
-    model.listAll(page_no, sortField, sortDirection, function(err, items) {
-        if (err) {
-            next(err);
-        }
-        else {
-            if (items) {
-                model.countAll(function(err, n) {
-                    if (err) {
-                        next(err);
-                    }
-                    else {
-                        if (n) {
-                            var page = { 
-                                "currentPage" : page_no,
-                                "list" : items,
-                                "pageSize" : 10,
-                                "sortDirections" : sortDirection,
-                                "sortFields" : sortField,
-                                "totalResults" : n
-                            };
-                            res.json(page);
-                            next();
-                        }
-                        else {
-                            next(new Error("Can't count items"));
-                        }
-                    }
-                });
-            }
-            else {
-                next(new Error("Can't retrieve items"));
-            }
-        }
-    })
-};
-
-exports.read = function(req, res, next) {
-    var key = req.params.id;
-    model.read(key, function(err, item) {
-        if (err) {
-            next(err);
-        }
-        else {
-            if (item) {
-                res.json(item);
-                next();
-            }
-            else {
-                next(new Error("Can't retrieve items"));
-            }
-        }
-    })
-};
-
-
-exports.save = function(req, res, next) {
-    if (req.params.id) {
-        model.update(req.params.id, req.params.description, req.params.done, function(err, item) {
-            if (err) {
-                next(err);
-            }
-            else {
-                res.json(item);
-                next();
-            }
-        });
-    }
-    else {
-        model.create(req.params.description, req.params.done, function(err, item) {
-            if (err) {
-                next(err);
-            }
-            else {
-                res.json(item);
-                next();
-            }
-        });
-    }
+module.exports = function(app) {
+  const db = require('../models/db');
+  const Item = db.Item;
+
+  app.get('/items', async (req, res) => {
+    const items = await Item.findAll();
+    res.json(items);
+  });
+
+  app.post('/items', async (req, res) => {
+    const newItem = await Item.create(req.body);
+    res.json(newItem);
+  });
+
+  app.delete('/items/:id', async (req, res) => {
+    await Item.destroy({ where: { id: req.params.id }});
+    res.json({ message: 'Item deleted' });
+  });
 };
-
-
-exports.destroy = function(req, res, next) {
-    if (req.params.id) {
-        model.destroy(req.params.id, function(err, item) {
-            if (err) {
-                next(err);
-            }
-            else {
-                //XXX jee_api does NOT return item on delete
-                res.json(item);
-            }
-        });
-    }
-}

todoapp/nodejs_api/controllers/serverinfo.js

@@ -1,29 +1,9 @@
-var os = require('os');
-
-exports.context = function(server, path) {
-    if (!server)
-        done('has to provide a restify server object');
-
-    server.get(path + '/host', this.serverInfo);
+module.exports = function(app) {
+  app.get('/info', (req, res) => {
+    res.json({
+      uptime: process.uptime(),
+      message: 'OK',
+      timestamp: Date.now()
+    });
+  });
 };
-
-exports.serverInfo = function(req, res, next) {
-    var address;
-    var ifaces = os.networkInterfaces();
-
-    for (var dev in ifaces) {
-        var iface = ifaces[dev].filter(function(details) {
-            return details.family === 'IPv4' && details.internal === false;
-        });
-        if (iface.length > 0)
-            address = iface[0].address;
-    }
-
-    var reply = {
-        ip: address,
-        hostname: os.hostname()
-    };
-    res.json(reply);
-    next();
-};
-

todoapp/nodejs_api/models/db.js

@@ -1,12 +1,25 @@
+const { Sequelize, DataTypes } = require('sequelize');
 
-module.exports.params = {
-    dbname: process.env.MYSQL_ENV_MYSQL_DATABASE,
-    username: process.env.MYSQL_ENV_MYSQL_USER,
-    password: process.env.MYSQL_ENV_MYSQL_PASSWORD,
-    params: {
-        host: "mysql",
-        port: "3306",
-        dialect: 'mysql'
-    }
-};
+const sequelize = new Sequelize(
+  process.env.DB_NAME || 'todoapp',
+  process.env.DB_USER || 'root',
+  process.env.DB_PASSWORD || 'password',
+  {
+    host: process.env.DB_HOST || 'localhost',
+    port: process.env.DB_PORT || 3306,
+    dialect: 'mysql'
+  }
+);
 
+const Item = sequelize.define('Item', {
+  description: {
+    type: DataTypes.STRING,
+    allowNull: false
+  },
+  done: {
+    type: DataTypes.BOOLEAN,
+    defaultValue: false
+  }
+});
+
+module.exports = { sequelize, Item };