Control endesa MEDIDAS format

gisce · Mar 19, 2024 · 30a9a7c · 30a9a7c
1 parent b8f7cfc
commit 30a9a7c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/cchloader/adapters/medidas.py b/cchloader/adapters/medidas.py
@@ -30,6 +30,17 @@ def fix_r2(self, data):
     def fix_r3(self, data):
         data['r3'] = data.get('r3', 0)
 
+    @pre_load
+    def fix_factor_potencia(self, data):
+        factor_potencia = data.get('factor_potencia', 0.0)
+        if ',' in factor_potencia:
+            factor_potencia = factor_potencia.replace(',', '.')
+        data['factor_potencia'] = factor_potencia
+
+    @pre_load
+    def fix_tipo_factor_potencia(self, data):
+        data['tipo_factor_potencia'] = data.get('tipo_factor_potencia', 0)
+
     @pre_load
     def fix_season(self, data):
         valid_values = [0, 1]

diff --git a/cchloader/models/medidas.py b/cchloader/models/medidas.py
@@ -8,17 +8,14 @@
 
 class MedidasSchema(Schema):
     cil = fields.String(position=0, required=True)
-    year = fields.Integer(position=1, required=True)
-    month = fields.Integer(position=2, required=True)
-    day = fields.Integer(position=3, required=True)
-    hour = fields.Integer(position=4, required=True)
-    season = fields.Integer(position=5, validate=OneOf([0, 1]))
-    ae = fields.Integer(position=6, allow_none=True)
-    r2 = fields.Integer(position=7, allow_none=True)
-    r3 = fields.Integer(position=8, allow_none=True)
-    factor_potencia = fields.Float(position=8, allow_none=True)
-    tipo_factor_potencia = fields.Integer(position=9, allow_none=True)
-    tipo_lectura = fields.String(position=9, validate=OneOf(['R', 'E']))
+    datetime = fields.DateTime(position=1, format='%Y/%m/%d %H:%M:%S')
+    season = fields.Integer(position=2, validate=OneOf([0, 1]))
+    ae = fields.Integer(position=3, allow_none=True)
+    r2 = fields.Integer(position=4, allow_none=True)
+    r3 = fields.Integer(position=5, allow_none=True)
+    factor_potencia = fields.Float(position=6, allow_none=True)
+    tipo_factor_potencia = fields.Integer(position=7, allow_none=True)
+    tipo_lectura = fields.String(position=8, validate=OneOf(['R', 'E']))
 
 
 MedidasSchema()