Skip to content
Extraits de code Groupes Projets
Valider f36a222b rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

[REF] rework API calls following api_enedis_acc update

parent 592aaaff
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"website": "https://le-filament.com", "website": "https://le-filament.com",
"version": "16.0.1.0.0", "version": "16.0.1.0.0",
"license": "AGPL-3", "license": "AGPL-3",
"depends": ["api_enedis", "oacc", "queue_job"], "depends": ["api_enedis_acc", "oacc", "queue_job"],
"data": [ "data": [
"security/ir.model.access.csv", "security/ir.model.access.csv",
# datas # datas
......
...@@ -238,12 +238,9 @@ class AccEnedisCdc(models.Model): ...@@ -238,12 +238,9 @@ class AccEnedisCdc(models.Model):
start_datetime = self._convert_time(start_date) start_datetime = self._convert_time(start_date)
end_datetime = self._convert_time(end_date) end_datetime = self._convert_time(end_date)
curves_data = operation._get_definitive_load_curves( curves_data = operation._get_definitive_load_curves(
operation.name,
start_datetime, start_datetime,
end_datetime, end_datetime,
usage_point_id.name, usage_point_id.name,
operation.client_id,
operation.secret_id,
type_prm, type_prm,
) )
message += "Appel API terminé. Traitement des données ...\n" message += "Appel API terminé. Traitement des données ...\n"
......
...@@ -3,21 +3,19 @@ ...@@ -3,21 +3,19 @@
import logging import logging
from datetime import date from datetime import date
from odoo import _, fields, models from odoo import fields, models
from odoo.exceptions import UserError, ValidationError from odoo.exceptions import ValidationError
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
class AccOperation(models.Model): class AccOperation(models.Model):
_name = "acc.operation" _name = "acc.operation"
_inherit = ["acc.operation", "api.enedis"] _inherit = ["acc.operation", "api.enedis.acc"]
# ------------------------------------------------------ # ------------------------------------------------------
# Fields declaration # Fields declaration
# ------------------------------------------------------ # ------------------------------------------------------
client_id = fields.Char("Client ID Enedis")
secret_id = fields.Char("Secret ID Enedis")
# ------------------------------------------------------ # ------------------------------------------------------
# SQL Constraints # SQL Constraints
...@@ -94,7 +92,7 @@ class AccOperation(models.Model): ...@@ -94,7 +92,7 @@ class AccOperation(models.Model):
+ "</h1>" + "</h1>"
) )
message += "<p><strong>Appel API ...<br/>" 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/>" message += "<p><strong>Appel API terminé<br/>" "Traitement des données ...<br/>"
usage_points = perimeter_data.get("usage_points") usage_points = perimeter_data.get("usage_points")
...@@ -241,12 +239,3 @@ class AccOperation(models.Model): ...@@ -241,12 +239,3 @@ class AccOperation(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
# Business methods # 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."
)
)
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter