Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

import des champs other_effects et other_conditions des déclarations historiques #1574

Merged
merged 5 commits into from
Feb 4, 2025
Merged

import des champs other_effects et other_conditions des déclarations historiques #1574

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb15305
add other_conditions and other_effects import
Jan 31, 2025
1cce660
move simple files outside of many_to_many function
Jan 31, 2025
90fbb41
keep other in many_to_many lists
Jan 31, 2025
2b87bea
Merge branch 'staging' into other_effects
Feb 4, 2025
4beb9e4
add some table in setUp of tests
Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 32 additions & 30 deletions data/etl/teleicare_history/extractor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,21 +212,6 @@ def convert_str_date(value, aware=False):
}


MANY_TO_MANY_PRODUCT_MODELS_MATCHING = {
"effects": {"teleIcare_model": IcaEffetDeclare, "teleIcare_pk": "objeff_ident", "CA_model": Effect},
"conditions_not_recommended": {
"teleIcare_model": IcaPopulationRisqueDeclaree,
"teleIcare_pk": "poprs_ident",
"CA_model": Condition,
},
"populations": {
"teleIcare_model": IcaPopulationCibleDeclaree,
"teleIcare_pk": "popcbl_ident",
"CA_model": Population,
},
}


def create_declared_plant(declaration, teleIcare_plant, active):
declared_plant = DeclaredPlant(
declaration=declaration,
Expand Down Expand Up @@ -279,21 +264,24 @@ def add_product_info_from_teleicare_history(declaration, vrsdecl_ident):
Il est nécessaire que les objets soient enregistrés en base (et aient obtenu un id) grâce à la fonction
`create_declaration_from_teleicare_history` pour updater leurs champs ManyToMany.
"""
# TODO: other_conditions=conditions_not_recommended,
# TODO: other_effects=
for CA_field_name, struct in MANY_TO_MANY_PRODUCT_MODELS_MATCHING.items():
# par exemple Declaration.populations
CA_field = getattr(declaration, CA_field_name)
# TODO: utiliser les dataclass ici
pk_field = struct["teleIcare_pk"]
CA_model = struct["CA_model"]
teleIcare_model = struct["teleIcare_model"]
CA_field.set(
[
CA_model.objects.get(siccrf_id=getattr(TI_object, pk_field))
for TI_object in (teleIcare_model.objects.filter(vrsdecl_ident=vrsdecl_ident))
]
)
declaration.effects.set(
[
Effect.objects.get(siccrf_id=TIcare_effect.objeff_ident)
for TIcare_effect in IcaEffetDeclare.objects.filter(vrsdecl_ident=vrsdecl_ident)
]
)
declaration.conditions_not_recommended.set(
[
Condition.objects.get(siccrf_id=TIcare_condition.poprs_ident)
for TIcare_condition in IcaPopulationRisqueDeclaree.objects.filter(vrsdecl_ident=vrsdecl_ident)
]
)
declaration.populations.set(
[
Population.objects.get(siccrf_id=TIcare_population.popcbl_ident)
for TIcare_population in IcaPopulationCibleDeclaree.objects.filter(vrsdecl_ident=vrsdecl_ident)
]
)


@transaction.atomic
Expand Down Expand Up @@ -424,6 +412,20 @@ def create_declaration_from_teleicare_history():
if latest_ica_declaration.dcl_date_fin_commercialisation
else DECLARATION_STATUS_MAPPING[latest_ica_version_declaration.stattdcl_ident],
)
# aucun de ces champs `other_` n'est rempli dans Teleicare
# IcaPopulationCibleDeclaree.vrspcb_popcible_autre n'est pas importé
other_effects = IcaEffetDeclare.objects.filter(
vrsdecl_ident=latest_ica_version_declaration.vrsdecl_ident,
objeff_ident=4, # Autre
)
if other_effects.exists():
declaration.other_effects = other_effects.first().vrs_autre_objectif
other_conditions = IcaPopulationRisqueDeclaree.objects.filter(
vrsdecl_ident=latest_ica_version_declaration.vrsdecl_ident,
poprs_ident=6, # Autre
)
if other_conditions.exists():
declaration.other_conditions = other_conditions.first().vrsprs_poprisque_autre

try:
with suppress_autotime(declaration, ["creation_date", "modification_date"]):
Expand Down
Loading