Merge pull request #1155 from MTES-MCT/feat-count-by-statut

Ajout des comptes de friche aux modèles for_app

Author: alexisig

airflow/include/sql/sparte/macros/cartofriches/common_friche_for_app_fields.sql

@@ -0,0 +1,10 @@
+{% macro common_friche_for_app_fields() %}
+    friche_count,
+    friche_sans_projet_count,
+    friche_avec_projet_count,
+    friche_reconvertie_count,
+    friche_surface / 10000 as friche_surface,
+    friche_sans_projet_surface / 10000 as friche_sans_projet_surface,
+    friche_avec_projet_surface / 10000 as friche_avec_projet_surface,
+    friche_reconvertie_surface / 10000 as friche_reconvertie_surface
+{% endmacro %}

airflow/include/sql/sparte/models/for_app/friche/for_app_landfrichepollution.sql

@@ -9,7 +9,6 @@ SELECT
     land_id,
     land_type,
     friche_sol_pollution,
-    friche_count,
-    friche_surface / 10000 as friche_surface
+    {{ common_friche_for_app_fields() }}
 FROM
     {{ ref('friche_land_by_pollution')}}

airflow/include/sql/sparte/models/for_app/friche/for_app_landfrichestatut.sql

@@ -10,7 +10,6 @@ SELECT
     land_id,
     land_type,
     friche_statut,
-    friche_count,
-    friche_surface / 10000 as friche_surface
+    {{ common_friche_for_app_fields() }}
 FROM
     {{ ref('friche_land_by_statut')}}

airflow/include/sql/sparte/models/for_app/friche/for_app_landfrichesurfacerank.sql

@@ -12,8 +12,7 @@ SELECT
     friche_surface_percentile_rank,
     friche_surface_ranks.min_surface / 10000 as rank_min_surface,
     friche_surface_ranks.max_surface / 10000 as rank_max_surface,
-    friche_count,
-    friche_surface / 10000 as friche_surface
+    {{ common_friche_for_app_fields() }}
 FROM
     {{ ref('friche_land_by_surface')}}
 LEFT JOIN

airflow/include/sql/sparte/models/for_app/friche/for_app_landfrichetype.sql

@@ -10,7 +10,6 @@ SELECT
     land_id,
     land_type,
     friche_type,
-    friche_count,
-    friche_surface / 10000 as friche_surface
+    {{ common_friche_for_app_fields() }}
 FROM
     {{ ref('friche_land_by_type')}}

airflow/include/sql/sparte/models/for_app/friche/for_app_landfrichezonageenvironnementale.sql

@@ -9,7 +9,6 @@ SELECT
     land_id,
     land_type,
     friche_zonage_environnemental,
-    friche_count,
-    friche_surface / 10000 as friche_surface
+    {{ common_friche_for_app_fields() }}
 FROM
     {{ ref('friche_land_by_zonage_environnemental')}}

airflow/include/sql/sparte/models/for_app/friche/for_app_landfrichezonagetype.sql

@@ -10,7 +10,6 @@ SELECT
     land_id,
     land_type,
     friche_type_zone,
-    friche_count,
-    friche_surface / 10000 as friche_surface
+    {{ common_friche_for_app_fields() }}
 FROM
     {{ ref('friche_land_by_zonage_type')}}

airflow/include/sql/sparte/models/for_app/friche/for_app_landfrichezoneactivite.sql

@@ -10,7 +10,6 @@ SELECT
     land_id,
     land_type,
     friche_is_in_zone_activite,
-    friche_count,
-    friche_surface / 10000 as friche_surface
+    {{ common_friche_for_app_fields() }}
 FROM
     {{ ref('friche_land_by_zone_activite')}}

public_data/models/urbanisme/BaseLandFriche.py

@@ -8,8 +8,16 @@
 class BaseLandFriche(models.Model):
     land_id = models.CharField()
     land_type = models.CharField(choices=AdminRef.CHOICES)
+
     friche_count = models.IntegerField()
+    friche_sans_projet_count = models.IntegerField()
+    friche_avec_projet_count = models.IntegerField()
+    friche_renconvertie_count = models.IntegerField()
+
     friche_surface = models.FloatField()
+    friche_sans_projet_surface = models.FloatField()
+    friche_avec_projet_surface = models.FloatField()
+    friche_renconvertie_surface = models.FloatField()
 
     class Meta:
         abstract = True