From abc63106fa5ab26582ec73c12225e5be6233d185 Mon Sep 17 00:00:00 2001 From: Hugo Lecuyer Date: Tue, 1 Oct 2024 18:11:31 +0200 Subject: [PATCH] wip --- .../garage/_mes_aides_garage__models.yml | 12 +- ...l => int_mes_aides__garages__adresses.sql} | 0 ...l => int_mes_aides__garages__services.sql} | 0 ...=> int_mes_aides__garages__structures.sql} | 0 .../mes_aides/int_mes_aides__adresses.sql | 2 +- .../mes_aides/int_mes_aides__services.sql | 23 +++- .../mes_aides/int_mes_aides__structures.sql | 15 ++- .../_map_permis_velo_thematiques.sql | 58 ++++++++++ .../permis_velo/_mes_aides__models.yml | 12 +- ... int_mes_aides__permis_velo__adresses.sql} | 0 ... int_mes_aides__permis_velo__services.sql} | 107 +++++++++--------- ...nt_mes_aides__permis_velo__structures.sql} | 18 ++- .../mes_aides/stg_mes_aides__garages.sql | 2 +- .../mes_aides/stg_mes_aides__permis_velo.sql | 11 +- 14 files changed, 178 insertions(+), 82 deletions(-) rename pipeline/dbt/models/intermediate/sources/mes_aides/garage/{int_mes_aides_garages__adresses.sql => int_mes_aides__garages__adresses.sql} (100%) rename pipeline/dbt/models/intermediate/sources/mes_aides/garage/{int_mes_aides_garages__services.sql => int_mes_aides__garages__services.sql} (100%) rename pipeline/dbt/models/intermediate/sources/mes_aides/garage/{int_mes_aides_garages__structures.sql => int_mes_aides__garages__structures.sql} (100%) create mode 100644 pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/_map_permis_velo_thematiques.sql rename pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/{int_mes_aides_permis_velo__adresses.sql => int_mes_aides__permis_velo__adresses.sql} (100%) rename pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/{int_mes_aides_permis_velo__services.sql => int_mes_aides__permis_velo__services.sql} (50%) rename pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/{int_mes_aides_permis_velo__structures.sql => int_mes_aides__permis_velo__structures.sql} (62%) diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/garage/_mes_aides_garage__models.yml b/pipeline/dbt/models/intermediate/sources/mes_aides/garage/_mes_aides_garage__models.yml index 80d6c1820..4b0c96dfc 100644 --- a/pipeline/dbt/models/intermediate/sources/mes_aides/garage/_mes_aides_garage__models.yml +++ b/pipeline/dbt/models/intermediate/sources/mes_aides/garage/_mes_aides_garage__models.yml @@ -1,7 +1,7 @@ version: 2 models: - - name: int_mes_aides_garages__adresses + - name: int_mes_aides__garages__adresses data_tests: - check_adresse: config: @@ -13,7 +13,7 @@ models: - not_null - dbt_utils.not_empty_string - - name: int_mes_aides_garages__structures + - name: int_mes_aides__garages__structures data_tests: - check_structure: config: @@ -28,10 +28,10 @@ models: data_tests: - not_null - relationships: - to: ref('int_mes_aides_garages__adresses') + to: ref('int_mes_aides__garages__adresses') field: id - - name: int_mes_aides_garages__services + - name: int_mes_aides__garages__services data_tests: - check_service: config: @@ -46,11 +46,11 @@ models: data_tests: - not_null - relationships: - to: ref('int_mes_aides_garages__structures') + to: ref('int_mes_aides__garages__structures') field: id - name: adresse_id data_tests: - not_null - relationships: - to: ref('int_mes_aides_garages__adresses') + to: ref('int_mes_aides__garages__adresses') field: id \ No newline at end of file diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides_garages__adresses.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides__garages__adresses.sql similarity index 100% rename from pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides_garages__adresses.sql rename to pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides__garages__adresses.sql diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides_garages__services.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides__garages__services.sql similarity index 100% rename from pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides_garages__services.sql rename to pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides__garages__services.sql diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides_garages__structures.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides__garages__structures.sql similarity index 100% rename from pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides_garages__structures.sql rename to pipeline/dbt/models/intermediate/sources/mes_aides/garage/int_mes_aides__garages__structures.sql diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__adresses.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__adresses.sql index 7effece89..2c63dc6b3 100644 --- a/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__adresses.sql +++ b/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__adresses.sql @@ -1,3 +1,3 @@ {{ dbt_utils.union_relations( - relations=[ref('int_mes_aides_garages__adresses'), ref('int_mes_aides_permis_velo__adresses')] + relations=[ref('int_mes_aides__garages__adresses'), ref('int_mes_aides__permis_velo__adresses')] ) }} diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__services.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__services.sql index 82515118c..e4eeff9e3 100644 --- a/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__services.sql +++ b/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__services.sql @@ -1,3 +1,20 @@ -{{ dbt_utils.union_relations( - relations=[ref('int_mes_aides_garages__services'), ref('int_mes_aides_permis_velo__services')] -) }} +{{ + dbt_utils.union_relations( + relations=[ + ref('int_mes_aides__permis_velo__services'), + ref('int_mes_aides__garages__services'), + ], + column_override={ + "frais": "TEXT[]", + "justificatifs": "TEXT[]", + "modes_accueil": "TEXT[]", + "modes_orientation_accompagnateur": "TEXT[]", + "modes_orientation_beneficiaire": "TEXT[]", + "pre_requis": "TEXT[]", + "profils": "TEXT[]", + "thematiques": "TEXT[]", + "types": "TEXT[]", + }, + source_column_name=None + ) +}} diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__structures.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__structures.sql index f2558ad21..64e21d51c 100644 --- a/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__structures.sql +++ b/pipeline/dbt/models/intermediate/sources/mes_aides/int_mes_aides__structures.sql @@ -1,3 +1,12 @@ -{{ dbt_utils.union_relations( - relations=[ref('int_mes_aides_garages__structures'), ref('int_mes_aides_permis_velo__structures')] -) }} +with permis_velo as ( + select * from {{ ref('int_mes_aides__permis_velo__structures') }} +), +garages as ( + select * from {{ ref('int_mes_aides__garages__structures') }} +), +final as ( + select * from permis_velo + union all + select * from garages +) +select * from final diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/_map_permis_velo_thematiques.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/_map_permis_velo_thematiques.sql new file mode 100644 index 000000000..e82bc9ba2 --- /dev/null +++ b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/_map_permis_velo_thematiques.sql @@ -0,0 +1,58 @@ +{{ config(materialized='ephemeral') }} +WITH mapping_thematiques AS ( + SELECT x.* + FROM ( + VALUES + ('Financer mon permis', 'transport-et-mobilite', 'mobilite--financer-mon-projet-mobilite'), + ('Financer mon permis', 'transport-et-mobilite', 'mobilite--preparer-son-permis-de-conduire-se-reentrainer-a-la-conduite'), + ('Financer mes trajets', 'transport-et-mobilite', 'mobilite--financer-mon-projet-mobilite'), + ('Financer le carburant', 'transport-et-mobilite', 'mobilite--financer-mon-projet-mobilite'), + ('Financer mon BSR', 'transport-et-mobilite', 'mobilite--financer-mon-projet-mobilite'), + ('Financer l''achat d''un véhicule', 'transport-et-mobilite', 'mobilite--acheter-un-vehicule-motorise'), + ('Déménager', 'logement', 'logement-hebergement--demenagement'), + ('Transports en commun', 'transport-et-mobilite', 'mobilite--comprendre-et-utiliser-les-transports-en-commun'), + ('Transport à la demande', 'transport-et-mobilite', 'mobilite--etre-accompagne-dans-son-parcours-mobilite'), + ('Réparer ma voiture', 'transport-et-mobilite', 'mobilite--entretenir-reparer-son-vehicule'), + ('Louer un vélo électrique', 'transport-et-mobilite', 'mobilite--louer-un-vehicule'), + ('Ma voiture', 'transport-et-mobilite', 'mobilite--louer-un-vehicule'), + ('Ma voiture', 'transport-et-mobilite', 'mobilite--entretenir-reparer-son-vehicule'), + ('Ma voiture', 'transport-et-mobilite', 'mobilite--acheter-un-vehicule-motorise'), + ('Mon vélo électrique', 'transport-et-mobilite', 'mobilite--acheter-un-velo'), + ('Mon vélo électrique', 'transport-et-mobilite', 'mobilite--entretenir-reparer-son-vehicule'), + ('Mon vélo électrique', 'transport-et-mobilite', 'mobilite--apprendre-a-utiliser-un-deux-roues'), + ('Mon vélo électrique', 'transport-et-mobilite', 'mobilite--louer-un-vehicule'), + ('Mon vélo électrique', 'transport-et-mobilite', 'mobilite--acheter-un-vehicule-motorise'), + ('Mon scooter', 'transport-et-mobilite', 'mobilite--entretenir-reparer-son-vehicule'), + ('Mon scooter', 'transport-et-mobilite', 'mobilite--apprendre-a-utiliser-un-deux-roues'), + ('Mon scooter', 'transport-et-mobilite', 'mobilite--louer-un-vehicule'), + ('Acheter un vélo électrique', 'transport-et-mobilite', 'mobilite--acheter-un-velo'), + ('Acheter ou louer un vélo', 'transport-et-mobilite', 'mobilite--acheter-un-velo'), + ('Acheter ou louer un vélo', 'transport-et-mobilite', 'mobilite--louer-un-vehicule'), + ('Acheter ou louer une voiture', 'transport-et-mobilite', 'mobilite--louer-un-vehicule'), + ('Acheter ou louer une voiture', 'transport-et-mobilite', 'mobilite--acheter-un-vehicule-motorise'), + ('Accéder au permis de conduire', 'transport-et-mobilite', 'mobilite--preparer-son-permis-de-conduire-se-reentrainer-a-la-conduite'), + ('Déménager', 'logement', 'logement-hebergement--demenagement'), + ('Partir à l''étranger', 's-ouvrir-a-l-international', 'souvrir-a-linternational--sinformer-sur-les-aides-pour-travailler-a-letranger'), + ('Handicap & mobilité', 'transport-et-mobilite', 'handicap--favoriser-le-retour-et-le-maintien-dans-lemploi'), + ('Trouver une alternance', 'trouver-un-job', 'trouver-un-emploi--suivre-ses-candidatures-et-relancer-les-employeurs'), + ('Trouver une alternance', 'trouver-un-job', 'trouver-un-emploi--convaincre-un-recruteur-en-entretien'), + ('Trouver une alternance', 'trouver-un-job', 'trouver-un-emploi--faire-des-candidatures-spontanees'), + ('Trouver une alternance', 'trouver-un-job', 'trouver-un-emploi--repondre-a-des-offres-demploi'), + ('Trouver un contrat d''apprentissage', 'trouver-un-job', 'trouver-un-emploi--suivre-ses-candidatures-et-relancer-les-employeurs'), + ('Trouver un contrat d''apprentissage', 'trouver-un-job', 'trouver-un-emploi--convaincre-un-recruteur-en-entretien'), + ('Trouver un contrat d''apprentissage', 'trouver-un-job', 'trouver-un-emploi--faire-des-candidatures-spontanees'), + ('Trouver un contrat d''apprentissage', 'trouver-un-job', 'trouver-un-emploi--repondre-a-des-offres-demploi'), + ('Préparer une candidature', 'trouver-un-job', 'preparer-sa-candidature--valoriser-ses-competences'), + ('Rédiger une lettre de motivation ou un CV', 'trouver-un-job', 'preparer-sa-candidature--realiser-un-cv-et-ou-une-lettre-de-motivation'), + ('Devenir locataire', 'logement', 'logement-hebergement--etre-accompagne-pour-se-loger'), + ('Financer mon loyer', 'logement', 'logement-hebergement--gerer-son-budget'), + ('Faire des travaux', 'logement', 'logement-hebergement--besoin-dadapter-mon-logement'), + ('Trouver un logement social', 'logement', 'logement-hebergement--etre-accompagne-pour-se-loger'), + ('Financer une formation', 'formation-et-orientation', 'se-former--monter-son-dossier-de-formation'), + ('Trouver une formation', 'formation-et-orientation', 'se-former--trouver-sa-formation'), + ('Rémunération pendant la formation', 'formation-et-orientation', 'se-former--monter-son-dossier-de-formation'), + ('Reconversion', 'formation-et-orientation', 'se-former--trouver-sa-formation'), + ('Accompagnement personnalisé à la mobilité', 'transport-et-mobilite', 'mobilite--etre-accompagne-dans-son-parcours-mobilite') + ) AS x (besoins, thematiques, correspondance_di) +) +SELECT * FROM mapping_thematiques \ No newline at end of file diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/_mes_aides__models.yml b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/_mes_aides__models.yml index 9a20a02ee..8f2b5e97a 100644 --- a/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/_mes_aides__models.yml +++ b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/_mes_aides__models.yml @@ -1,7 +1,7 @@ version: 2 models: - - name: int_mes_aides_permis_velo__adresses + - name: int_mes_aides__permis_velo__adresses data_tests: - check_adresse: config: @@ -14,7 +14,7 @@ models: - dbt_utils.not_empty_string - - name: int_mes_aides_permis_velo__structures + - name: int_mes_aides__permis_velo__structures data_tests: - check_structure: config: @@ -29,10 +29,10 @@ models: data_tests: - not_null - relationships: - to: ref('int_mes_aides_permis_velo__adresses') + to: ref('int_mes_aides__permis_velo__adresses') field: id - - name: int_mes_aides_permis_velo__services + - name: int_mes_aides__permis_velo__services data_tests: - check_service: config: @@ -47,11 +47,11 @@ models: data_tests: - not_null - relationships: - to: ref('int_mes_aides_permis_velo__structures') + to: ref('int_mes_aides__permis_velo__structures') field: id - name: adresse_id data_tests: - not_null - relationships: - to: ref('int_mes_aides_permis_velo__adresses') + to: ref('int_mes_aides__permis_velo__adresses') field: id diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides_permis_velo__adresses.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides__permis_velo__adresses.sql similarity index 100% rename from pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides_permis_velo__adresses.sql rename to pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides__permis_velo__adresses.sql diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides_permis_velo__services.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides__permis_velo__services.sql similarity index 50% rename from pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides_permis_velo__services.sql rename to pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides__permis_velo__services.sql index b0ca6a066..602a749a1 100644 --- a/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides_permis_velo__services.sql +++ b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides__permis_velo__services.sql @@ -12,6 +12,14 @@ departements AS ( SELECT * FROM {{ ref('stg_decoupage_administratif__departements') }} ), +regions AS ( + SELECT * FROM {{ ref('stg_decoupage_administratif__regions') }} +), + +mapping_thematiques AS ( + SELECT * FROM {{ ref('_map_permis_velo_thematiques') }} +), + zone_code AS ( SELECT permis_velo.id, @@ -20,7 +28,7 @@ zone_code AS ( communes.code_departement, communes.code_region FROM permis_velo - LEFT JOIN communes ON permis_velo.liaisons_code_postal = ANY(communes.codes_postaux) AND permis_velo.liaisons_ville_nom = communes.nom + LEFT JOIN communes ON permis_velo.liaisons_code_postal = ANY(communes.codes_postaux) AND communes.nom like (select '%' || permis_velo.liaisons_ville_nom || '%') ), types_mapping AS ( @@ -41,10 +49,21 @@ zone_de_diffusion_mapping AS ( ('Échelle intercommunale', 'epci'), ('Échelle régionale', 'region'), ('Échelle départementale', 'departement'), - ('France métropolitaine', 'pays') + ('France métropolitaine', 'pays'), + ('Échelle nationale', 'pays') ) AS x (zone_mes_aides, zone_di) ), +frais_mapping AS ( + SELECT x.* + FROM ( + VALUES + ('payant', ARRAY['Somme d''argent', 'Prise en charge partielle', 'Tarif préférentiel']), + ('gratuit', ARRAY['Prise en charge totale', 'Prêt remboursement']), + ('gratuit sous conditions', ARRAY['Facilitation de paiement', 'Prise en charge partielle ou totale']) + ) AS x (frais_di, frais_mes_aides) +), + zone_diffusion AS ( SELECT zone_de_diffusion_mapping.zone_di, @@ -63,43 +82,16 @@ modes_orientation_mapping AS ( ) AS x (demarche, modes_orientation_accompagnateur, modes_orientation_beneficiaire) ), -mapping_thematiques AS ( - SELECT x.* - FROM ( - VALUES - ('Financer mon permis', 'transport-et-mobilite', ARRAY['mobilite--financer-mon-projet-mobilite', 'mobilite--preparer-son-permis-de-conduire-se-reentrainer-a-la-conduite']), - ('Financer mes trajets', 'transport-et-mobilite', ARRAY['mobilite--financer-mon-projet-mobilite']), - ('Financer le carburant', 'transport-et-mobilite', ARRAY['mobilite--financer-mon-projet-mobilite']), - ('Financer mon BSR', 'transport-et-mobilite', ARRAY['mobilite--financer-mon-projet-mobilite']), - ('Financer l''achat d''un véhicule', 'transport-et-mobilite', ARRAY['mobilite--acheter-un-vehicule-motorise']), - ('Déménager', 'logement', ARRAY['logement-hebergement--demenagement']), - ('Transports en commun', 'transport-et-mobilite', ARRAY['mobilite--comprendre-et-utiliser-les-transports-en-commun']), - ('Transport à la demande', 'transport-et-mobilite', ARRAY['mobilite--etre-accompagne-dans-son-parcours-mobilite']), - ('Réparer ma voiture', 'transport-et-mobilite', ARRAY['mobilite--entretenir-reparer-son-vehicule']), - ('Louer un vélo électrique', 'transport-et-mobilite', ARRAY['mobilite--louer-un-vehicule']), - ('Ma voiture', 'transport-et-mobilite', ARRAY['mobilite--louer-un-vehicule', 'mobilite--entretenir-reparer-son-vehicule', 'mobilite--acheter-un-vehicule-motorise']), - ('Mon vélo électrique', 'transport-et-mobilite', ARRAY['mobilite--acheter-un-velo', 'mobilite--entretenir-reparer-son-vehicule', 'mobilite--apprendre-a-utiliser-un-deux-roues', 'mobilite--louer-un-vehicule', 'mobilite--acheter-un-vehicule-motorise']), - ('Mon scooter', 'transport-et-mobilite', ARRAY['mobilite--entretenir-reparer-son-vehicule', 'mobilite--apprendre-a-utiliser-un-deux-roues', 'mobilite--louer-un-vehicule']), - ('Acheter un vélo électrique', 'transport-et-mobilite', ARRAY['mobilite--acheter-un-velo']), - ('Acheter ou louer une voiture', 'transport-et-mobilite', ARRAY['mobilite--louer-un-vehicule', 'mobilite--acheter-un-vehicule-motorise']), - ('Accéder au permis de conduire', 'transport-et-mobilite', ARRAY['mobilite--preparer-son-permis-de-conduire-se-reentrainer-a-la-conduite']), - ('Déménager', 'transport-et-mobilite', ARRAY['logement-hebergement--demenagement']), - ('Partir à l''étranger', 'transport-et-mobilite', ARRAY['souvrir-a-linternational--sinformer-sur-les-aides-pour-travailler-a-letranger']), - ('Handicap & mobilité', 'transport-et-mobilite', ARRAY['handicap--favoriser-le-retour-et-le-maintien-dans-lemploi']), - ('Trouver une alternance', 'trouver-un-job', ARRAY['trouver-un-emploi--suivre-ses-candidatures-et-relancer-les-employeurs', 'trouver-un-emploi--convaincre-un-recruteur-en-entretien', 'trouver-un-emploi--faire-des-candidatures-spontanees', 'trouver-un-emploi--repondre-a-des-offres-demploi']), - ('Trouver un contrat d''apprentissage', 'trouver-un-job', ARRAY['trouver-un-emploi--suivre-ses-candidatures-et-relancer-les-employeurs', 'trouver-un-emploi--convaincre-un-recruteur-en-entretien', 'trouver-un-emploi--faire-des-candidatures-spontanees', 'trouver-un-emploi--repondre-a-des-offres-demploi']), - ('Préparer une candidature', 'trouver-un-job', ARRAY['preparer-sa-candidature--valoriser-ses-competences']), - ('Rédiger une lettre de motivation ou un CV', 'trouver-un-job', ARRAY['preparer-sa-candidature--realiser-un-cv-et-ou-une-lettre-de-motivation']), - ('Devenir locataire', 'logement', ARRAY['logement-hebergement--etre-accompagne-pour-se-loger']), - ('Financer mon loyer', 'logement', ARRAY['logement-hebergement--gerer-son-budget']), - ('Faire des travaux', 'logement', ARRAY['logement-hebergement--besoin-dadapter-mon-logement']), - ('Trouver un logement social', 'logement', ARRAY['logement-hebergement--etre-accompagne-pour-se-loger']), - ('Financer une formation', 'formation-et-orientation', ARRAY['se-former--monter-son-dossier-de-formation']), - ('Trouver une formation', 'formation-et-orientation', ARRAY['se-former--trouver-sa-formation']), - ('Rémunération pendant la formation', 'formation-et-orientation', ARRAY['se-former--monter-son-dossier-de-formation']), - ('Reconversion', 'formation-et-orientation', ARRAY['se-former--trouver-sa-formation']), - ('Accompagnement personnalisé à la mobilité', 'transport-et-mobilite', ARRAY['mobilite--etre-accompagne-dans-son-parcours-mobilite']) - ) AS x (besoins, thematiques, correspondance_di) +thematiques AS ( + SELECT + ARRAY_AGG(mapping_thematiques.correspondance_di) as thematiques, + permis_velo.id as service_id + FROM + permis_velo, + UNNEST(permis_velo.liaisons_besoins_mes_aides) AS mes_aides_besoins + LEFT JOIN mapping_thematiques ON mes_aides_besoins = mapping_thematiques.besoins + WHERE permis_velo.slug_thematique_mes_aides = mapping_thematiques.thematiques + GROUP BY permis_velo.id ), transformed_types AS ( @@ -124,7 +116,7 @@ final AS ( permis_velo.modifiee_le AS "date_maj", CAST(NULL AS DATE) AS "date_suspension", NULL AS "formulaire_en_ligne", - permis_velo.nature AS "frais_autres", + array_to_string(permis_velo.nature, '; ') AS "frais_autres", permis_velo.id AS "id", CAST(NULL AS TEXT []) AS "justificatifs", permis_velo.url_mes_aides AS "lien_source", @@ -146,49 +138,52 @@ final AS ( permis_velo.demarche AS "modes_orientation_beneficiaire_autres", permis_velo.nom AS "nom", CASE - WHEN LENGTH(permis_velo.modalite_versement) > 297 THEN SUBSTRING(permis_velo.modalite_versement FROM 1 FOR 294) || '...' - ELSE permis_velo.modalite_versement + WHEN LENGTH(permis_velo.description) > 280 THEN SUBSTRING(permis_velo.description FROM 1 FOR 277) || '...' + ELSE permis_velo.description END AS "presentation_resume", - permis_velo.modalite_versement AS "presentation_detail", + permis_velo.description || COALESCE(E'\n\n' || permis_velo.bon_a_savoir, '') || COALESCE(E'\n\n' || permis_velo.modalite_versement, '') AS "presentation_detail", NULL AS "prise_rdv", CAST(NULL AS TEXT []) AS "profils", NULL AS "recurrence", permis_velo._di_source_id AS "source", permis_velo.id AS "structure_id", - ( - SELECT mapping_thematiques.correspondance_di - FROM mapping_thematiques - WHERE - permis_velo.liaisons_besoins_mes_aides = mapping_thematiques.besoins - AND permis_velo.slug_thematique_mes_aides = mapping_thematiques.thematiques - ) AS "thematiques", + thematiques.thematiques AS "thematiques", transformed_types.transformed_types AS "types", CASE WHEN zone_diffusion.zone_di = 'commune' THEN zone_code.code WHEN zone_diffusion.zone_di = 'epci' THEN zone_code.code_epci - WHEN zone_diffusion.zone_di = 'region' THEN zone_code.code_region - WHEN zone_diffusion.zone_di = 'departement' THEN zone_code.code_departement - WHEN zone_diffusion.zone_di = 'pays' THEN NULL + WHEN zone_diffusion.zone_di = 'region' THEN regions.code + WHEN zone_diffusion.zone_di = 'departement' THEN departements.code + WHEN zone_diffusion.zone_di = 'pays' THEN 'FR' END AS "zone_diffusion_code", CASE WHEN zone_diffusion.zone_di = 'commune' THEN permis_velo.liaisons_ville_nom WHEN zone_diffusion.zone_di = 'epci' THEN permis_velo.liaisons_ville_nom WHEN zone_diffusion.zone_di = 'region' THEN permis_velo.liaisons_region WHEN zone_diffusion.zone_di = 'departement' THEN departements.nom - WHEN zone_diffusion.zone_di = 'pays' THEN NULL + WHEN zone_diffusion.zone_di = 'pays' THEN 'France entière' END AS "zone_diffusion_nom", zone_diffusion.zone_di AS "zone_diffusion_type", - CAST(NULL AS TEXT []) AS "pre_requis", + CASE + WHEN permis_velo.autres_conditions IS NULL THEN CAST(NULL AS TEXT []) + ELSE ARRAY[permis_velo.autres_conditions] + END AS "pre_requis", NULL AS "contact_nom_prenom", permis_velo.contact_email AS "courriel", permis_velo.contact_telephone AS "telephone", - CAST(NULL AS TEXT []) AS "frais", + ( + SELECT array_agg(frais_mapping.frais_di) + FROM frais_mapping + WHERE permis_velo.nature && frais_mapping.frais_mes_aides + ) AS "frais", permis_velo.site AS "page_web" FROM permis_velo LEFT JOIN transformed_types ON permis_velo.id = transformed_types.id LEFT JOIN zone_diffusion ON permis_velo.id = zone_diffusion.id LEFT JOIN zone_code ON permis_velo.id = zone_code.id LEFT JOIN departements ON permis_velo.num_departement = departements.code + LEFT JOIN regions ON permis_velo.liaisons_region = regions.nom + LEFT JOIN thematiques ON permis_velo.id = thematiques.service_id ) SELECT * FROM final diff --git a/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides_permis_velo__structures.sql b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides__permis_velo__structures.sql similarity index 62% rename from pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides_permis_velo__structures.sql rename to pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides__permis_velo__structures.sql index bde2084db..5caf64e16 100644 --- a/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides_permis_velo__structures.sql +++ b/pipeline/dbt/models/intermediate/sources/mes_aides/permis_velo/int_mes_aides__permis_velo__structures.sql @@ -1,7 +1,18 @@ WITH permis_velo AS ( SELECT * FROM {{ ref('stg_mes_aides__permis_velo') }} ), - +mapping_thematiques AS ( + SELECT * FROM {{ ref('_map_permis_velo_thematiques') }} +), +thematiques AS ( + SELECT + ARRAY_AGG(mapping_thematiques.correspondance_di) as thematiques, + permis_velo.id as service_id + FROM permis_velo + INNER JOIN mapping_thematiques ON mapping_thematiques.besoins = ANY(permis_velo.liaisons_besoins_mes_aides) + WHERE permis_velo.slug_thematique_mes_aides = mapping_thematiques.thematiques + GROUP BY permis_velo.id +), final AS ( SELECT id AS "id", @@ -9,7 +20,7 @@ final AS ( siret_structure AS "siret", CAST(NULL AS BOOLEAN) AS "antenne", NULL AS "rna", - nom AS "nom", + nom_organisme_structure AS "nom", contact_telephone AS "telephone", contact_email AS "courriel", site AS "site_web", @@ -23,8 +34,9 @@ final AS ( NULL AS "presentation_resume", NULL AS "presentation_detail", CAST(modifiee_le AS DATE) AS "date_maj", - ARRAY['mobilite'] AS "thematiques" + thematiques.thematiques AS "thematiques" FROM permis_velo + LEFT JOIN thematiques ON permis_velo.id = thematiques.service_id ) SELECT * FROM final diff --git a/pipeline/dbt/models/staging/sources/mes_aides/stg_mes_aides__garages.sql b/pipeline/dbt/models/staging/sources/mes_aides/stg_mes_aides__garages.sql index 21ae2a4d9..163e79981 100644 --- a/pipeline/dbt/models/staging/sources/mes_aides/stg_mes_aides__garages.sql +++ b/pipeline/dbt/models/staging/sources/mes_aides/stg_mes_aides__garages.sql @@ -24,7 +24,7 @@ final AS ( ELSE ARRAY[data #>> '{fields,Critères d''éligibilité}'] END AS "criteres_eligibilite", data #>> '{fields,Département Nom}' AS "departement_nom", - data #>> '{fields,Email}' AS "email", + TRIM(data #>> '{fields,Email}') AS "email", CAST(data #>> '{fields,En Ligne}' AS BOOLEAN) AS "en_ligne", data #>> '{fields,ID}' AS "id", -- some rows are formatted as `LAT, LAT`... use first value diff --git a/pipeline/dbt/models/staging/sources/mes_aides/stg_mes_aides__permis_velo.sql b/pipeline/dbt/models/staging/sources/mes_aides/stg_mes_aides__permis_velo.sql index 13d578678..e971f9a25 100644 --- a/pipeline/dbt/models/staging/sources/mes_aides/stg_mes_aides__permis_velo.sql +++ b/pipeline/dbt/models/staging/sources/mes_aides/stg_mes_aides__permis_velo.sql @@ -11,10 +11,15 @@ final AS ( data #>> '{fields,N° Départements}' AS "num_departement", data #>> '{fields,Liaisons Régions}' AS "liaisons_region", data #>> '{fields,Nom}' AS "nom", - data #>> '{fields,Liaisons Besoins}' AS "liaisons_besoins_mes_aides", + data #>> '{fields,Description}' AS "description", + data #>> '{fields,Bon à savoir}' AS "bon_a_savoir", + STRING_TO_ARRAY(data #>> '{fields,Liaisons Besoins}', ', ') AS "liaisons_besoins_mes_aides", data #>> '{fields,Slug Thématiques}' AS "slug_thematique_mes_aides", data #>> '{fields,Zone géographique}' AS "zone_geographique", - data #>> '{fields,Nature}' AS "nature", + ( + SELECT array_agg(element) + FROM jsonb_array_elements_text(data->'fields'->'Nature') AS element + ) AS "nature", data #>> '{fields,Démarches}' AS "demarche", data #>> '{fields,"Modalité et versement"}' AS "modalite_versement", data #>> '{fields,"Méthode"}' AS "methode", @@ -30,7 +35,7 @@ final AS ( data #>> '{fields,Contact Tel}' AS "contact_telephone", data #>> '{fields,Autres Conditions}' AS "autres_conditions", data #>> '{fields,Url Mes Aides}' AS "url_mes_aides", - STRING_TO_ARRAY(data #>> '{fields,Type}', ',') AS "types" + STRING_TO_ARRAY(data #>> '{fields,Type}', ', ') AS "types" FROM source )