hc-companies/sales_walk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get v2 working

Browse Source
This commit is contained in:
Paul Trowbridge 2023-10-18 15:00:33 -04:00
parent 19592685d3
commit 26ad456d52
6 changed files with 116 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api.ts
View File

@ -28,11 +28,13 @@ await client.connect();
const query = await Deno.readTextFile("sql/write_note.sql"); const query = await Deno.readTextFile("sql/write_note.sql");
// Define a route to retrieve values from the database using parameters // Define a route to retrieve values from the database using parameters
router.get('/sales_walk/write_note/:ship_cust/:bucket/:notes', async (ctx) => { router.get('/sales_walk/write_note/:bill_cust/:ship_cust/:bucket/:attainment/:notes', async (ctx) => {
const bucket = ctx.params.bucket; // Extract the bucket parameter from the route const bucket = ctx.params.bucket; // Extract the bucket parameter from the route
const attainment= ctx.params.attainment; // Extract the bucket parameter from the route
const notes = ctx.params.notes; // Extract the bucket parameter from the route const notes = ctx.params.notes; // Extract the bucket parameter from the route
const ship_cust = ctx.params.ship_cust; // Extract the ship_cust parameter from the route const ship_cust = ctx.params.ship_cust; // Extract the ship_cust parameter from the route
const bill_cust = ctx.params.bill_cust; // Extract the ship_cust parameter from the route
//console.log(bucket) //console.log(bucket)
//console.log(ship_cust) //console.log(ship_cust)
@ -74,8 +76,8 @@ router.post('/sales_walk/flag_cust', async (ctx) => {
if (ctx.request.hasBody) { if (ctx.request.hasBody) {
const body = JSON.parse(bodyText); const body = JSON.parse(bodyText);
console.log("Body JSON:", body); console.log("Body JSON:", body);
const { ship_cust, bucket, notes } = body; // Destructure the needed values from the JSON const { bill_cust, ship_cust, bucket, attainment, notes } = body; // Destructure the needed values from the JSON
const result = await client.queryObject({args: [ship_cust, bucket, notes], text: query} ); const result = await client.queryObject({args: [bill_cust, ship_cust, bucket, attainment, notes], text: query} );
} }
} catch (error) { } catch (error) {
@ -91,6 +93,6 @@ app.use(router.routes());
app.use(router.allowedMethods()); app.use(router.allowedMethods());
// Start the server // Start the server
console.log('Server is running on http://localhost:8085'); console.log('Server is running on http://localhost:8086');
await app.listen({ port: 8085 }); await app.listen({ port: 8086 });

6
sales_walk.service → sales_walk_2.service
View File

@ -1,10 +1,10 @@
[Unit] [Unit]
Description=Deno API Sales Walk Description=Deno API Sales Walk v2
After=network.target After=network.target
[Service] [Service]
ExecStart=/home/ptrowbridge/.deno/bin/deno run --allow-all /opt/sales_bridge/api.ts ExecStart=/home/ptrowbridge/.deno/bin/deno run --allow-all /opt/sales_bridge_2/api.ts
WorkingDirectory=/opt/sales_bridge WorkingDirectory=/opt/sales_bridge_2
Restart=always Restart=always
User=ptrowbridge User=ptrowbridge

23
sql/excel_query.sql Normal file
View File

@ -0,0 +1,23 @@
SELECT
sw.bill_dba,
sw.ship_dba,
sw.dsm,
sw.budget_2024,
sw.shipments_2023,
sw.shipments_2024,
sw.open_orders_2024,
sw.quotes,
--(shipments_2024 + open_orders_2024) - shipments_2023 yoy_delta,
(shipments_2024 + open_orders_2024) - budget_2024 yoy_delta,
sw.flag,
sw.bucket,
sw.attainment,
sw.notes
FROM
rlarp.sales_walk_r1 sw
WHERE
(sw.dsm = ?)
ORDER BY
sw.shipments_2023 desc,
shipments_2024 + open_orders_2024 desc,
quotes desc

2
sql/prep_budget.sql
View File

@ -83,7 +83,7 @@ SELECT
,case when coalesce(qty,0) = 0 then 0 else pounds/qty end ,case when coalesce(qty,0) = 0 then 0 else pounds/qty end
,pallets ,pallets
,plcd ,plcd
,fs_line ,TRIM(fs_line)
,'US' ,'US'
,1 ,1
,'US' ,'US'

109
sql/schema.pg.sql
View File

@ -8,20 +8,23 @@ sales_walk_seg
CREATE TABLE IF NOT EXISTS rlarp.walk ( CREATE TABLE IF NOT EXISTS rlarp.walk_r1 (
ship_cust text PRIMARY KEY bill_cust text
,ship_cust text
,bucket text ,bucket text
,attainment numeric
,notes text ,notes text
,PRIMARY KEY (bill_cust, ship_cust)
); );
GRANT ALL ON TABLE rlarp.walk TO PUBLIC; GRANT ALL ON TABLE rlarp.walk_r1 TO PUBLIC;
DROP VIEW IF EXISTS rlarp.sales_walk; DROP VIEW IF EXISTS rlarp.sales_walk_r1_seg;
DROP VIEW IF EXISTS rlarp.sales_walk_seg; DROP VIEW IF EXISTS rlarp.sales_walk_r1;
------------------------------------------sales walk agg--------------------------------------------------- ------------------------------------------sales walk agg---------------------------------------------------
DROP MATERIALIZED VIEW IF EXISTS rlarp.sales_walk_agg ; DROP MATERIALIZED VIEW IF EXISTS rlarp.sales_walk_r1_agg ;
CREATE MATERIALIZED VIEW rlarp.sales_walk_agg AS CREATE MATERIALIZED VIEW rlarp.sales_walk_r1_agg AS
WITH WITH
act as ( act as (
SELECT SELECT
@ -69,27 +72,44 @@ GROUP BY
bill_dba bill_dba
,ship_dba ,ship_dba
,dsm ,dsm
,sum(sales_usd) ,sum(sales_usd) sales
,sum(pounds) ,sum(pounds) pounds
--string_agg(distinct mold,', ') --string_agg(distinct mold,', ')
FROM b FROM
left outer join rlarp.molds m ON rlarp.osm_stack
m.stlc = b.mold
WHERE WHERE
oseas = 2024 version = 'Budget'
AND version = 'Forecats' AND oseas = '2024'
GROUP BY GROUP BY
version, bill_dba
oseas, ,ship_dba
customer ,dsm
) )
,agg AS ( ,agg AS (
SELECT SELECT
COALESCE(act.bill_dba,TRIM(bgt.bill_dba)) bill_dba
,COALESCE(act.ship_dba,TRIM(bgt.ship_dba)) ship_dba
,COALESCE(act.dsm ,TRIM(bgt.dsm )) dsm
,SUM(COALESCE(bgt.pounds ,0)) "Budget 2024"
,SUM(COALESCE(act."Actual 2023",0)) "Actual 2023"
,SUM(COALESCE(act."Actual 2024",0)) "Actual 2024"
,SUM(COALESCE(act."Open Ord" ,0)) "Open Ord"
,SUM(COALESCE(act."Quotes" ,0)) "Quotes"
FROM
act
FULL OUTER JOIN bgt ON
TRIM(bgt.bill_dba) = act.bill_dba
AND TRIM(bgt.ship_dba) = act.ship_dba
AND TRIM(bgt.dsm ) = act.dsm
GROUP BY
COALESCE(act.bill_dba,TRIM(bgt.bill_dba))
,COALESCE(act.ship_dba,TRIM(bgt.ship_dba))
,COALESCE(act.dsm ,TRIM(bgt.dsm ))
) )
SELECT * FROM agg SELECT * FROM agg;
------------------------------------------sales walk------------------------------------------------------- ------------------------------------------sales walk-------------------------------------------------------
CREATE OR REPLACE VIEW rlarp.sales_walk AS CREATE OR REPLACE VIEW rlarp.sales_walk_r1 AS
SELECT SELECT
bill_dba bill_dba
,ship_dba ,ship_dba
@ -97,6 +117,7 @@ SELECT
--,glec --,glec
--,biggroup --,biggroup
--,priceg --,priceg
,"Budget 2024" budget_2024
,"Actual 2023" shipments_2023 ,"Actual 2023" shipments_2023
,"Actual 2024" shipments_2024 ,"Actual 2024" shipments_2024
,"Open Ord" open_orders_2024 ,"Open Ord" open_orders_2024
@ -114,28 +135,33 @@ SELECT
WHEN "Actual 2024" > 0 OR "Open Ord" > 0 THEN 'Incremental Won' WHEN "Actual 2024" > 0 OR "Open Ord" > 0 THEN 'Incremental Won'
END END
END flag END flag
,COALESCE(w.bucket,'None') bucket ,COALESCE(w.bucket,a.bucket,'None') bucket
,COALESCE(w.notes,'-') notes ,COALESCE(w.attainment,0) attainment
,COALESCE(w.notes,a.notes,'-') notes
FROM FROM
rlarp.sales_walk_agg agg rlarp.sales_walk_r1_agg agg
LEFT OUTER JOIN rlarp.walk w ON LEFT OUTER JOIN rlarp.walk a ON
a.ship_cust = agg.ship_dba
LEFT OUTER JOIN rlarp.walk_r1 w ON
w.ship_cust = agg.ship_dba w.ship_cust = agg.ship_dba
AND w.bill_cust = agg.bill_dba
WHERE WHERE
"Actual 2023" <> 0 "Budget 2024" <> 0
OR "Actual 2023" <> 0
OR ("Actual 2024") <> 0 OR ("Actual 2024") <> 0
OR ("Open Ord") <> 0 OR ("Open Ord") <> 0
OR ("Quotes") <> 0 OR ("Quotes") <> 0
ORDER BY ORDER BY
dsm dsm
,"Actual 2024" + "Actual 2023" + "Open Ord" + "Quotes" desc; ,"Budget 2024" + "Actual 2024" + "Actual 2023" + "Open Ord" + "Quotes" desc;
GRANT SELECT ON rlarp.sales_walk TO PUBLIC; GRANT SELECT ON rlarp.sales_walk_r1 TO PUBLIC;
--,biggroup --,biggroup
------------------------------------------sales walk seg agg----------------------------------------------- ------------------------------------------sales walk seg agg-----------------------------------------------
DROP MATERIALIZED VIEW IF EXISTS rlarp.sales_walk_seg_agg; DROP MATERIALIZED VIEW IF EXISTS rlarp.sales_walk_r1_seg_agg;
CREATE MATERIALIZED VIEW rlarp.sales_walk_seg_agg AS CREATE MATERIALIZED VIEW rlarp.sales_walk_r1_seg_agg AS
WITH WITH
SEG AS ( SEG AS (
SELECT SELECT
@ -171,6 +197,7 @@ SELECT
,s.segm ,s.segm
,m.biggroup ,m.biggroup
--,os.priceg --,os.priceg
,COALESCE(sum(pounds) filter (WHERE oseas = 2024 AND version = 'Budget'),0) "Budget 2024"
,COALESCE(sum(pounds) filter (WHERE sseas = 2023 AND version = 'Actual' AND SUBSTRING(smon,1,2) <= '08'),0) "Actual 2023" ,COALESCE(sum(pounds) filter (WHERE sseas = 2023 AND version = 'Actual' AND SUBSTRING(smon,1,2) <= '08'),0) "Actual 2023"
,COALESCE(sum(pounds) filter (WHERE sseas = 2024 AND version = 'Actual'),0) "Actual 2024" ,COALESCE(sum(pounds) filter (WHERE sseas = 2024 AND version = 'Actual'),0) "Actual 2024"
,COALESCE(sum(pounds) filter (WHERE version = 'Actual' AND ostatus LIKE 'Open%' AND rseas <= 2024),0) "Open Ord" ,COALESCE(sum(pounds) filter (WHERE version = 'Actual' AND ostatus LIKE 'Open%' AND rseas <= 2024),0) "Open Ord"
@ -193,6 +220,7 @@ WHERE
AND odate >= '2023-05-01'::date AND odate >= '2023-05-01'::date
) )
OR (ostatus LIKE 'Open%') OR (ostatus LIKE 'Open%')
OR (version = 'Budget')
) )
AND calc_status <> 'CANCELED' AND calc_status <> 'CANCELED'
AND substring(os.glec,1,1) <= '2' AND substring(os.glec,1,1) <= '2'
@ -211,7 +239,7 @@ GROUP BY
SELECT * FROM agg; SELECT * FROM agg;
------------------------------------------sales walk seg--------------------------------------------------- ------------------------------------------sales walk seg---------------------------------------------------
CREATE OR REPLACE VIEW rlarp.sales_walk_seg AS CREATE OR REPLACE VIEW rlarp.sales_walk_r1_seg AS
SELECT SELECT
agg.bill_dba agg.bill_dba
,agg.ship_dba ,agg.ship_dba
@ -221,10 +249,12 @@ SELECT
,agg.segm ,agg.segm
,agg.biggroup ,agg.biggroup
--,priceg --,priceg
,"Budget 2024" budget_2024
,"Actual 2023" shipments_2023 ,"Actual 2023" shipments_2023
,"Actual 2024" shipments_2024 ,"Actual 2024" shipments_2024
,"Open Ord" open_orders_2024 ,"Open Ord" open_orders_2024
,"Quotes" quotes ,"Quotes" quotes
,"Budget 2024" * COALESCE(w.attainment,0) available_to_win
,CASE WHEN "Actual 2023" > 0 ,CASE WHEN "Actual 2023" > 0
THEN CASE THEN CASE
WHEN "Actual 2024" = 0 AND "Open Ord" = 0 AND "Quotes" = 0 THEN 'No Activity' WHEN "Actual 2024" = 0 AND "Open Ord" = 0 AND "Quotes" = 0 THEN 'No Activity'
@ -238,25 +268,30 @@ SELECT
WHEN "Actual 2024" > 0 OR "Open Ord" > 0 THEN 'Incremental Won' WHEN "Actual 2024" > 0 OR "Open Ord" > 0 THEN 'Incremental Won'
END END
END flag END flag
,COALESCE(w.bucket,'None') bucket ,COALESCE(w.bucket,a.bucket,'None') bucket
,COALESCE(w.notes,'-') notes ,COALESCE(w.attainment,0) attainment
,COALESCE(w.notes,a.notes,'-') notes
,sw.flag flag_cust ,sw.flag flag_cust
FROM FROM
rlarp.sales_walk_seg_agg agg rlarp.sales_walk_r1_seg_agg agg
LEFT OUTER JOIN rlarp.walk w ON LEFT OUTER JOIN rlarp.walk a ON
a.ship_cust = agg.ship_dba
LEFT OUTER JOIN rlarp.walk_r1 w ON
w.ship_cust = agg.ship_dba w.ship_cust = agg.ship_dba
LEFT OUTER JOIN rlarp.sales_walk sw ON AND w.bill_cust = agg.bill_dba
LEFT OUTER JOIN rlarp.sales_walk_r1 sw ON
sw.bill_dba = agg.bill_dba sw.bill_dba = agg.bill_dba
AND sw.ship_dba = agg.ship_dba AND sw.ship_dba = agg.ship_dba
AND sw.dsm = agg.dsm AND sw.dsm = agg.dsm
WHERE WHERE
"Actual 2023" <> 0 "Budget 2024" <> 0
OR "Actual 2023" <> 0
OR ("Actual 2024") <> 0 OR ("Actual 2024") <> 0
OR ("Open Ord") <> 0 OR ("Open Ord") <> 0
OR ("Quotes") <> 0 OR ("Quotes") <> 0
ORDER BY ORDER BY
dsm dsm
,"Actual 2024" + "Actual 2023" + "Open Ord" + "Quotes" desc; ,"Budget 2024" + "Actual 2024" + "Actual 2023" + "Open Ord" + "Quotes" desc;
GRANT SELECT ON rlarp.sales_walk_seg TO PUBLIC; GRANT SELECT ON rlarp.sales_walk_r1_seg TO PUBLIC;
--,biggroup --,biggroup

10
sql/write_note.sql
View File

@ -1,11 +1,13 @@
MERGE INTO MERGE INTO
rlarp.walk w rlarp.walk_r1 w
USING USING
( SELECT $1 ship_cust, $2 bucket, $3 notes) as i ON ( SELECT $1 bill_cust, $2 ship_cust, $3 bucket, $4 attainment, $5 notes) as i ON
i.ship_cust = w.ship_cust i.ship_cust = w.ship_cust
AND i.bill_cust = w.bill_cust
WHEN MATCHED THEN UPDATE SET WHEN MATCHED THEN UPDATE SET
bucket = i.bucket bucket = i.bucket
,attainment = i.attainment::numeric
,notes = i.notes ,notes = i.notes
WHEN NOT MATCHED THEN WHEN NOT MATCHED THEN
INSERT (ship_cust, bucket, notes) INSERT (bill_cust, ship_cust, bucket, attainment, notes)
VALUES (i.ship_cust, i.bucket, i.notes ) VALUES (bill_cust,i.ship_cust, i.bucket, i.attainment::numeric, i.notes )