Skip to content

Commit

Permalink
fix after review
Browse files Browse the repository at this point in the history
  • Loading branch information
@hlecuyer
hlecuyer committed Aug 27, 2024
1 parent 13611da commit 0a7858d
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 31 deletions.
10 changes: 6 additions & 4 deletions pipeline/dbt/models/intermediate/sources/fredo/int_fredo__services.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,13 @@ final AS (
fredo_structures.id AS "adresse_id",
thematiques.thematiques AS "thematiques",
NULL AS "prise_rdv",
site_web AS "page_web",
fredo_structures.site_web AS "page_web",
profils.profils AS "profils",
NULL AS "modes_orientation_accompagnateur_autres",
NULL AS "modes_orientation_beneficiaire_autres",
NULL AS "formulaire_en_ligne",
NULL AS "lien_source",
fredo_structures.telephone AS "telephone",
NULL AS "courriel",
fredo_structures.courriel AS "courriel",
NULL AS "contact_nom_prenom",
'departement' AS "zone_diffusion_type",
'974' AS "zone_diffusion_code",
Expand All @@ -156,6 +155,9 @@ final AS (
CAST(NULL AS TEXT []) AS "modes_accueil",
LEFT(fredo_structures.presentation_resume, 280) AS "presentation_resume",
fredo_structures.presentation_resume AS "presentation_detail",
CASE
WHEN ARRAY_LENGTH(fredo_structures.telephone, 1) > 0 THEN fredo_structures.telephone[1]
END AS "telephone",
ARRAY[(
SELECT di_types_by_fredo_services.di_type
FROM di_types_by_fredo_services
Expand All @@ -168,7 +170,7 @@ final AS (
) AS "nom",
CASE
WHEN 'gratuit' = ANY(frais.frais) AND 'payant' = ANY(frais.frais)
THEN ARRAY['gratuit-sous-conditions']
THEN ARRAY['gratuit-sous-conditions']
ELSE frais.frais
END AS "frais",
CASE
Expand Down
42 changes: 22 additions & 20 deletions pipeline/dbt/models/intermediate/sources/fredo/int_fredo__structures.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,32 +35,34 @@ di_typologie_by_fredo_type_structure AS (

final AS (
SELECT
id AS "id",
id AS "adresse_id",
_di_source_id AS "source",
siret AS "siret",
NULL AS "rna",
nom AS "nom",
last_update AS "date_maj",
structures.id AS "id",
structures.id AS "adresse_id",
structures._di_source_id AS "source",
structures.siret AS "siret",
NULL AS "rna",
structures.nom AS "nom",
structures.last_update AS "date_maj",
(
SELECT di_typologie_by_fredo_type_structure.typologie
FROM di_typologie_by_fredo_type_structure
INNER JOIN fredo_types AS stg_type ON stg_type.structure_id = structures.id
WHERE stg_type.value = di_typologie_by_fredo_type_structure.type_structure
LIMIT 1
) AS "typologie",
telephone AS "telephone",
NULL AS "courriel",
site_web AS "site_web",
LEFT(presentation_resume, 280) AS "presentation_resume",
presentation_resume AS "presentation_detail",
CAST(NULL AS BOOLEAN) AS "antenne",
NULL AS "lien_source",
horaires_ouverture AS "horaires_ouverture",
NULL AS "accessibilite",
CAST(NULL AS TEXT []) AS "labels_nationaux",
CAST(NULL AS TEXT []) AS "labels_autres",
thematiques.thematiques AS "thematiques"
) AS "typologie",
CASE
WHEN ARRAY_LENGTH(structures.telephone, 1) > 0 THEN structures.telephone[1]
END AS "telephone",
structures.courriel AS "courriel",
structures.site_web AS "site_web",
LEFT(structures.presentation_resume, 280) AS "presentation_resume",
structures.presentation_resume AS "presentation_detail",
CAST(NULL AS BOOLEAN) AS "antenne",
NULL AS "lien_source",
structures.horaires_ouverture AS "horaires_ouverture",
NULL AS "accessibilite",
CAST(NULL AS TEXT []) AS "labels_nationaux",
CAST(NULL AS TEXT []) AS "labels_autres",
thematiques.thematiques AS "thematiques"
FROM structures
LEFT JOIN thematiques ON structures.id = thematiques.structure_id
)
Expand Down
2 changes: 1 addition & 1 deletion pipeline/dbt/models/staging/sources/fredo/_fredo__models.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ models:
- name: horaires_ouverture
data_tests:
- dbt_utils.not_empty_string
- name: lien_source
- name: site_web
data_tests:
- dbt_utils.not_empty_string
- name: nom
Expand Down
7 changes: 6 additions & 1 deletion pipeline/dbt/models/staging/sources/fredo/stg_fredo__structures.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ final AS (
_di_source_id AS "_di_source_id",
data ->> 'id' AS "id",
NULLIF(TRIM(data ->> 'adresse'), '') AS "adresse",
NULLIF(TRIM(data ->> 'email'), '') AS "courriel",
NULLIF(TRIM(data ->> 'code_postal'), '') AS "code_postal",
NULLIF(TRIM(data ->> 'commune'), '') AS "commune",
NULLIF(TRIM(data ->> 'frais'), '') AS "frais",
Expand All @@ -16,9 +17,13 @@ final AS (
NULLIF(TRIM(data ->> 'nom'), '') AS "nom",
NULLIF(TRIM(data ->> 'presentation_resume'), '') AS "presentation_resume",
NULLIF(TRIM(data ->> 'siret'), '') AS "siret",
NULLIF(TRIM(data ->> 'telephone'), '') AS "telephone",
CAST(NULLIF(TRIM(data ->> 'latitude'), '') AS FLOAT) AS "latitude",
CAST(NULLIF(TRIM(data ->> 'longitude'), '') AS FLOAT) AS "longitude",
CASE
WHEN data ->> 'telephone' IS NOT NULL
THEN CAST(ARRAY(SELECT * FROM JSONB_ARRAY_ELEMENTS_TEXT(data -> 'telephone')) AS TEXT [])
ELSE CAST(NULL AS TEXT [])
END AS "telephone",
CASE
WHEN data ->> 'categories' IS NOT NULL
THEN CAST(ARRAY(SELECT * FROM JSONB_ARRAY_ELEMENTS_TEXT(data -> 'categories')) AS TEXT [])
Expand Down
3 changes: 3 additions & 0 deletions pipeline/dbt/seeds/schema/labels_nationaux.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ emmaus,Emmaus,
envie,Envie,
epide,EPIDE,
espace-emploi-agric-arrco,Espace Emploi Agirc Arrco,
etal-pri,Établissement privé,
etal-pub,Établissement public,
etat,Service de l'État,
etcld,Expérimentation territoriale contre le chômage de longue durée,
fabrique-de-territoire,Fabrique de Territoire,
face,Fondation FACE,
Expand Down
4 changes: 2 additions & 2 deletions pipeline/dbt/seeds/schema/modes_accueil.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
value,label,description
a-distance,À distance,
en-presentiel,En présentiel,
a-distance,À distance,"Le service est proposé à distance, par téléphone ou internet."
en-presentiel,En présentiel,"Le service est proposé en présentiel, à l'adresse associée à ce service."
1 change: 0 additions & 1 deletion pipeline/dbt/seeds/schema/modes_orientation_accompagnateur.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ value,label,description
autre,Autre,
completer-le-formulaire-dadhesion,Compléter le formulaire d’adhésion,Compléter le formulaire d’adhésion associé.
envoyer-un-mail,Envoyer un courriel,Envoyer un courriel à l’adresse indiquée.
envoyer-un-mail-avec-des-documents-a-completer,Envoyer un courriel avec des documents à compléter,Envoyer un courriel à l’adresse indiquée avec des documents à compléter.
envoyer-un-mail-avec-une-fiche-de-prescription,Envoyer un courriel avec une fiche de prescription,Envoyer un courriel à l’adresse indiquée avec une fiche de prescription.
prendre-rdv,Prendre rendez-vous,Prendre rendez-vous auprès de la structure
telephoner,Téléphoner,Téléphoner au numéro indiqué.
1 change: 0 additions & 1 deletion pipeline/dbt/seeds/schema/thematiques.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ sante--diagnostic-et-accompagnement-a-lemployabilite,Diagnostic et accompagnemen
sante--faire-face-a-une-situation-daddiction,Faire face à une situation d’addiction,
sante--obtenir-la-prise-en-charge-de-frais-medicaux,Obtenir la prise en charge de frais médicaux,
sante--prevention-et-acces-aux-soins,"Prévention et accès aux soins (vaccination, éducation à la santé, lutte contre la tuberculose…).",
sante--sante-mental,Accompagnement des aidants,
sante--se-soigner-et-prevenir-la-maladie,Se soigner et prévenir la maladie,
sante--vie-relationnelle-et-affective,"Vie relationnelle et affective, dépistage et prévention des IST/VIH…",
se-former,Se former,
Expand Down
1 change: 0 additions & 1 deletion pipeline/dbt/seeds/schema/typologies_de_structures.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ OF,Organisme de formations,
OIL,Opérateur d’intermédiation locative,
OPCS,Organisation porteuse de la clause sociale,
PAD,Point d’Accès au Droit,
PE,Pôle emploi,
PENSION,Pension de famille / résidence accueil,
PI,Point Information (PI),
PIJ_BIJ,Points et bureaux information jeunesse (PIJ/BIJ),
Expand Down

0 comments on commit 0a7858d

Please sign in to comment.