moved item status update upon shipment arrival to database trigger fu…

…nction
dvalnn · May 12, 2024 · 85827e5 · 85827e5
1 parent af52685
commit 85827e5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 46 deletions.
diff --git a/...893e77b7acdf278ef6259d2fec6185ba9eec.json → ...5f8c41a671bd5499d79efd24e99fdefc3fd5.json b/...893e77b7acdf278ef6259d2fec6185ba9eec.json → ...5f8c41a671bd5499d79efd24e99fdefc3fd5.json
diff --git a/.sqlx/query-f3407da68295e9fcca1d8e0bf39314eee04edebd5a09c2b799cf02e8df247897.json b/.sqlx/query-f3407da68295e9fcca1d8e0bf39314eee04edebd5a09c2b799cf02e8df247897.json
diff --git a/migrations/012_shipments.sql b/migrations/012_shipments.sql
@@ -6,3 +6,38 @@ CREATE TABLE IF NOT EXISTS shipments (
   quantity int NOT NULL,
   cost money NOT NULL
 );
+
+CREATE FUNCTION shipment_arrived() RETURNS TRIGGER AS $$
+    BEGIN
+        WITH item_prices AS (
+        SELECT unit_price
+        FROM suppliers
+        JOIN shipments AS sh
+            ON sh.supplier_id = suppliers.id WHERE sh.id = NEW.id
+        )
+        UPDATE
+            items
+        SET
+            status = 'in_stock',
+            warehouse = 'W1',
+            acc_cost = (SELECT unit_price FROM item_prices)
+        WHERE id IN
+        (
+            SELECT items.id
+            FROM items
+            JOIN raw_material_shipments AS rs
+                ON rs.raw_material_id = items.id
+            JOIN shipments AS s
+                ON rs.shipment_id = s.id
+            WHERE s.id = NEW.id
+        );
+
+    RAISE NOTICE 'Shipment % arrived', NEW.id;
+    RETURN NEW;
+    END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER shipment_arrived_trigger
+AFTER UPDATE OF arrival_date ON shipments
+FOR EACH ROW
+EXECUTE FUNCTION shipment_arrived();
diff --git a/src/db_api/shipments.rs b/src/db_api/shipments.rs
@@ -43,36 +43,6 @@ impl Shipment {
     }
 
     pub async fn arrived(id: i64, date: i32, con: &PgPool) -> sqlx::Result<()> {
-        sqlx::query!(
-            r#"
-            WITH item_prices AS (
-            SELECT unit_price
-            FROM suppliers
-            JOIN shipments AS sh
-                ON sh.supplier_id = suppliers.id WHERE sh.id = $1
-            )
-            UPDATE
-                items
-            SET
-                status = 'in_stock',
-                warehouse = 'W1',
-                acc_cost = (SELECT unit_price FROM item_prices)
-            WHERE id IN
-            (
-                SELECT items.id
-                FROM items
-                JOIN raw_material_shipments AS rs
-                    ON rs.raw_material_id = items.id
-                JOIN shipments AS s
-                    ON rs.shipment_id = s.id
-                WHERE s.id = $1
-            )
-            "#,
-            id,
-        )
-        .execute(con)
-        .await?;
-
         sqlx::query!(
             r#"
             UPDATE shipments
@@ -102,6 +72,7 @@ impl Shipment {
             FROM shipments AS ship
             JOIN suppliers AS sup ON ship.supplier_id = sup.id
             WHERE request_date + delivery_time = $1
+              AND arrival_date IS NULL
             "#,
             date
         )