Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions projects/demo/models/intermediate/proposals/int_proposals.sql
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ SELECT
decidim_proposals.decidim_scope_id,
decidim_proposals.created_at,
decidim_proposals.published_at,
decidim_proposals.withdrawn_at,
decidim_proposals.deleted_at,
{{ int_proposals_translate_default_state('decidim_proposals.state') }} AS state,
{{ int_proposals_translate_proposal_state('decidim_proposals.state') }} AS translated_state,
decidim_proposals.decidim_proposals_proposal_state_id,
decidim_proposals.comments_count,
decidim_proposals.endorsements_count,
decidim_proposals.follows_count,
{{ int_proposals_macro_address('decidim_proposals.address') }} AS address
FROM {{ ref ("stg_decidim_proposals")}} AS decidim_proposals
WHERE published_at IS NOT NULL
FROM {{ ref ("stg_decidim_proposals")}} AS decidim_proposals
17 changes: 1 addition & 16 deletions projects/demo/models/intermediate/proposals/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,4 @@ unit_tests:
format: dict
rows:
- {id: 1, address: 'Pas d''adresse'}
- {id: 2, address: '1 Place Hannah Arendt'}
- name: test_published_at_not_null
description: "Test that only rows with non-null published_at are included"
model: int_proposals
given:
- input: ref('stg_decidim_proposals')
format: dict
rows:
- {id: 1, published_at: '2023-01-01'}
- {id: 2, published_at: NULL}
- {id: 3, published_at: '2023-02-01'}
expect:
format: dict
rows:
- {id: 1, published_at: '2023-01-01'}
- {id: 3, published_at: '2023-02-01'}
- {id: 2, address: '1 Place Hannah Arendt'}
2 changes: 2 additions & 0 deletions projects/demo/models/marts/proposals/all_proposals.sql
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ proposals AS (
decidim_proposals.decidim_component_id,
decidim_proposals.created_at,
decidim_proposals.published_at,
decidim_proposals.withdrawn_at,
decidim_proposals.state,
COALESCE(decidim_proposals_proposal_states.title, decidim_proposals.translated_state) AS translated_state,
coauthorships.authors_ids,
Expand Down Expand Up @@ -74,6 +75,7 @@ proposals AS (
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
WHERE decidim_moderations.hidden_at IS NULL
AND decidim_proposals.published_at IS NOT NULL
AND decidim_proposals.deleted_at IS NULL
-- AND (decidim_proposals.state NOT LIKE '%withdrawn' OR decidim_proposals.state IS NULL)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ SELECT
created_at,
published_at,
{{ get_column_if_exists(source('decidim', 'decidim_proposals_proposals'), 'withdrawn_at', 'TIMESTAMP') }},
{{ get_column_if_exists(source('decidim', 'decidim_proposals_proposals'), 'valuation_assignments_count', 'INTEGER') }},
{{ get_column_if_exists(source('decidim', 'decidim_proposals_proposals'), 'deleted_at', 'TIMESTAMP') }},
{{ coalesce_legacy_and_new_columns(source('decidim', 'decidim_proposals_proposals'), 'valuation_assignments_count', 'evaluation_assignments_count') }},
{{ stg_proposals_get_state(source('decidim', 'decidim_proposals_proposals')) }} AS state,
{{ get_column_if_exists(source('decidim', 'decidim_proposals_proposals'), 'decidim_proposals_proposal_state_id', 'INTEGER') }},
comments_count,
Expand Down
Loading