-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix directeurs_administration_centrale on corrige directeurs_administration_centrale fix directeurs_administration_centrale (2) * Cohabitation df1-df3 + fix df3_chantier (#671) * dbt.model.new: df1_indic et df1_ch Ajout de ces models pour changer facilement les tables d'exposition (indicateur et chantier) * dbt.model.new: df1_indic et df1_ch Ajout de ces models pour changer facilement les tables d'exposition (indicateur et chantier) * fix empty array * fix: directions_administration_centrale on récupère correctement les directions_administration_centrale à l'aide de la table metadata_porteur et non plus dans la colonne porteur_shorts_DAC de metadata_chantier qui était présente pour information donc sur laquelle il ne faut pas se baser. * replace dy dbt ref * dbt.model.new: df1_indic et df1_ch Ajout de ces models pour changer facilement les tables d'exposition (indicateur et chantier) * fix empty array * fix: directions_administration_centrale on récupère correctement les directions_administration_centrale à l'aide de la table metadata_porteur et non plus dans la colonne porteur_shorts_DAC de metadata_chantier qui était présente pour information donc sur laquelle il ne faut pas se baser. * replace dy dbt ref * update dbt tests * fix tests issue: dbt-labs/dbt-core#3229 solution: given by dbt cli when error * hotfix: Revert "feat: ajout de la météo dans import massif de commentaires (000)" This reverts commit 526bfc6. * compare ta_ch et ta_indic * compute_ta_indic: add 2 rules 2 rules: - si hausse et va>=vc -> 100% - si baisse et va<=vc -> 100% * fix: handle ta=nouveau_ta then ratio will be 0 * update dump scripts * Update .gitignore * Update README.md * update migration process
- Loading branch information
Showing
63 changed files
with
411 additions
and
225 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
data_management/data_factory/models/analysis/compare_ta_chantier.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
with compare as (select | ||
a.id, a.territoire_code, a.taux_avancement as ta, | ||
b.taux_avancement as nouveau_ta | ||
from df1_chantier a | ||
left join df3_chantier b on a.id=b.id and a.territoire_code=b.territoire_code | ||
order by id, territoire_code), | ||
compute_ratio as ( | ||
select *, | ||
case | ||
-- Both TA are null | ||
when coalesce(ta,nouveau_ta) is null then 0 | ||
-- Only old_ta is null | ||
when (ta is null) or (nouveau_ta is null) then null | ||
when ta=0 and nouveau_ta=0 then 0 | ||
when ta=0 and nouveau_ta<>0 then null | ||
when nouveau_ta-ta>=0 then (nouveau_ta-ta)/ta | ||
when nouveau_ta-ta<0 then (ta-nouveau_ta)/ta | ||
else 100000 | ||
end as ratio | ||
from compare), | ||
set_to_buckets as ( | ||
|
||
|
||
select *, | ||
case | ||
when ratio = 0 then '1. exact' | ||
when ratio < 0.01 then '2. approx' | ||
when ratio < 0.2 then '3. <20' | ||
when ratio > 1 then '5. >100' | ||
else '4. 20<x<100' | ||
end as category | ||
|
||
|
||
from compute_ratio) | ||
|
||
|
||
--select category, count(*) from set_to_buckets group by category order by category | ||
|
||
|
||
|
||
select * from set_to_buckets where category like '4. %' order by chantier_id, id, territoire_code |
41 changes: 41 additions & 0 deletions
41
data_management/data_factory/models/analysis/compare_ta_indic.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
with compare as (select | ||
a.chantier_id, a.id, a.territoire_code, a.date_valeur_actuelle, a.objectif_taux_avancement as ta, | ||
b.objectif_taux_avancement as nouveau_ta | ||
from df1_indicateur a | ||
left join df3_indicateur b on a.id=b.id and a.territoire_code=b.territoire_code | ||
order by chantier_id, id, territoire_code), | ||
compute_ratio as ( | ||
select *, | ||
case | ||
-- Both TA are null | ||
when coalesce(ta,nouveau_ta) is null then 0 | ||
-- Only old_ta is null | ||
when (ta is null) or (nouveau_ta is null) then null | ||
when ta=0 and nouveau_ta=0 then 0 | ||
when ta=0 and nouveau_ta<>0 then null | ||
when nouveau_ta-ta>=0 then (nouveau_ta-ta)/ta | ||
when nouveau_ta-ta<0 then (ta-nouveau_ta)/ta | ||
else 100000 | ||
end as ratio | ||
from compare), | ||
set_to_buckets as ( | ||
|
||
|
||
select *, | ||
case | ||
when ratio = 0 then '1. exact' | ||
when ratio < 0.01 then '2. approx' | ||
when ratio < 0.2 then '3. <20' | ||
when ratio > 1 then '5. >100' | ||
else '4. 20<x<100' | ||
end as category | ||
|
||
|
||
from compute_ratio) | ||
|
||
|
||
--select category, count(*) from set_to_buckets group by category order by category | ||
|
||
|
||
|
||
select * from set_to_buckets where category like '4. %' order by chantier_id, id, territoire_code |
19 changes: 15 additions & 4 deletions
19
data_management/data_factory/models/df3/4_compute/compute_ta_indic.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.