Merge branch 'developer_ca' into 'developer'

Update action-exclude-records-v1

See merge request !4

app/main/engine/enum/CodeResponseEnum.py

@@ -2,7 +2,7 @@ from enum import Enum
 
 
 class CodeResponseEnum(Enum):
-    SUCCESS = 200
+    OK = 200
     MAX_EXECUTION_ERROR = 601
     BD_INPUT_ERROR = 602
     SCRIPT_ERROR = 603

app/main/engine/enum/StatusEnum.py

@@ -2,5 +2,5 @@ from enum import Enum
 
 
 class StatusEnum(Enum):
-    SUCCESS = 200
+    OK = 200
     ERROR = 609

app/main/engine/service/EngineService.py

@@ -20,7 +20,7 @@ class EngineService:
             self.app.logger.info(f"Ejecuciones simultáneas actualmente: {self.executions}")
             if self.executions > self.max_executions:
                 self.app.logger.info(f"Máxima de ejecuciones en paralelo alcanzado. Máximo: {self.max_executions}")
-                response = {'status': StatusEnum.ERROR.name.lower(),
+                response = {'status': StatusEnum.ERROR.name,
                             'message': DescResponseEnum.MAX_EXECUTION_ERROR.value}
             else:
                 process = Process(self.app, self.descriptor)

app/main/engine/service/Process.py

@@ -20,7 +20,7 @@ class Process:
         self.utils = Utils(app)
 
     def run(self) -> Dict[str, Any]:
-        status, status_description = StatusEnum.SUCCESS, ""
+        status, status_description = StatusEnum.OK, ""
         try:
             # Obteniendo la conexión a la BD
             db_params = cfg.db_params
@@ -45,10 +45,14 @@ class Process:
 
             obj_script.parser(self.descriptor)
 
+            # Iniciando process
+            self.app.logger.info(f"Iniciando procesamiento de script")
             obj_script.process(source)
 
+            # Guardando resultado
+            self.app.logger.info(f"Generado y guardando resultado")
             response = obj_script.response()
-
+            # response.show()
             result = self.utils.create_result(response, self.descriptor)
             save = self.utils.save_result(result, self.descriptor, db_session)
             if save["status"] == StatusEnum.ERROR.name:

app/main/engine/util/Utils.py

@@ -49,11 +49,11 @@ class Utils:
     def create_response(self, codeEnum: Enum, detail: str = "") -> Dict[str, Any]:
         response = {"statusCode": codeEnum.value}
 
-        if codeEnum.value == StatusEnum.SUCCESS.value:
-            response.update({'status': StatusEnum.SUCCESS.name.lower(), 'path': detail})
+        if codeEnum.value == StatusEnum.OK.value:
+            response.update({'status': StatusEnum.OK.name, 'detail': detail})
         else:
             description = DescResponseEnum[codeEnum.name].value
-            response.update({'status': StatusEnum.ERROR.name.lower(), 'message': description,
+            response.update({'status': StatusEnum.ERROR.name, 'message': description,
                              'detail': detail})
         return response
 
@@ -73,10 +73,10 @@ class Utils:
 
             used_list = transaction_counterpart_match if exclude_pivot else transaction_pivot_match
 
-            if data.count() == 0:
+            if data.empty:
                 self.app.logger.info(f"El dataframe resultado esta vacio")
             else:
-                for i in data.collect():
+                for idx, i in data.iterrows():
                     input_data = {}
                     key_transaction = None
                     key_group_pivot = None
@@ -104,7 +104,7 @@ class Utils:
                     input_data["exclude-ids"] = str(i[FixedFieldsEnum.LISTA_DIFF.value])
                     input_data["difference-amount"] = str(i[FixedFieldsEnum.DIFF.value])
                     result.append(input_data)
-            response['status'] = StatusEnum.SUCCESS.value
+            response['status'] = StatusEnum.OK.value
             response["detail"] = result
         except Exception as e:
             self.app.logger.error(f"Error al crear el diccionario de resultados. {e}")
@@ -130,7 +130,7 @@ class Utils:
             )
             session.add(result_obj)
             session.commit()
-            response['status'] = StatusEnum.SUCCESS.name
+            response['status'] = StatusEnum.OK.name
         except Exception as e:
             session.rollback()
             response["status"] = StatusEnum.ERROR.name