From f36a222b3e01c9040eb03ab42f18ba989dc52166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com> Date: Sun, 11 Feb 2024 21:29:22 +0100 Subject: [PATCH] [REF] rework API calls following api_enedis_acc update --- __manifest__.py | 2 +- models/acc_enedis_cdc.py | 3 --- models/acc_operation.py | 19 ++++--------------- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/__manifest__.py b/__manifest__.py index 309627a..fbfc0d5 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -5,7 +5,7 @@ "website": "https://le-filament.com", "version": "16.0.1.0.0", "license": "AGPL-3", - "depends": ["api_enedis", "oacc", "queue_job"], + "depends": ["api_enedis_acc", "oacc", "queue_job"], "data": [ "security/ir.model.access.csv", # datas diff --git a/models/acc_enedis_cdc.py b/models/acc_enedis_cdc.py index aefbdc9..2daaaab 100644 --- a/models/acc_enedis_cdc.py +++ b/models/acc_enedis_cdc.py @@ -238,12 +238,9 @@ class AccEnedisCdc(models.Model): start_datetime = self._convert_time(start_date) end_datetime = self._convert_time(end_date) curves_data = operation._get_definitive_load_curves( - operation.name, start_datetime, end_datetime, usage_point_id.name, - operation.client_id, - operation.secret_id, type_prm, ) message += "Appel API terminé. Traitement des données ...\n" diff --git a/models/acc_operation.py b/models/acc_operation.py index 65edb73..b6f14e8 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -3,21 +3,19 @@ import logging from datetime import date -from odoo import _, fields, models -from odoo.exceptions import UserError, ValidationError +from odoo import fields, models +from odoo.exceptions import ValidationError _logger = logging.getLogger(__name__) class AccOperation(models.Model): _name = "acc.operation" - _inherit = ["acc.operation", "api.enedis"] + _inherit = ["acc.operation", "api.enedis.acc"] # ------------------------------------------------------ # Fields declaration # ------------------------------------------------------ - client_id = fields.Char("Client ID Enedis") - secret_id = fields.Char("Secret ID Enedis") # ------------------------------------------------------ # SQL Constraints @@ -94,7 +92,7 @@ class AccOperation(models.Model): + "</h1>" ) message += "<p><strong>Appel API ...<br/>" - perimeter_data = self._get_perimeter(self.name, self.client_id, self.secret_id) + perimeter_data = self._get_perimeter() message += "<p><strong>Appel API terminé<br/>" "Traitement des données ...<br/>" usage_points = perimeter_data.get("usage_points") @@ -241,12 +239,3 @@ class AccOperation(models.Model): # ------------------------------------------------------ # Business methods # ------------------------------------------------------ - def _check_access_api(self): - if not self.client_id and not self.secret_id: - raise UserError( - _( - "L'identifiant et la clé de l'opération pour l'utilisation de " - "l'API Enedis ne sont pas renseignées. " - "Veuillez les renseigner dans l'onglet API Enedis." - ) - ) -- GitLab