Merge pull request #140 from OpenSourcePolitics/feat/0.31/v1/proposals

feat(proposals): prepare models for 0.31 migration

Author: hellpe

projects/demo/models/intermediate/proposals/int_proposals.sql

@@ -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

projects/demo/models/intermediate/proposals/schema.yml

@@ -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'}

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

@@ -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,
@@ -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)
 )
 

projects/demo/models/staging/decidim/proposals/stg_decidim_proposals.sql

@@ -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,