diff --git a/index.js b/index.js index 1f617ee..d4bb9b0 100644 --- a/index.js +++ b/index.js @@ -80,6 +80,7 @@ server.get('/get_pool', bodyParser.json(), function(req, res) { 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) }; @@ -164,6 +165,37 @@ server.get('/list_changes', bodyParser.json(), function(req, 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) + }; +}) + server.post('/addmonth_v', bodyParser.json(), function(req, res) { var sql = ""; diff --git a/route_sql/get_pool.sql b/route_sql/get_pool.sql index 3c9506b..0e68159 100644 --- a/route_sql/get_pool.sql +++ b/route_sql/get_pool.sql @@ -29,14 +29,17 @@ SELECT ,request_season ,request_month ,promo - ,version - ,iter --------values------------------------- ,sum(value_loc) value_loc ,sum(value_usd) value_usd ,sum(cost_loc) cost_loc ,sum(cost_usd) cost_usd ,sum(units) units + ,version + ,iter + ,logid + ,comment + ,module FROM rlarp.osm_pool WHERE @@ -73,6 +76,9 @@ GROUP BY ,promo ,version ,iter + ,logid + ,comment + ,module ) SELECT json_agg(row_to_json(rows)) x diff --git a/route_sql/undo.sql b/route_sql/undo.sql new file mode 100644 index 0000000..2c2b100 --- /dev/null +++ b/route_sql/undo.sql @@ -0,0 +1,5 @@ +WITH +d AS ( +DELETE FROM rlarp.osm_log WHERE id = replace_id RETURNING id +) +SELECT json_agg(row_to_json(d)) x from d \ No newline at end of file