Skip to content

Commit aeef73f

Browse files
committed
fix first categoruy/subcategory columns
1 parent b0dcc7e commit aeef73f

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

projects/demo/macros/categorization_category.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'nl': "Geen categorie"
99
} %}
1010

11-
COALESCE(NULLIF({{ column_name }}, ''), '{{ translations.get(lang, "Unknown") }}') AS first_category
11+
COALESCE(NULLIF({{ column_name }}, ''), '{{ translations.get(lang, "Unknown") }}')
1212
{% endmacro %}
1313

1414
{% macro categorization_first_sub_category(column_name) %}
@@ -21,5 +21,5 @@
2121
'nl': "Geen subcategorie"
2222
} %}
2323

24-
COALESCE(NULLIF({{ column_name }}, ''), '{{ translations.get(lang, "Unknown") }}') AS first_sub_category
24+
COALESCE(NULLIF({{ column_name }}, ''), '{{ translations.get(lang, "Unknown") }}')
2525
{% endmacro %}

projects/demo/models/marts/proposals/all_proposals.sql

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ taxonomizations AS (
2020
scopes AS (
2121
{{ import_scopes_from_taxonomies('Decidim::Proposals::Proposal') }}
2222
),
23-
categories AS (
23+
categories_from_taxonomies AS (
2424
{{ import_categories_from_taxonomies('Decidim::Proposals::Proposal') }}
2525
),
2626
categorizations AS (
@@ -57,20 +57,16 @@ proposals AS (
5757
coauthorships.authors_ids,
5858
COALESCE(coauthorships.authors_ids[1], -1) AS first_author_id,
5959
decidim_proposals.address,
60-
(CASE WHEN categories.is_category
61-
THEN
62-
categories.categories
63-
ELSE
64-
categorizations.categories
65-
END) AS categories,
66-
{{ categorization_first_category('categorizations.categories[1]') }},
67-
(CASE WHEN categories.is_category
68-
THEN
69-
categories.sub_categories
70-
ELSE
71-
categorizations.sub_categories
72-
END) AS sub_categories,
73-
{{ categorization_first_sub_category('categorizations.sub_categories[1]') }},
60+
COALESCE(categories_from_taxonomies.categories, categorizations.categories) AS categories,
61+
COALESCE(
62+
{{ categorization_first_category('categories_from_taxonomies.categories[1]') }},
63+
{{ categorization_first_category('categorizations.categories[1]') }}
64+
) AS first_category,
65+
COALESCE(categories_from_taxonomies.sub_categories, categorizations.sub_categories) AS sub_categories,
66+
COALESCE(
67+
{{ categorization_first_sub_category('categories_from_taxonomies.sub_categories[1]') }},
68+
{{ categorization_first_sub_category('categorizations.sub_categories[1]') }}
69+
) AS first_sub_category,
7470
taxonomizations.taxonomies,
7571
{{ taxonomization_first_taxonomy('taxonomizations.taxonomies[1]') }},
7672
taxonomizations.sub_taxonomies,
@@ -92,7 +88,7 @@ proposals AS (
9288
LEFT JOIN votes ON decidim_proposals.id = votes.decidim_proposal_id
9389
LEFT JOIN taxonomizations on taxonomizations.taxonomizable_id = decidim_proposals.id
9490
LEFT JOIN scopes on scopes.taxonomizable_id = decidim_proposals.id
95-
LEFT JOIN categories on categories.taxonomizable_id = decidim_proposals.id
91+
LEFT JOIN categories_from_taxonomies on categories_from_taxonomies.taxonomizable_id = decidim_proposals.id
9692
LEFT JOIN categorizations ON categorizations.categorizable_id = decidim_proposals.id
9793
LEFT JOIN {{ ref("int_scopes")}} AS decidim_scopes ON decidim_scopes.id = decidim_proposals.decidim_scope_id
9894
LEFT JOIN {{ ref("stg_decidim_proposals_custom_states")}} AS decidim_proposals_proposal_states ON decidim_proposals_proposal_states.id = decidim_proposals.decidim_proposals_proposal_state_id

0 commit comments

Comments
 (0)