From da4a5bf48377da0bc214f989a43edf56a87f1d44 Mon Sep 17 00:00:00 2001
From: Vilaboa <mvilaboa@gisce.net>
Date: Fri, 30 May 2025 15:30:43 +0200
Subject: [PATCH] Add states into sequence too

---
 libcnmc/cir_8_2021/FA1.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/libcnmc/cir_8_2021/FA1.py b/libcnmc/cir_8_2021/FA1.py
index 3b276390..c2e33bb5 100644
--- a/libcnmc/cir_8_2021/FA1.py
+++ b/libcnmc/cir_8_2021/FA1.py
@@ -13,6 +13,10 @@
 from shapely import wkt
 
 
+VALID_POLISSA_STATES = [
+    'tall', 'activa', 'baixa', 'modcontractual', 'impagament']
+
+
 class FA1(StopMultiprocessBased):
     def __init__(self, **kwargs):
         """
@@ -47,16 +51,13 @@ def __init__(self, **kwargs):
                 id_res_like, ['value']
             )[0]['value']
 
-        valid_polissa_states = [
-            'tall', 'activa', 'baixa', 'modcontractual', 'impagament'
-        ]
 
         mod_all_year = self.connection.GiscedataPolissaModcontractual.search(
             [
                 ("data_inici", "<=", "{}-01-01".format(self.year)),
                 ("data_final", ">=", "{}-12-31".format(self.year)),
                 ("tarifa.name", 'not ilike', '%RE%'),
-                ('polissa_id.state', 'in', valid_polissa_states)
+                ('polissa_id.state', 'in', VALID_POLISSA_STATES)
             ], 0, 0, False, {"active_test": False}
         )
         mods_ini = self.connection.GiscedataPolissaModcontractual.search(
@@ -64,7 +65,7 @@ def __init__(self, **kwargs):
                 ("data_inici", ">=", "{}-01-01".format(self.year)),
                 ("data_inici", "<=", "{}-12-31".format(self.year)),
                 ("tarifa.name", 'not ilike', '%RE%'),
-                ('polissa_id.state', 'in', valid_polissa_states)
+                ('polissa_id.state', 'in', VALID_POLISSA_STATES)
             ], 0, 0, False, {"active_test": False}
         )
         mods_fi = self.connection.GiscedataPolissaModcontractual.search(
@@ -72,7 +73,7 @@ def __init__(self, **kwargs):
                 ("data_final", ">=", "{}-01-01".format(self.year)),
                 ("data_final", "<=", "{}-12-31".format(self.year)),
                 ("tarifa.name", 'not ilike', '%RE%'),
-                ('polissa_id.state', 'in', valid_polissa_states)
+                ('polissa_id.state', 'in', VALID_POLISSA_STATES)
             ], 0, 0, False, {"active_test": False}
         )
         self.modcons_in_year = set(mods_fi + mods_ini + mod_all_year)
@@ -207,7 +208,7 @@ def get_polissa(self, cups_id):
         }
         polissa_id = polissa_obj.search([
             ('cups', '=', cups_id),
-            ('state', 'in', ['tall', 'activa', 'baixa']),
+            ('state', 'in', VALID_POLISSA_STATES),
             ('data_alta', '<=', self.ultim_dia_any),
         ], 0, 1, 'data_alta desc', context)
         return polissa_id
@@ -313,7 +314,7 @@ def get_tensio(self, cups, year, tensio_modcon):
                     search_modcon = [('id', 'in', cups['polisses']),
                                      ('data_inici', '<=', ultim_dia_any), (
                                      'polissa_id.state', 'in',
-                                     ['tall', 'activa', 'baixa'])]
+                                     VALID_POLISSA_STATES)]
                     modcons = O.GiscedataPolissaModcontractual.search(search_modcon, 0,
                         1, 'data_inici desc', {'active_test': False})
                     if modcons:
@@ -398,7 +399,7 @@ def get_baixa_cups(self, cups_id):
             ('cups', '=', cups_id),
             ('data_baixa', '>=', data_inici),
             ('data_baixa', '<', data_fi),
-            ('state', 'in', ['tall', 'activa', 'baixa']),
+            ('state', 'in', VALID_POLISSA_STATES),
         ]
         polisses_baixa_ids = polissa_obj.search(
             search_params, 0, False, False, {'active_test': False})
@@ -422,7 +423,7 @@ def get_baixa_cups(self, cups_id):
         polisses_alta_ids = polissa_obj.search(
             [('cups', '=', cups_id),
              ('data_alta', 'in', dates_alta),
-             ('state', 'in', ['tall', 'activa', 'baixa']),
+             ('state', 'in', VALID_POLISSA_STATES),
              ],
             0, False, False, {'active_test': False}
         )
@@ -477,7 +478,7 @@ def consumer(self):
         O = self.connection
         ultim_dia_any = '%s-12-31' % self.year
         search_glob = [
-            ('state', 'in', ['tall', 'activa', 'baixa']),
+            ('state', 'in', VALID_POLISSA_STATES),
             ('data_alta', '<=', ultim_dia_any),
             '|',
             ('data_baixa', '>=', ultim_dia_any),
@@ -719,7 +720,7 @@ def consumer(self):
                     search_modcon = [
                         ('id', 'in', cups['polisses']),
                         ('data_inici', '<=', ultim_dia_any),
-                        ('polissa_id.state', 'in', ['tall', 'activa', 'baixa'])
+                        ('polissa_id.state', 'in', VALID_POLISSA_STATES)
                     ]
                     modcons = None
                     if len(cups['polisses']):