Skip to content

Commit

Permalink
fix-valentin-review
Browse files Browse the repository at this point in the history
  • Loading branch information
@hlecuyer
hlecuyer committed Oct 31, 2024
1 parent 6210edf commit f3fb689
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 92 deletions.
2 changes: 1 addition & 1 deletion deployment/MIGRATION.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Here is the corrected and formatted version of your migration process:

1. **Connect via SSH to the instance**
```bash
ssh root@163.172.171.247
ssh root@@<INSTANCE_DNS>
```
2. **Install PostgreSQL 17**
```bash
Expand Down
2 changes: 1 addition & 1 deletion pipeline/dbt/models/intermediate/sources/agefiph/int_agefiph__services.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ final AS (
ARRAY[
'personnes-en-situation-de-handicap'
] AS "profils",
'personnes en situation de handicap' AS "profils_precisions",
NULL AS "profils_precisions",
ARRAY(
SELECT di_type_by_agefiph_type.type_
FROM di_type_by_agefiph_type
Expand Down
2 changes: 1 addition & 1 deletion pipeline/dbt/models/intermediate/sources/france_travail/int_france_travail__services.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ final AS (
services.presentation_resume AS "presentation_resume",
services.prise_rdv AS "prise_rdv",
services.profils AS "profils",
ARRAY_TO_STRING(services.profils, ', ') AS "profils_precisions",
NULL AS "profils_precisions",
services.pre_requis AS "pre_requis",
services.recurrence AS "recurrence",
services.thematiques AS "thematiques",
Expand Down
2 changes: 1 addition & 1 deletion pipeline/dbt/models/intermediate/sources/fredo/int_fredo__services.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ final AS (
'La Réunion' AS "zone_diffusion_nom",
NULL AS "recurrence",
fredo_structures.last_update AS "date_maj",
CAST((UUID(MD5(fredo_structures.id || COALESCE(fredo_services.value, '')))) AS TEXT) AS "id",
CAST(UUID(MD5(fredo_structures.id || COALESCE(fredo_services.value, ''))) AS TEXT) AS "id",
CAST(NULL AS TEXT []) AS "pre_requis",
CAST(NULL AS BOOLEAN) AS "cumulable",
CAST(NULL AS TEXT []) AS "justificatifs",
Expand Down
4 changes: 2 additions & 2 deletions ...dbt/models/intermediate/sources/mediation_numerique/int_mediation_numerique__services.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final AS (
services.prise_rdv AS "prise_rdv",
services.frais AS "frais",
services.profils AS "profils",
ARRAY_TO_STRING(services.profils, ', ') AS "profils_precisions",
NULL AS "profils_precisions",
services.structure_id AS "structure_id",
services.thematiques AS "thematiques",
services._di_source_id AS "source",
Expand All @@ -47,7 +47,7 @@ final AS (
CAST(NULL AS BOOLEAN) AS "cumulable",
CAST(NULL AS TEXT []) AS "justificatifs",
CAST(NULL AS DATE) AS "date_suspension",
CAST((structures.date_maj) AS DATE) AS "date_maj",
CAST(structures.date_maj AS DATE) AS "date_maj",
CAST(NULL AS DATE) AS "date_creation",
CASE
WHEN structures.code_insee LIKE '97%' THEN LEFT(structures.code_insee, 3)
Expand Down
2 changes: 1 addition & 1 deletion pipeline/dbt/models/intermediate/sources/monenfant/int_monenfant__services.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ final AS (
NULL AS "prise_rdv",
NULL AS "frais_autres",
ARRAY['familles-enfants'] AS "profils",
'famille enfant' AS "profils_precisions",
NULL AS "profils_precisions",
id AS "structure_id",
_di_source_id AS "source",
TRUE AS "cumulable",
Expand Down
2 changes: 1 addition & 1 deletion pipeline/dbt/models/intermediate/sources/reseau_alpha/int_reseau_alpha__services.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ final AS (
NULL
) AS "modes_orientation_beneficiaire",
ARRAY['public-langues-etrangeres'] AS "profils",
'public langues etrangeres' AS "profils_precisions",
NULL AS "profils_precisions",
ARRAY['formation'] AS "types",
CAST(NULL AS TEXT []) AS "frais"
FROM formations
Expand Down
109 changes: 28 additions & 81 deletions pipeline/dbt/models/intermediate/sources/soliguide/int_soliguide__services.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,12 @@ phones AS (
SELECT * FROM {{ ref('stg_soliguide__phones') }}
),

administrative AS (
SELECT * FROM {{ ref('stg_soliguide__administrative') }}
),

gender AS (
SELECT * FROM {{ ref('stg_soliguide__gender') }}
),

familliale AS (
SELECT * FROM {{ ref('stg_soliguide__familliale') }}
publics AS (
SELECT * FROM {{ ref('stg_soliguide__lieux__publics__administrative') }}
UNION ALL
SELECT * FROM {{ ref('stg_soliguide__lieux__publics__gender') }}
UNION ALL
SELECT * FROM {{ ref('stg_soliguide__lieux__publics__familliale') }}
),

thematiques AS (
Expand Down Expand Up @@ -74,70 +70,30 @@ di_thematique_by_soliguide_category_code AS (
) AS x (category, thematique)
),

mapping_administrative AS (
SELECT x.*
FROM (
profils AS (
SELECT
publics.lieu_id,
ARRAY_TO_STRING(ARRAY_AGG(DISTINCT di_mapping.traduction), ',') AS traduction,
ARRAY_REMOVE(ARRAY_AGG(di_mapping.profils), NULL) AS profils
FROM
publics
LEFT JOIN (
VALUES
('regular', 'en situation reguliere', NULL),
-- administrative status
('regular', 'en situation régulière', NULL),
('asylum', 'demandeur asile', 'personnes-de-nationalite-etrangere'),
('undocumented', 'sans papier', 'personnes-de-nationalite-etrangere')
) AS x (category, traduction, profils)
),

mapping_gender AS (
SELECT x.*
FROM (
VALUES
('men', 'homme', 'adultes'),
('women', 'femme', 'femmes')
) AS x (category, traduction, profils)
),

mapping_familliale AS (
SELECT x.*
FROM (
VALUES
('isolated', 'isole', NULL),
('undocumented', 'sans-papiers', 'personnes-de-nationalite-etrangere'),
-- family status
('isolated', 'isolé', NULL),
('family', 'famille', 'familles-enfants'),
('couple', 'couple', 'familles-enfants'),
('pregnent', 'enceinte', 'familles-enfants')
) AS x (category, traduction, profils)
),

profils_administrative AS (
SELECT
administrative.lieu_id,
ARRAY_TO_STRING(ARRAY_AGG(mapping_administrative.traduction), ',') AS traduction,
ARRAY_AGG(mapping_administrative.profils) AS profils
FROM
administrative
LEFT JOIN mapping_administrative ON administrative.value = mapping_administrative.category
GROUP BY
administrative.lieu_id
),

profils_familliale AS (
SELECT
familliale.lieu_id,
ARRAY_TO_STRING(ARRAY_AGG(mapping_familliale.traduction), ',') AS traduction,
ARRAY_AGG(mapping_familliale.profils) AS profils
FROM
familliale
LEFT JOIN mapping_familliale ON familliale.value = mapping_familliale.category
GROUP BY
familliale.lieu_id
),

profils_gender AS (
SELECT
gender.lieu_id,
ARRAY_TO_STRING(ARRAY_AGG(mapping_gender.traduction), ',') AS traduction,
ARRAY_AGG(mapping_gender.profils) AS profils
FROM
gender
LEFT JOIN mapping_gender ON gender.value = mapping_gender.category
('pregnent', 'enceinte', 'familles-enfants'),
-- gender status
('men', 'homme', NULL),
('women', 'femme', 'femmes')
) AS di_mapping (category, traduction, profils) ON publics.value = di_mapping.category
GROUP BY
gender.lieu_id
publics.lieu_id
),

filtered_phones AS (
Expand Down Expand Up @@ -191,15 +147,8 @@ final AS (
open_services._di_source_id AS "source",
CAST(NULL AS TEXT []) AS "types",
NULL AS "prise_rdv",
ARRAY_REMOVE(
profils_administrative.profils
|| profils_familliale.profils
|| profils_gender.profils,
NULL
) AS "profils",
profils_administrative.traduction || ' '
|| profils_familliale.traduction || ' '
|| profils_gender.traduction AS "profils_precisions",
profils.profils AS "profils",
profils.traduction AS "profils_precisions",
CAST(NULL AS TEXT []) AS "pre_requis",
TRUE AS "cumulable",
CAST(NULL AS TEXT []) AS "justificatifs",
Expand Down Expand Up @@ -292,9 +241,7 @@ final AS (
LEFT JOIN lieux ON open_services.lieu_id = lieux.id
LEFT JOIN categories ON open_services.category = categories.code
LEFT JOIN filtered_phones ON open_services.lieu_id = filtered_phones.lieu_id
LEFT JOIN profils_administrative ON open_services.lieu_id = profils_administrative.lieu_id
LEFT JOIN profils_familliale ON open_services.lieu_id = profils_familliale.lieu_id
LEFT JOIN profils_gender ON open_services.lieu_id = profils_gender.lieu_id
LEFT JOIN profils AS profils ON lieux.id = profils.lieu_id
ORDER BY open_services.id
)

Expand Down
6 changes: 3 additions & 3 deletions pipeline/dbt/models/staging/sources/soliguide/_soliguide__models.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ models:
field: lieu_id


- name: stg_soliguide__familliale
- name: stg_soliguide__lieux__publics__familliale
columns:
- name: lieu_id
data_tests:
Expand All @@ -103,7 +103,7 @@ models:
- dbt_utils.not_empty_string
- accepted_values:
values: ['isolated', 'family', 'pregnant', 'couple']
- name: stg_soliguide__gender
- name: stg_soliguide__lieux__publics__gender
columns:
- name: lieu_id
data_tests:
Expand All @@ -117,7 +117,7 @@ models:
- dbt_utils.not_empty_string
- accepted_values:
values: ['men', 'women']
- name: stg_soliguide__administrative
- name: stg_soliguide__lieux__publics__administrative
columns:
- name: lieu_id
data_tests:
Expand Down
0 ...liguide/stg_soliguide__administrative.sql → ...guide__lieux__publics__administrative.sql
View file
File renamed without changes.
0 ...s/soliguide/stg_soliguide__familliale.sql → ...soliguide__lieux__publics__familliale.sql
View file
File renamed without changes.
0 ...urces/soliguide/stg_soliguide__gender.sql → ...stg_soliguide__lieux__publics__gender.sql
View file
File renamed without changes.

0 comments on commit f3fb689

Please sign in to comment.