fix fn1FA considerar rol de apoderado, fn2FA fix consulta que contaba 2 veces inconsistencia, fix modo sequential usa procesos

Author: Admin-EDE

ede/ede/checkSQLiteEDE.py

@@ -335,9 +335,9 @@ def execute(self):
                 f"Sistema ejecutandose con restrición de tiempo de {self.args.time} segundos...")
 
             if "sequential" in dir(self.args) and self.args.sequential:
-                return_dict = dict()
-                #return_dict = self.execute_sequentially(conn)
-                self.execute_sequentially(conn, return_dict)
+                #return_dict = dict()
+                #self.execute_sequentially(conn, return_dict)
+                return_dict = self.execute_parallel(conn, sequential=True)
             else:
 
                 return_dict = self.execute_parallel(conn)
@@ -374,7 +374,7 @@ def execute_sequentially(self, conn, return_dict):
         except Exception as e:
             logger.error(f"Error general en ejecución secuencial: {e}")
             return False
-    def execute_parallel(self, conn):
+    def execute_parallel(self, conn, sequential=False):
         try:
             manager = Manager()
             return_dict = manager.dict()
@@ -395,6 +395,11 @@ def execute_parallel(self, conn):
             for p in jobs:
                 logger.info(f"{p.name} iniciando...")
                 p.start()
+                if sequential:
+                    start_time = datetime.now()
+                    p.join()
+                    timediff = (datetime.now()-start_time).total_seconds()
+                    logger.info(f"function: {p.name}, time elapsed: {timediff}")
 
             while True:
                 time += 1

ede/ede/validation_functions/fn1_registro_entrega_informacion/fn1FA.py

@@ -49,6 +49,7 @@ def fn1FA(conn, return_dict):
                   AND A.RecordEndDateTime IS NULL
 		          AND B.RecordEndDateTime IS NULL
                 WHERE A.personId = ?
+                AND A.RefPersonRelationshipId = 31
                 AND B.RoleId = 15;"""
 
         # OBTENGO ID DE INCIDENTE ASOCIADO

ede/ede/validation_functions/fn2_registro_matricula/fn2FA.py

@@ -28,11 +28,11 @@ def fn2FA(conn, return_dict):
     results = []
     try:
         results = ejecutar_sql(conn, """--sql
-        select count(distinct PersonId)-(select count(distinct PersonId) from OrganizationPersonRole
-        where RoleId=6 --Estudiante
-        and ExitDate is not null)
+        select count(distinct PersonId)
         from OrganizationPersonRole
-        where  EntryDate is not null and RoleId=6  ;
+        where RoleId=6
+        and EntryDate is not null
+        and ExitDate is null   ;
         """)
     except Exception as e:
         logger.info(f"Resultado: {results} -> {str(e)}")