fix caricamenti

utils/csv/loaders.py

@@ -1,5 +1,5 @@
 from utils.database.loader_action import load_data, update_status, unlock
-from utils.database import DATA_LOADED
+from utils.database import WorkflowFlags
 from utils.csv.data_preparation import make_pipe_sep_matrix, make_ain_din_matrix, make_channels_matrix, make_tlp_matrix, make_gd_matrix, make_musa_matrix
 
 import logging
@@ -32,13 +32,13 @@ async def main_loader(cfg: object, id: int, pool: object, action: str) -> None:
         logger.info("matrice valori creata")
         # Load the data into the database
         if await load_data(cfg, matrice_valori, pool):
-            await update_status(cfg, id, DATA_LOADED, pool)
+            await update_status(cfg, id, WorkflowFlags.DATA_LOADED, pool)
             await unlock(cfg, id, pool)
     else:
         logger.warning(f"Action '{action}' non riconosciuta.")
 
 
-async def get_next_csv_atomic(pool, table_name, status):
+async def get_next_csv_atomic(pool, table_name, status, next_status):
     """Preleva atomicamente il prossimo CSV da elaborare"""
     async with pool.acquire() as conn:
         # IMPORTANTE: Disabilita autocommit per questa transazione
@@ -47,14 +47,17 @@ async def get_next_csv_atomic(pool, table_name, status):
         try:
             async with conn.cursor() as cur:
                 # Usa SELECT FOR UPDATE per lock atomico
+
                 await cur.execute(f"""
                     SELECT id, unit_type, tool_type, unit_name, tool_name
                     FROM {table_name}
-                    WHERE locked = 0 AND status = %s
+                    WHERE locked = 0
+                        AND ((status & %s) > 0 OR %s = 0)
+                        AND (status & %s) = 0
                     ORDER BY id
                     LIMIT 1
                     FOR UPDATE SKIP LOCKED
-                """, (status,))
+                """, (status, status, next_status))
 
                 result = await cur.fetchone()
                 if result: