diff --git a/wizard/acc_operation_import_wizard.py b/wizard/acc_operation_import_wizard.py index 02996ce19fd1fdb6bd4d76bf4f14e3b6ac8b9eac..2a160a87890c683006eaa180a3f3e095ea051842 100644 --- a/wizard/acc_operation_import_wizard.py +++ b/wizard/acc_operation_import_wizard.py @@ -3,6 +3,7 @@ import base64 import csv import io +import logging from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta @@ -13,6 +14,8 @@ from odoo.osv import expression from odoo.addons.api_connector.tools.date_utils import local_to_utc from odoo.addons.oacc.models.acc_enedis_cdc_day import COMP_DATA_TYPE_MAP +_logger = logging.getLogger(__name__) + class AccOperationImportWizard(models.TransientModel): _name = "acc.operation.import.wizard" @@ -83,16 +86,26 @@ class AccOperationImportWizard(models.TransientModel): ("acc_operation_id", "=", self.operation_id.id), ("acc_counter_id", "=", counter_id), ] - domain_cdc = expression.AND([domain_all, [ - ("date_slot", ">=", start_datetime), - ("date_slot", "<", end_datetime), - ("comp_data_type", "=", computed_data_type), - ]]) - domain_cdc_day = expression.AND([domain_all, [ - ("date_slot", ">=", date_begin_obj.date()), - ("date_slot", "<", date_end_obj.date()), - ("comp_data_type", "=", COMP_DATA_TYPE_MAP[computed_data_type]), - ]]) + domain_cdc = expression.AND( + [ + domain_all, + [ + ("date_slot", ">=", start_datetime), + ("date_slot", "<", end_datetime), + ("comp_data_type", "=", computed_data_type), + ], + ] + ) + domain_cdc_day = expression.AND( + [ + domain_all, + [ + ("date_slot", ">=", date_begin_obj.date()), + ("date_slot", "<", date_end_obj.date()), + ("comp_data_type", "=", COMP_DATA_TYPE_MAP[computed_data_type]), + ], + ] + ) rec_ids = self.env[self.model].search(domain_cdc) if rec_ids: message += "Suppression des enregistrements existants de courbes ... <br/>" @@ -102,11 +115,15 @@ class AccOperationImportWizard(models.TransientModel): if self.model == "acc.enedis.cdc": day_rec_ids = self.env["acc.enedis.cdc.day"].search(domain_cdc_day) if day_rec_ids: - message += "Suppression des enregistrements existants de courbes "\ + message += ( + "Suppression des enregistrements existants de courbes " "agrégées au jour ... <br/>" + ) day_rec_ids.unlink() - message += "Suppression des enregistrements existants de courbes "\ + message += ( + "Suppression des enregistrements existants de courbes " "agrégées au jour OK <br/>" + ) return message @@ -118,9 +135,9 @@ class AccOperationImportWizard(models.TransientModel): date_end_str = data_filename[2] date_format = "%d%m%Y" date_begin_obj = datetime.strptime(date_begin_str, date_format).date() - date_end_obj = datetime.strptime(date_end_str, date_format) + relativedelta( - days=1 - ).date() + date_end_obj = ( + datetime.strptime(date_end_str, date_format) + relativedelta(days=1).date() + ) # Update partner_id for retrieved cdc domain = [ ("acc_operation_id", "=", self.operation_id.id), @@ -150,6 +167,7 @@ class AccOperationImportWizard(models.TransientModel): ) for file in self.attachment_ids: + _logger.debug(f"Processing file {file.name} - Start") message += ( "<p><strong>Fichier " + file.name @@ -215,11 +233,14 @@ class AccOperationImportWizard(models.TransientModel): } ) + _logger.debug(f"Processing file {file.name} - Curves creation") message += "Création des courbes<br/>" self.create_curve(curves_to_create) + _logger.debug(f"Processing file {file.name} - Update partner_id on curves") message += "Mise à jour du contact associé aux courbes<br/>" self._update_partner_id(data_filename, counter_id) + _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( acc_operation_id=self.operation_id.id, @@ -230,11 +251,11 @@ class AccOperationImportWizard(models.TransientModel): message += "Fin de l'import des données OK<br/>" # Suppression du fichier après création des enregistrements + _logger.debug(f"Processing file {file.name} - Remove file") message += "Suppression du fichier " + file.name + " ...<br/>" file.unlink() message += "Suppression OK </p>" - message += "<h1>Fin import manuel: " + str(fields.Datetime.now()) + "</h1>" # Logs information logs log_id = self.env["acc.logs"].create(