diff --git a/forecast_api.service b/forecast_api.service index 8866312..387fb00 100644 --- a/forecast_api.service +++ b/forecast_api.service @@ -7,7 +7,7 @@ ExecStart=/usr/bin/node //opt/forecast_api/index.js Restart=always User=fc_api Environemnt=NODE_ENV=production -WorkingDirectory=//opt/forecast_api +WorkingDirectory=//opt/forecast_api/ [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/index.js b/index.js index d88fd88..1791024 100644 --- a/index.js +++ b/index.js @@ -241,7 +241,7 @@ server.get('/list_changes', bodyParser.json(), function(req, res) { 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("replace_user", 'g'), req.body.quota_rep_descr) + sql = sql.replace(new RegExp("replace_user", 'g'), req.body.scenario.quota_rep_descr) //execute the sql and send the result console.log(sql); Postgres.FirstRow(sql, [], res) diff --git a/route_sql/addmonth_vupd.sql b/route_sql/addmonth_vupd.sql index 565b1a2..a57c206 100644 --- a/route_sql/addmonth_vupd.sql +++ b/route_sql/addmonth_vupd.sql @@ -323,14 +323,14 @@ SELECT ,b.cost_usd*s.factor*m.momix cost_usd ,b.calc_status ,b.flag - ,make_date(mseq.yr + 2021,mseq.cal,m.odom) order_date - ,od.sspr || ' - ' || to_char(make_date(mseq.yr + 2021,mseq.cal,m.odom),'Mon') order_month + ,make_date(mseq.yr + 2022,mseq.cal,m.odom) order_date + ,od.sspr || ' - ' || to_char(make_date(mseq.yr + 2022,mseq.cal,m.odom),'Mon') order_month ,od.ssyr order_season - ,make_date(mseq.yr + 2021,mseq.cal,m.odom) + rlag request_date - ,rd.sspr || ' - ' ||to_char(make_date(mseq.yr + 2021,mseq.cal,m.odom) + rlag,'Mon') request_month + ,make_date(mseq.yr + 2022,mseq.cal,m.odom) + rlag request_date + ,rd.sspr || ' - ' ||to_char(make_date(mseq.yr + 2022,mseq.cal,m.odom) + rlag,'Mon') request_month ,rd.ssyr request_season - ,make_date(mseq.yr + 2021,mseq.cal,m.odom) + rlag + slag ship_date - ,sd.sspr || ' - ' || to_char(make_date(mseq.yr + 2021,mseq.cal,m.odom) + rlag + slag,'Mon') ship_month + ,make_date(mseq.yr + 2022,mseq.cal,m.odom) + rlag + slag ship_date + ,sd.sspr || ' - ' || to_char(make_date(mseq.yr + 2022,mseq.cal,m.odom) + rlag + slag,'Mon') ship_month ,sd.ssyr ship_season ,'replace_version' "version" ,'replace_source'||' volume' iter @@ -347,11 +347,11 @@ FROM LEFT OUTER JOIN mseq ON mseq.m = closest.m LEFT OUTER JOIN gld od ON - make_date(mseq.yr + 2021,mseq.cal,m.odom) BETWEEN od.sdat AND od.edat + make_date(mseq.yr + 2022,mseq.cal,m.odom) BETWEEN od.sdat AND od.edat LEFT OUTER JOIN gld rd ON - make_date(mseq.yr + 2021,mseq.cal,m.odom) + rlag BETWEEN rd.sdat AND rd.edat + make_date(mseq.yr + 2022,mseq.cal,m.odom) + rlag BETWEEN rd.sdat AND rd.edat LEFT OUTER JOIN gld sd ON - make_date(mseq.yr + 2021,mseq.cal,m.odom) + rlag + slag BETWEEN sd.sdat AND sd.edat + make_date(mseq.yr + 2022,mseq.cal,m.odom) + rlag + slag BETWEEN sd.sdat AND sd.edat WHERE m._month = (SELECT _month FROM closest) ) @@ -520,4 +520,4 @@ FROM ,tag ,comment ) -SELECT json_agg(row_to_json(insagg)) x from insagg \ No newline at end of file +SELECT json_agg(row_to_json(insagg)) x from insagg diff --git a/route_sql/adj_totals.sql b/route_sql/adj_totals.sql index c822ed6..2cdbe2b 100644 --- a/route_sql/adj_totals.sql +++ b/route_sql/adj_totals.sql @@ -19,7 +19,7 @@ FROM LEFT OUTER JOIN rlarp.osm_log ON id = logid WHERE - order_season = 2021 + order_season = 2022 GROUP BY director ,quota_rep_descr @@ -51,4 +51,4 @@ GROUP BY ) ORDER BY director - ,quota_rep_descr \ No newline at end of file + ,quota_rep_descr diff --git a/route_sql/new_basket.sql b/route_sql/new_basket.sql index 29671b0..37f1c77 100644 --- a/route_sql/new_basket.sql +++ b/route_sql/new_basket.sql @@ -250,13 +250,13 @@ SELECT ,substring(jr.part_descr,1,8) part_group ,mxm.qty*mxm.momix*jr.mix units ,mxm.amount*mxm.momix*jr.mix value_usd --assume that target dollars are USD - ,make_date(mxm.yr + 2021,mxm.cal,mxm.odom) order_date + ,make_date(mxm.yr + 2022,mxm.cal,mxm.odom) order_date ,od.sortmo order_month ,od.ssyr order_season - ,make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag request_date + ,make_date(mxm.yr + 2022,mxm.cal,mxm.odom) + rlag request_date ,rd.sortmo request_month ,rd.ssyr request_season - ,make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag + slag ship_date + ,make_date(mxm.yr + 2022,mxm.cal,mxm.odom) + rlag + slag ship_date ,sd.sortmo ship_month ,sd.ssyr ship_season ,jr.mix @@ -266,11 +266,11 @@ SELECT JOIN LATERAL json_to_record(ae.e) as jr(part_descr text, bill_cust_descr text, ship_cust_descr text, mix numeric) ON true CROSS JOIN mxm LEFT OUTER JOIN gld od ON - od.drange @> make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + od.drange @> make_date(mxm.yr + 2022,mxm.cal,mxm.odom) LEFT OUTER JOIN gld rd ON - rd.drange @> (make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag) + rd.drange @> (make_date(mxm.yr + 2022,mxm.cal,mxm.odom) + rlag) LEFT OUTER JOIN gld sd ON - sd.drange @> (make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag + slag) + sd.drange @> (make_date(mxm.yr + 2022,mxm.cal,mxm.odom) + rlag + slag) ) --SELECT * FROM basemix ,log AS ( @@ -517,4 +517,4 @@ FROM ,tag ,comment ) -SELECT json_agg(row_to_json(insagg)) x from insagg \ No newline at end of file +SELECT json_agg(row_to_json(insagg)) x from insagg diff --git a/route_sql/scale_vupd_sales.sql b/route_sql/scale_vupd_sales.sql index baf5655..1ad0b7d 100644 --- a/route_sql/scale_vupd_sales.sql +++ b/route_sql/scale_vupd_sales.sql @@ -88,7 +88,7 @@ target AS (select target_vol vincr, target_prc pincr) WHERE -----------------scenario---------------------------- where_clause - AND ship_season = 2021 + AND ship_season = 2022 -----------------additional params------------------- AND CASE (SELECT flag FROM flagv) WHEN 'scale all' THEN true