diff --git a/nupes/scripts/legislatives2024/import_resultats.py b/nupes/scripts/legislatives2024/import_resultats.py index 30d7789..87f0be4 100644 --- a/nupes/scripts/legislatives2024/import_resultats.py +++ b/nupes/scripts/legislatives2024/import_resultats.py @@ -15,7 +15,7 @@ def importer_resultats_bv(engine: Engine, verbose: bool = False) -> None: with Session(engine) as session: candidats = {(candidat.circonscription_id, candidat.numero): candidat for candidat in session.execute(select(CandidatLegislatives2024)).scalars().all()} - bv_ids = {(bv.commune_code, bv.code_bureau): bv.id + bv_ids = {(bv.commune_code, bv.code_bureau): bv for bv in session.execute(select(BureauVote)).scalars().all()} for tour, file_url in tours: @@ -49,10 +49,9 @@ def importer_resultats_bv(engine: Engine, verbose: bool = False) -> None: if (com_code, bv_code) not in bv_ids: print(f"Bureau de vote {com_code}_{bv_code} non trouvé") continue - bv_id = bv_ids[(com_code, bv_code)] - - circo_code = row['Code circonscription législative'][-2:] - circo_id = f"{dpt_code.zfill(2)}-{circo_code.zfill(2)}" + bv = bv_ids[(com_code, bv_code)] + bv_id = bv.id + circo_id = bv.circo_code resultats_bv = session.execute(select(ResultatsBureauVoteLegislatives2024) .filter_by(bv_id=bv_id)).scalar_one_or_none()