From 4a04a81241acdf7bc45bc8ab56b4a6ef42203348 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Thu, 12 Nov 2020 00:05:11 -0500 Subject: [PATCH] get the baseline route pulling the sql from a simple curl for testing --- curl | 1 + index.js | 546 ++------------------------------------------ sample_request.json | 28 +++ 3 files changed, 43 insertions(+), 532 deletions(-) create mode 100755 curl create mode 100644 sample_request.json diff --git a/curl b/curl new file mode 100755 index 0000000..6e84279 --- /dev/null +++ b/curl @@ -0,0 +1 @@ +curl -H Content-Type: application/json -X GET -d@./sample_request.json https://192.168.1.110:8082/baseline --insecure diff --git a/index.js b/index.js index 0f547a2..4efacbf 100644 --- a/index.js +++ b/index.js @@ -47,42 +47,10 @@ Postgres.FirstRow = function(inSQL, args, inResponse) { server.get('/', (req, res) => res.send('node.js express is up and running')) -server.get('/login', (req, res) => res.sendFile(process.env.wd + 'msauth.html')) - -server.get('/logs', (req, res) => res.sendFile(process.env.wd + 'changes.log')) - -server.get('/pgbadger', (req, res) => res.sendFile(process.env.wd + 'logs.html')) - -server.get('/totals', (req, res) => res.sendFile(process.env.wd + 'totals.log')) - -server.get('/test_sql', function(req, res) { - var path = './route_meta/scenario_package.sql' - var callback = function(arg) { - res.send(arg) - }; - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - callback(err); - } - }); -}); - -server.get('/get_pool', bodyParser.json(), function(req, res) { +server.get('/baseline', bodyParser.json(), function(req, res) { var sql = ""; - var args = [req.body.quota_rep]; - var path = './route_sql/get_pool.sql'; - var callback = function(arg) { - sql = arg; - console.log(new Date().toISOString() + "-------------------------get pool:----------------------------"); - console.log(req.body.quota_rep); - sql = sql.replace("rep_replace", req.body.quota_rep); - console.log(sql); - Postgres.FirstRow(sql, [], res) - }; + var path = './route_sql/baseline.sql'; fs.readFile(path, 'utf8', function(err, data) { if (!err) { @@ -93,6 +61,17 @@ server.get('/get_pool', bodyParser.json(), function(req, res) { } }); + var callback = function(arg) { + sql = arg; + + console.log(new Date().toISOString() + "-------------------------get scenario:------------------------------") + console.log(req.body); + //parse the where clause into the main sql statement + //sql = sql.replace(new RegExp("where_clause", 'g'), w) + //execute the sql and send the result + console.log(sql); + //Postgres.FirstRow(sql, [], res) + }; }) server.get('/scenario_package', bodyParser.json(), function(req, res) { @@ -134,503 +113,6 @@ server.get('/scenario_package', bodyParser.json(), function(req, res) { }; }) -server.get('/swap_fit', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/swap_fit.sql'; - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); - - var callback = function(arg) { - sql = arg; - - //parse request body into a where clause - ({ c, w, d } = build_where(req, c, w, d, args)); - - //if there was no body sent, return with nothing - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "-------------------------get swap fit:------------------------------") - console.log(req.body); - //parse the where clause into the main sql statement - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("replace_new_mold", 'g'), req.body.new_mold); - //execute the sql and send the result - console.log(sql); - Postgres.FirstRow(sql, [], res) - }; -}) - -server.post('/swap', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/swap_post.sql'; - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); - - var callback = function(arg) { - sql = arg; - - //parse request body into a where clause - ({ c, w, d } = build_where(req, c, w, d, args)); - - //if there was no body sent, return with nothing - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "-------------------------get swap fit:------------------------------") - console.log(req.body); - //parse the where clause into the main sql statement - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("swap_doc", 'g'), JSON.stringify(req.body.swap)); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - //execute the sql and send the result - console.log(sql); - Postgres.FirstRow(sql, [], res) - }; -}) - -server.post('/cust_swap', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/swap_cust.sql'; - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); - - var callback = function(arg) { - sql = arg; - - //parse request body into a where clause - ({ c, w, d } = build_where(req, c, w, d, args)); - - //if there was no body sent, return with nothing - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "-------------------------get swap fit:------------------------------") - console.log(req.body); - //parse the where clause into the main sql statement - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("swap_doc", 'g'), JSON.stringify(req.body.swap)); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - //execute the sql and send the result - console.log(sql); - res.json(null); - //Postgres.FirstRow(sql, [], res) - }; -}) - -server.get('/list_changes', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/list_changes.sql'; - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); - - var callback = function(arg) { - sql = arg; - - //parse request body into a where clause - ({ c, w, d } = build_where(req, c, w, d, args)); - - - //if there was no body sent, return with nothing - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "-------------------------list changes:------------------------------") - console.log(req.body); - //parse the where clause into the main sql statement - sql = sql.replace(new RegExp("where_clause", 'g'), w) - //execute the sql and send the result - console.log(sql); - Postgres.FirstRow(sql, [], res) - }; -}) - -server.get('/undo_change', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/undo.sql'; - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); - - var callback = function(arg) { - sql = arg; - - console.log(new Date().toISOString() + "-------------------------undo change:------------------------------") - console.log(req.body); - //parse the where clause into the main sql statement - sql = sql.replace(new RegExp("replace_id", 'g'), JSON.stringify(req.body.logid)) - //execute the sql and send the result - console.log(sql); - Postgres.FirstRow(sql, [], res) - }; -}) - -//deprecating this route, just use _vp for volume and prive -/* -server.post('/addmonth_v', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; //counts iterations through each scaenario key - var d = 1; //counts cycles in scenario key values which are arrays - var args = []; - var path = './route_sql/addmonth_vd.sql'; - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); - - var callback = function(arg) { - sql = arg; - //buile where clause expression - ({ c, w, d } = build_where(req, c, w, d, args)); - - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "-----------------------------add month volume:---------------------------------"); - req.body.stamp = new Date().toISOString() - console.log(req.body); - //console.log(args); - sql = sql.replace(new RegExp("scenario = target_scenario", 'g'), w); - sql = sql.replace(new RegExp("target_increment", 'g'), req.body.qty); - sql = sql.replace(new RegExp("target_month", 'g'), req.body.month); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - console.log(sql) - Postgres.FirstRow(sql, [], res) - } -}) -*/ - -server.post('/addmonth_vp', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/addmonth_vupd.sql'; - - var callback = function(arg) { - sql = arg; - - ({ c, w, d } = build_where(req, c, w, d, args)); - - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "------------------add month volume and price:-------------------"); - req.body.stamp = new Date().toISOString() - console.log(req.body); - //console.log(args); - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("target_volume", 'g'), req.body.qty); - sql = sql.replace(new RegExp("target_price", 'g'), req.body.amount); - sql = sql.replace(new RegExp("target_month", 'g'), req.body.month); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - console.log(sql); - Postgres.FirstRow(sql, [], res) - } - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); -}) - -server.post('/scale_v', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/scale_vd.sql'; - - var callback = function(arg) { - sql = arg; - - ({ c, w, d } = build_where(req, c, w, d, args)); - - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "-----------------------scale volume:------------------------------"); - req.body.stamp = new Date().toISOString() - console.log(req.body); - //console.log(args); - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("incr_qty", 'g'), req.body.qty); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - console.log(sql); - Postgres.FirstRow(sql, [], res) - } - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); -}) - -server.post('/scale_p', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/scale_pd.sql'; - - var callback = function(arg) { - sql = arg; - - ({ c, w, d } = build_where(req, c, w, d, args)); - - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "--------------------scale price:-------------------"); - req.body.stamp = new Date().toISOString() - console.log(req.body); - //console.log(args); - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("target_increment", 'g'), req.body.amount); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - console.log(sql); - Postgres.FirstRow(sql, [], res) - } - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); -}) - -server.post('/scale_vp', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/scale_vupd.sql'; - - var callback = function(arg) { - sql = arg; - - ({ c, w, d } = build_where(req, c, w, d, args)); - - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "--------------------scale volume & price:-------------------"); - req.body.stamp = new Date().toISOString() - console.log(req.body); - //console.log(args); - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty); - sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - console.log(sql); - Postgres.FirstRow(sql, [], res) - } - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); -}) - -server.post('/new_part', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/new_part.sql'; - - var callback = function(arg) { - sql = arg; - - ({ c, w, d } = build_where(req, c, w, d, args)); - - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "--------------------new part:-------------------"); - req.body.stamp = new Date().toISOString() - console.log(req.body); - //console.log(args); - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty); - sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount); - sql = sql.replace(new RegExp("replace_request", 'g'), JSON.stringify(req.body)); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - console.log(sql); - Postgres.FirstRow(sql, [], res) - } - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); -}) - -server.post('/new_basket', bodyParser.json(), function(req, res) { - - var sql = ""; - var w = ""; - var c = 1; - var d = 1; - var args = []; - var path = './route_sql/new_basket.sql'; - - var callback = function(arg) { - sql = arg; - req.body.scenario.iter.push("adj volume"); //intercept the request body and force in a "adj volume" at position 1, only a "copy" iteration is being used - - ({ c, w, d } = build_where(req, c, w, d, args)); - - if (c == 1) { - res.send("no body was sent"); - return; - } - console.log(new Date().toISOString() + "--------------------new basket:-------------------"); - req.body.stamp = new Date().toISOString() - console.log(req.body); - //console.log(args); - sql = sql.replace(new RegExp("where_clause", 'g'), w); - sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty); - sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount); - sql = sql.replace(new RegExp("replace_request", 'g'), JSON.stringify(req.body)); - sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version); - sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source); - sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body)); - console.log(sql); - Postgres.FirstRow(sql, [], res) - } - - fs.readFile(path, 'utf8', function(err, data) { - if (!err) { - callback(data); - } else { - console.log("fatal error pulling sql file") - callback(err); - } - }); -}) - function build_where(req, c, w, d, args) { for (var i in req.body.scenario) { //console.log(i); @@ -659,4 +141,4 @@ function build_where(req, c, w, d, args) { c = c + 1; }; return { c, w, d }; -} \ No newline at end of file +} diff --git a/sample_request.json b/sample_request.json new file mode 100644 index 0000000..61ee6ed --- /dev/null +++ b/sample_request.json @@ -0,0 +1,28 @@ +{ + "scenario": { + "quota_rep_descr": "TINA PETTIGREW", + "substance": "Plastic", + "chan": "DIR", + "billto_group": "H&A MASTRONARDI", + "shipto_group": "H&A MASTRONARDI", + "majg_descr": "110 - INJECTION", + "part_descr": "HWA13000E21B025LZBLD - 13.00 WRAPT HP CHOCOLATE", + "version": "b21", + "iter": [ + "copy", + "adj volume", + "adj price", + "upload volume", + "upload price" + ] + }, + "stamp": "2020-02-19 17:03:38", + "user": "Trowbridge, Paul", + "source": "adj", + "message": "2% on volume and price", + "tag": "standard price", + "version": "b21", + "type": "scale_vp", + "qty": 453.60, + "amount": 728.43624 +} \ No newline at end of file