From 1018780ec69eb38e474aa859220e8d3c96a9dcac Mon Sep 17 00:00:00 2001
From: Marigold <mojmir.vinkler@gmail.com>
Date: Wed, 4 Dec 2024 10:55:01 +0100
Subject: [PATCH] :bug: fix age group condition in GHE metadata and update
 required causes in processing

---
 etl/steps/data/garden/who/2022-09-30/ghe.meta.yml | 2 +-
 etl/steps/data/garden/who/2024-07-30/ghe.meta.yml | 2 +-
 etl/steps/data/garden/who/2024-07-30/ghe.py       | 2 +-
 etl/steps/data/grapher/who/2024-07-30/ghe.py      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etl/steps/data/garden/who/2022-09-30/ghe.meta.yml b/etl/steps/data/garden/who/2022-09-30/ghe.meta.yml
index ccfd9781552..b16d1b679f1 100644
--- a/etl/steps/data/garden/who/2022-09-30/ghe.meta.yml
+++ b/etl/steps/data/garden/who/2022-09-30/ghe.meta.yml
@@ -113,7 +113,7 @@ definitions:
     Estimated number of [DALYs](#dod:dalys) from << cause.lower() >> among {definitions.sex} aged {definitions.age}, per 100,000 people.
     <%- endif -%>
   footnote: |-
-    <%- if age == "Age-standardized" -%>To allow for comparisons between countries and over time, this metric is [age-standardized](#dod:age_standardized).<%- endif -%>
+    <%- if age_group is defined and age_group == "Age-standardized" -%>To allow for comparisons between countries and over time, this metric is [age-standardized](#dod:age_standardized).<%- endif -%>
 tables:
   ghe:
     variables:
diff --git a/etl/steps/data/garden/who/2024-07-30/ghe.meta.yml b/etl/steps/data/garden/who/2024-07-30/ghe.meta.yml
index 6dd4f93a82e..b575ed71b7d 100644
--- a/etl/steps/data/garden/who/2024-07-30/ghe.meta.yml
+++ b/etl/steps/data/garden/who/2024-07-30/ghe.meta.yml
@@ -113,7 +113,7 @@ definitions:
     Estimated number of [DALYs](#dod:dalys) from << cause.lower() >> among {definitions.sex} aged {definitions.age}, per 100,000 people.
     <%- endif %>
   footnote: |-
-    <% if age_group == "Age-standardized" %>To allow for comparisons between countries and over time, this metric is [age-standardized](#dod:age_standardized).<% endif %>
+    <% if age_group is defined and age_group == "Age-standardized" %>To allow for comparisons between countries and over time, this metric is [age-standardized](#dod:age_standardized).<% endif %>
 tables:
   ghe:
     variables:
diff --git a/etl/steps/data/garden/who/2024-07-30/ghe.py b/etl/steps/data/garden/who/2024-07-30/ghe.py
index 43bb9e89d53..bf1e01984a8 100644
--- a/etl/steps/data/garden/who/2024-07-30/ghe.py
+++ b/etl/steps/data/garden/who/2024-07-30/ghe.py
@@ -77,7 +77,7 @@ def run(dest_dir: str) -> None:
     tb = rename_table_for_compatibility(tb)
 
     if SUBSET:
-        required_causes = ["Drug use disorders", "Alcohol use disorders"]
+        required_causes = ["Drug use disorders", "Alcohol use disorders", "Self-harm"]
         tb = tb[tb.cause.isin(SUBSET.split(",") + required_causes)]
 
     # Load countries regions
diff --git a/etl/steps/data/grapher/who/2024-07-30/ghe.py b/etl/steps/data/grapher/who/2024-07-30/ghe.py
index 1c5b6eaa58c..a4fba2838fc 100644
--- a/etl/steps/data/grapher/who/2024-07-30/ghe.py
+++ b/etl/steps/data/grapher/who/2024-07-30/ghe.py
@@ -20,8 +20,8 @@ def run(dest_dir: str) -> None:
     # Save outputs.
     #
     tables = [
-        tb_garden,
         tb_garden_ratio,
+        tb_garden,
     ]
 
     # Create a new grapher dataset with the same metadata as the garden dataset.