Merge pull request #688 from boxwise/update-annual-report-query

update annual report query

Author: HaGuesto

db/queries/annual_report.sql

@@ -135,7 +135,11 @@ BoxHistory AS (
         h.id AS id
     FROM history h
     JOIN ValidBoxes s ON h.record_id = s.id
-    AND ((h.to_int IS NOT null AND h.id >= 1324559) OR h.changes = "Record created")
+    AND ((h.to_int IS NOT null AND h.id >= 1324559)
+         OR h.changes = "Record created"
+         OR h.changes = "Record deleted"
+         OR h.changes = "Box was undeleted."
+        )
     AND h.tablename = 'stock'
     ORDER BY record_id, changedate DESC, id DESC
 ),
@@ -262,6 +266,30 @@ BoxStateChangeVersions AS (
     FROM HistoryReconstruction h
     WHERE h.changes = 'box_state_id'
 ),
+DeletedBoxes AS (
+    SELECT
+        h.box_id,
+        h.box_state_id,
+        date(h.changedate) as moved_on,
+        h.items AS number_of_items,
+        h.location_id,
+        h.product_id AS product,
+        h.size_id
+    FROM HistoryReconstruction h
+    WHERE h.changes = 'Record deleted'
+),
+UndeletedBoxes AS (
+    SELECT
+        h.box_id,
+        h.box_state_id,
+        date(h.changedate) as moved_on,
+        h.items AS number_of_items,
+        h.location_id,
+        h.product_id AS product,
+        h.size_id
+    FROM HistoryReconstruction h
+    WHERE h.changes = 'Box was undeleted.'
+),
 CreatedDonatedBoxes AS (
     SELECT
         h.box_id,
@@ -277,8 +305,58 @@ CreatedDonatedBoxes AS (
 
 -- MAIN QUERY
 
--- Collect information about boxes created in donated state
+-- Collect information about deleted/undeleted boxes. Stats are labeled as "Deleted",
+-- with deleted boxes/items containing positive, and undeleted ones counting negative.
+select
+    t.moved_on,
+    p.category_id,
+    TRIM(LOWER(p.name)) AS product_name,
+    p.gender_id AS gender,
+    t.size_id,
+    GROUP_CONCAT(DISTINCT tr.tag_id) AS tag_ids,
+    "Deleted" AS target_id,
+    "BoxState" AS target_type,
+    c.id as base_id,
+    c.name as base_name,
+    o.label as org_name,
+    count(t.box_id) AS boxes_count,
+    sum(t.number_of_items) AS items_count
+FROM DeletedBoxes t
+JOIN products p ON p.id = t.product
+JOIN locations loc ON loc.id = t.location_id
+JOIN camps c ON c.id = loc.camp_id
+JOIN organisations o ON o.id = c.organisation_id
+LEFT OUTER JOIN tags_relations tr ON tr.object_id = t.box_id AND tr.object_type = "Stock" AND tr.deleted_on IS NULL
+GROUP BY moved_on, p.category_id, p.name, p.gender_id, t.size_id, loc.label, c.id, c.name, o.label
+
+UNION ALL
+
 select
+    t.moved_on,
+    p.category_id,
+    TRIM(LOWER(p.name)) AS product_name,
+    p.gender_id AS gender,
+    t.size_id,
+    GROUP_CONCAT(DISTINCT tr.tag_id) AS tag_ids,
+    "Deleted" AS target_id,
+    "BoxState" AS target_type,
+    c.id as base_id,
+    c.name as base_name,
+    o.label as org_name,
+    -count(t.box_id) AS boxes_count,
+    -sum(t.number_of_items) AS items_count
+FROM UndeletedBoxes t
+JOIN products p ON p.id = t.product
+JOIN locations loc ON loc.id = t.location_id
+JOIN camps c ON c.id = loc.camp_id
+JOIN organisations o ON o.id = c.organisation_id
+LEFT OUTER JOIN tags_relations tr ON tr.object_id = t.box_id AND tr.object_type = "Stock" AND tr.deleted_on IS NULL
+GROUP BY moved_on, p.category_id, p.name, p.gender_id, t.size_id, loc.label, c.id, c.name, o.label
+
+UNION ALL
+
+-- Collect information about boxes created in donated state
+SELECT
     t.moved_on,
     p.category_id,
     TRIM(LOWER(p.name)) AS product_name,
@@ -303,7 +381,7 @@ GROUP BY moved_on, p.category_id, p.name, p.gender_id, t.size_id, loc.label, c.i
 UNION ALL
 
 -- Collect information about boxes being moved between states InStock and Donated
-select
+SELECT
     t.moved_on,
     p.category_id,
     TRIM(LOWER(p.name)) AS product_name,
@@ -407,3 +485,4 @@ JOIN camps c ON c.id = loc.camp_id
 JOIN organisations o ON o.id = c.organisation_id
 LEFT OUTER JOIN tags_relations tr ON tr.object_id = b.id AND tr.object_type = "Stock" AND tr.deleted_on IS NULL
 GROUP BY moved_on, p.category_id, p.name, p.gender_id, b.size_id, bs.label, c.id, c.name, o.label
+;