From 3b98c8d88871d629796fbe1212a314770871af36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Tue, 8 Apr 2025 18:32:40 +0200
Subject: [PATCH] [REF] simplify mixin

---
 models/acc_operation.py               | 2 +-
 wizard/acc_operation_import_wizard.py | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/models/acc_operation.py b/models/acc_operation.py
index d29e4ac..e846519 100644
--- a/models/acc_operation.py
+++ b/models/acc_operation.py
@@ -144,7 +144,7 @@ class AccOperation(models.Model):
             # Vérification si des données existent déjà
             # pour cet intervalle de date
             rec_ids = self.env[model].search(
-                self.env[model]._get_curves_domain(
+                self.env[model].get_curves_domain(
                     acc_operation_id=self.id,
                     start_date=date_begin_obj,
                     end_date=date_end_obj,
diff --git a/wizard/acc_operation_import_wizard.py b/wizard/acc_operation_import_wizard.py
index 5f2bc24..6909f2e 100644
--- a/wizard/acc_operation_import_wizard.py
+++ b/wizard/acc_operation_import_wizard.py
@@ -77,7 +77,7 @@ class AccOperationImportWizard(models.TransientModel):
 
         # Vérification si des données existent déjà pour cet intervalle de date
         rec_ids = self.env[self.model].search(
-            self.env[self.model]._get_curves_domain(
+            self.env[self.model].get_curves_domain(
                 acc_operation_id=self.operation_id.id,
                 start_date=date_begin_obj,
                 end_date=date_end_obj,
@@ -213,12 +213,17 @@ class AccOperationImportWizard(models.TransientModel):
 
                 _logger.debug(f"Processing file {file.name} - Generating daily curves")
                 message += "Génération des données agrégées au jour<br/>"
-                self.env["acc.enedis.cdc.day"].generate(
+                self.env["acc.enedis.cdc.day"].populate_daily_aggregated_data(
                     acc_operation_id=self.operation_id.id,
                     acc_counter_id=counter_id,
                     start_date=start_date,
                     end_date=end_date,
                 )
+                self.env["acc.enedis.cdc.prorata"].populate_daily_prorata(
+                    acc_operation_id=self.operation_id.id,
+                    start_date=start_date,
+                    end_date=end_date,
+                )
 
             message += "Fin de l'import des données OK<br/>"
             # Suppression du fichier après création des enregistrements
-- 
GitLab