Merge pull request #739 from MTES-MCT/feat-conso-aggregation

Fix des tests dbt de conso / pop
MTES-MCT · Nov 18, 2024 · 5bcab87 · 5bcab87
2 parents a7378bd + 9623407
commit 5bcab87
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 8 deletions.
diff --git a/airflow/include/sql/sparte/models/for_app/for_app_landconsocomparison.sql b/airflow/include/sql/sparte/models/for_app/for_app_landconsocomparison.sql
@@ -47,6 +47,14 @@ SELECT
 FROM
     {{ ref('conso_epci_stats_commune') }} as epci_stats_commune
 UNION
+SELECT
+    '{{ var('COMMUNE') }}' as relevance_level,
+    '{{ var('NATION') }}' as land_type,
+    '{{ var('NATION') }}' as land_id,
+    {{ fields_to_query }}
+FROM
+    {{ ref('conso_national_stats_commune') }} as epci_stats_commune
+UNION
 SELECT
     '{{ var('DEPARTEMENT') }}' as relevance_level,
     '{{ var('REGION') }}' as land_type,

diff --git a/airflow/include/sql/sparte/models/for_app/for_app_landpopcomparison.sql b/airflow/include/sql/sparte/models/for_app/for_app_landpopcomparison.sql
@@ -23,6 +23,14 @@ SELECT
 FROM
     {{ ref('pop_epci_stats_commune') }} as epci_stats_commune
 UNION
+SELECT
+    '{{ var('COMMUNE') }}' as relevance_level,
+    '{{ var('NATION') }}' as land_type,
+    '{{ var('NATION') }}' as land_id,
+    {{ fields_to_query }}
+FROM
+    {{ ref('pop_national_stats_commune') }} as national_stats_commune
+UNION
 SELECT
     '{{ var('DEPARTEMENT') }}' as relevance_level,
     '{{ var('REGION') }}' as land_type,

diff --git a/...include/sql/sparte/models/insee/aggregated/flux/period/period_flux_population_commune.yml b/...include/sql/sparte/models/insee/aggregated/flux/period/period_flux_population_commune.yml
@@ -41,12 +41,6 @@ models:
       - name: evolution_percent
         data_tests:
           - not_null
-      - name: evolution_median
-        data_tests:
-          - not_null
-      - name: evolution_avg
-        data_tests:
-          - not_null
       - name: start_population
         data_tests:
           - not_null
diff --git a/airflow/include/sql/sparte/models/insee/calculated/pop_epci_stats_commune.sql b/airflow/include/sql/sparte/models/insee/calculated/pop_epci_stats_commune.sql
@@ -10,6 +10,8 @@ FROM
 LEFT JOIN
     {{ ref('commune') }} as commune
     ON commune.code = pop.code_commune
+WHERE
+    commune.epci IS NOT NULL
 GROUP BY
     commune.epci,
     from_year,

diff --git a/airflow/include/sql/sparte/models/insee/calculated/pop_epci_stats_commune.yml b/airflow/include/sql/sparte/models/insee/calculated/pop_epci_stats_commune.yml
@@ -24,7 +24,6 @@ models:
       - name: epci
         data_tests:
           - not_null
-          - unique
           - has_all_epcis
           - relationships:
               to: ref('epci')

diff --git a/airflow/include/sql/sparte/models/insee/calculated/pop_national_stats_commune.sql b/airflow/include/sql/sparte/models/insee/calculated/pop_national_stats_commune.sql
@@ -0,0 +1,14 @@
+{{ config(materialized='table') }}
+
+SELECT
+    from_year,
+    to_year,
+    {{ sum_percent_median_avg('evolution', 'start_population') }}
+FROM
+    {{ ref('period_flux_population_commune') }} as pop
+LEFT JOIN
+    {{ ref('commune') }} as commune
+    ON commune.code = pop.code_commune
+GROUP BY
+    from_year,
+    to_year
diff --git a/airflow/include/sql/sparte/models/majic/calculated/conso_national_stats_commune.sql b/airflow/include/sql/sparte/models/majic/calculated/conso_national_stats_commune.sql
@@ -0,0 +1,20 @@
+{{ config(materialized='table') }}
+
+SELECT
+    from_year,
+    to_year,
+    {{ sum_percent_median_avg('total', 'commune.surface') }},
+    {{ sum_percent_median_avg('activite', 'commune.surface') }},
+    {{ sum_percent_median_avg('habitat', 'commune.surface') }},
+    {{ sum_percent_median_avg('mixte', 'commune.surface') }},
+    {{ sum_percent_median_avg('route', 'commune.surface') }},
+    {{ sum_percent_median_avg('ferroviaire', 'commune.surface') }},
+    {{ sum_percent_median_avg('inconnu', 'commune.surface') }}
+FROM
+    {{ ref('period_consommation_commune') }} as conso
+LEFT JOIN
+    {{ ref('commune') }} as commune
+    ON commune.code = conso.commune_code
+GROUP BY
+    from_year,
+    to_year
diff --git a/airflow/include/sql/sparte/models/majic/calculated/conso_national_stats_epci.sql b/airflow/include/sql/sparte/models/majic/calculated/conso_national_stats_epci.sql
@@ -1,7 +1,6 @@
 {{ config(materialized='table') }}
 
 SELECT
-
     from_year,
     to_year,
     {{ sum_percent_median_avg('total', 'epci.surface') }},