@pxp-nd/flow 1.0.57 → 1.0.59

package/dist/controllers/Flow.js

@@ -90,6 +90,7 @@ let Flow = class Flow extends core_1.Controller {
         Object.assign(newFlow, flowToCopy);
         newFlow.name = params.name;
         newFlow.description = params.description;
+        newFlow.status = 'off';
         const insertNewFlow = await (0, core_1.__)(manager.save(Flow_1.default, newFlow));
         // create the nodes
         // get the first node "the trigger node"
@@ -152,7 +153,8 @@ let Flow = class Flow extends core_1.Controller {
                 ...flowData,
                 flowId: undefined,
                 nodes: [],
-                createdAt: undefined
+                createdAt: undefined,
+                status: 'off'
             };
             let flowDataClone;
             //if we have a vendoId as parameter the origin is a template

package/dist/controllers/FlowInstance.d.ts

@@ -16,5 +16,7 @@ import { EntityManager } from 'typeorm';
 import { Controller } from '@pxp-nd/core';
 declare class FlowInstance extends Controller {
     processPending(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
+    eventProcesss(manager: EntityManager): Promise<void>;
+    checkConditions(viewData: Record<string, any>, flowId: number, actionId: number): Promise<boolean>;
 }
 export default FlowInstance;

package/dist/controllers/FlowInstance.js

@@ -33,6 +33,10 @@ const common_1 = require("@pxp-nd/common");
 const NodeInstance_1 = __importDefault(require("./NodeInstance"));
 const NodeInstance_2 = __importDefault(require("../entity/NodeInstance"));
 const Node_1 = __importDefault(require("../entity/Node"));
+const Event_1 = __importDefault(require("../entity/Event"));
+const Flow_1 = __importDefault(require("../entity/Flow"));
+const Action_1 = __importDefault(require("../entity/Action"));
+const FlowLog_1 = __importDefault(require("../entity/FlowLog"));
 class FlowInstance extends core_1.Controller {
     async processPending(params, manager) {
         const flag = await common_1.GlobalData.findOne({ data: 'wf_processing_pending_flows_flag' });
@@ -44,14 +48,15 @@ class FlowInstance extends core_1.Controller {
             let flowInstanceIdProcessing = -1;
             await (0, typeorm_1.getManager)().save(flag);
             try {
+                await this.eventProcesss(manager);
                 const maxFlows = await common_1.GlobalData.findOne({ data: 'wf_max_concurrent_flows_process' });
-                const flowInstances = await FlowInstance_1.default.find({ take: (maxFlows && maxFlows.value), where: [{ status: 'pending' }], order: { flowInstanceId: "ASC" } });
+                const flowInstances = await manager.find(FlowInstance_1.default, { take: (maxFlows && maxFlows.value), where: [{ status: 'pending' }], order: { flowInstanceId: "ASC" } });
                 for (const flowInstance of flowInstances) {
                     flowInstanceIdProcessing = flowInstance.flowInstanceId;
                     const node = await Node_1.default.findOne({ where: { actionId: flowInstance.actionId, flowId: flowInstance.flowId } });
                     const CNodeInstance = new NodeInstance_1.default('flow-nd', NodeInstance_2.default);
                     try {
-                        await CNodeInstance.RecursiveInstance({ node, flowInstance });
+                        await CNodeInstance.RecursiveInstance({ node, flowInstance }, manager);
                         await manager.update(FlowInstance_1.default, { flowInstanceId: flowInstance.flowInstanceId }, { status: 'processed' });
                     }
                     catch (error) {
@@ -64,6 +69,11 @@ class FlowInstance extends core_1.Controller {
             catch (error) {
                 flag.value = 'false';
                 await (0, typeorm_1.getManager)().save(flag);
+                const log = new FlowLog_1.default();
+                log.errorCustomMessage = `Error executing ${flowInstanceIdProcessing} in FlowInstance-> processPending `;
+                log.errorMessage = error.message;
+                log.stackTrace = error.stack || '';
+                (0, typeorm_1.getManager)().save(log);
                 throw new core_1.PxpError(400, 'Error processing flow: ' + flowInstanceIdProcessing);
             }
             flag.value = 'false';
@@ -71,6 +81,60 @@ class FlowInstance extends core_1.Controller {
         }
         return { success: true };
     }
+    async eventProcesss(manager) {
+        const pendingEvents = await Event_1.default.find({ status: 'pending' });
+        for (const newEvent of pendingEvents) {
+            const node = await (0, core_1.__)(Node_1.default.find({ where: { actionId: newEvent.actionId, isActive: 1 } }));
+            newEvent.status = 'processed';
+            await (0, typeorm_1.getManager)().save(newEvent);
+            try {
+                for (const n of node) {
+                    //get data of view
+                    const { action: { originName, originKey }, } = n;
+                    const executeView = `select * from ${originName} where ${originKey} = ${newEvent.dataId}`;
+                    const resExecuteView = await (0, typeorm_1.getManager)().query(executeView);
+                    const flow = await (0, core_1.__)(Flow_1.default.findOne({ where: { flowId: n.flowId, isActive: 1, status: 'on' } }));
+                    if (flow && flow.vendorId == resExecuteView[0].vendor_id &&
+                        (await this.checkConditions(resExecuteView[0], n.flowId, newEvent.actionId))) {
+                        //now check all conditions
+                        let flowInstance = new FlowInstance_1.default();
+                        flowInstance.flowId = n.flowId;
+                        flowInstance.dataId = newEvent.dataId;
+                        flowInstance.originName = originName;
+                        flowInstance.originKey = originKey;
+                        flowInstance.actionId = newEvent.actionId;
+                        flowInstance.status = "pending";
+                        flowInstance = await manager.save(FlowInstance_1.default, flowInstance);
+                    }
+                }
+            }
+            catch (error) {
+                const log = new FlowLog_1.default();
+                log.errorCustomMessage = `Error processing event ${newEvent.eventId} in FlowInstance-> eventProcesss `;
+                log.errorMessage = error.message;
+                log.stackTrace = error.stack || '';
+                (0, typeorm_1.getManager)().save(log);
+            }
+        }
+    }
+    async checkConditions(viewData, flowId, actionId) {
+        const action = await Action_1.default.findOne(actionId);
+        const node = await Node_1.default.findOne({ where: { actionId, flowId, isActive: 1 } });
+        let res = true;
+        if (node && action.eventConfig && node.actionConfigJson) {
+            const eventConfig = JSON.parse(action.eventConfig);
+            const actionConfigJson = JSON.parse(node.actionConfigJson);
+            if (eventConfig.filters) {
+                eventConfig.filters.forEach((filter) => {
+                    if (actionConfigJson[filter.nodeField] &&
+                        viewData[filter.originField] != actionConfigJson[filter.nodeField]) {
+                        res = false;
+                    }
+                });
+            }
+        }
+        return res;
+    }
 }
 __decorate([
     (0, core_1.Post)(),

package/dist/controllers/NodeInstance.d.ts

@@ -15,7 +15,7 @@
 import { EntityManager } from "typeorm";
 import { Controller } from "@pxp-nd/core";
 declare class NodeInstance extends Controller {
-    RecursiveInstance(params: Record<string, any>): Promise<unknown>;
+    RecursiveInstance(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     ProcessDelay(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
 }
 export default NodeInstance;

package/dist/controllers/NodeInstance.js

@@ -32,6 +32,7 @@ const core_1 = require("@pxp-nd/core");
 const NodeConnection_1 = __importDefault(require("../entity/NodeConnection"));
 const NodeInstance_1 = __importDefault(require("../entity/NodeInstance"));
 const Node_1 = __importDefault(require("../entity/Node"));
+const FlowLog_1 = __importDefault(require("../entity/FlowLog"));
 const axios_1 = __importDefault(require("axios"));
 const ActionType_1 = __importDefault(require("../entity/ActionType"));
 const Action_1 = __importDefault(require("../entity/Action"));
@@ -40,70 +41,79 @@ const FlowInstance_1 = __importDefault(require("../entity/FlowInstance"));
 //TODO replace this flow-nd need tobe independent library
 const common_1 = require("@pxp-nd/common");
 let NodeInstance = class NodeInstance extends core_1.Controller {
-    async RecursiveInstance(params) {
+    async RecursiveInstance(params, manager) {
         //https://lodash.com/docs/4.17.15#template
         lodash_1.default.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
         //todo after this we need to get the json variables and execute the view and conditions configured in the database
         const { node, flowInstance, eventNode } = params;
-        const executeView = `select * from ${flowInstance.originName} where ${flowInstance.originKey} = ${flowInstance.dataId}`;
-        const resExecuteView = await (0, core_1.__)((0, typeorm_1.getManager)().query(executeView));
-        const resultFromOrigin = resExecuteView[0];
-        let mergeJson = {};
-        const { actionConfigJson, action: { configJsonTemplate, actionType: { schemaJson }, }, } = node;
-        if (configJsonTemplate !== "" || actionConfigJson !== "") {
-            const actionConfigJsonObject = actionConfigJson &&
-                JSON.parse(lodash_1.default.template(actionConfigJson)(resultFromOrigin));
-            const configJsonTemplateObject = configJsonTemplate &&
-                JSON.parse(lodash_1.default.template(configJsonTemplate)(resultFromOrigin));
-            mergeJson = {
-                ...(configJsonTemplateObject || {}),
-                ...(actionConfigJsonObject || {}),
-                __resultFromOrigin: resultFromOrigin,
-            };
-        }
-        let nodeInstance = new NodeInstance_1.default();
-        nodeInstance.flowInstanceId = flowInstance.flowInstanceId;
-        // @ts-ignore
-        nodeInstance.nodeId = node.nodeId;
-        nodeInstance.runTime = new Date();
-        if (node.action.actionType.isDelay === "Y") {
-            const delay = node.delay;
-            const typeDelay = node.typeDelay;
-            nodeInstance.schedule = (0, moment_1.default)().add(delay, typeDelay).toDate();
-            nodeInstance.status = "WAIT";
-            await (0, typeorm_1.getManager)().save(NodeInstance_1.default, nodeInstance);
-        }
-        else {
-            if (node.action.actionType.controller) {
-                const data = "";
-                const config = {
-                    method: "post",
-                    url: `http://localhost:${process.env.PORT}/api/${node.action.actionType.controller}`,
-                    headers: {
-                        Authorization: "" + process.env.TOKEN_PXP_ND + "",
-                        "Content-Type": "application/json",
-                    },
-                    data: mergeJson,
+        try {
+            const executeView = `select * from ${flowInstance.originName} where ${flowInstance.originKey} = ${flowInstance.dataId}`;
+            const resExecuteView = await (0, core_1.__)((0, typeorm_1.getManager)().query(executeView));
+            const resultFromOrigin = resExecuteView[0];
+            let mergeJson = {};
+            const { actionConfigJson, action: { configJsonTemplate, actionType: { schemaJson }, }, } = node;
+            if (configJsonTemplate !== "" || actionConfigJson !== "") {
+                const actionConfigJsonObject = actionConfigJson &&
+                    JSON.parse(lodash_1.default.template(actionConfigJson)(resultFromOrigin));
+                const configJsonTemplateObject = configJsonTemplate &&
+                    JSON.parse(lodash_1.default.template(configJsonTemplate)(resultFromOrigin));
+                mergeJson = {
+                    ...(configJsonTemplateObject || {}),
+                    ...(actionConfigJsonObject || {}),
+                    __resultFromOrigin: resultFromOrigin,
                 };
-                // @ts-ignore
-                const resControllerAxios = await (0, core_1.__)((0, axios_1.default)(config));
             }
-            await (0, typeorm_1.getManager)().save(NodeInstance_1.default, nodeInstance);
+            let nodeInstance = new NodeInstance_1.default();
+            nodeInstance.flowInstanceId = flowInstance.flowInstanceId;
             // @ts-ignore
-            const nodeConnectionList = await (0, core_1.__)(NodeConnection_1.default.find({ where: { nodeIdMaster: node.nodeId } }));
-            for (const nodeConnection of nodeConnectionList) {
-                const condition = lodash_1.default.template(nodeConnection.condition)(resultFromOrigin);
-                const evalCondition = eval(condition);
-                if (evalCondition) {
-                    const nodeRes = await (0, core_1.__)(Node_1.default.findOne(nodeConnection.nodeIdChild));
-                    await this.RecursiveInstance({
-                        node: nodeRes,
-                        flowInstance,
-                        resultFromOrigin,
-                    });
+            nodeInstance.nodeId = node.nodeId;
+            nodeInstance.runTime = new Date();
+            if (node.action.actionType.isDelay === "Y") {
+                const delay = node.delay;
+                const typeDelay = node.typeDelay;
+                nodeInstance.schedule = (0, moment_1.default)().add(delay, typeDelay).toDate();
+                nodeInstance.status = "WAIT";
+                await manager.save(NodeInstance_1.default, nodeInstance);
+            }
+            else {
+                if (node.action.actionType.controller) {
+                    const data = "";
+                    const config = {
+                        method: "post",
+                        url: `http://localhost:${process.env.PORT}/api/${node.action.actionType.controller}`,
+                        headers: {
+                            Authorization: "" + process.env.TOKEN_PXP_ND + "",
+                            "Content-Type": "application/json",
+                        },
+                        data: mergeJson,
+                    };
+                    // @ts-ignore
+                    const resControllerAxios = await (0, core_1.__)((0, axios_1.default)(config));
+                }
+                await manager.save(NodeInstance_1.default, nodeInstance);
+                // @ts-ignore
+                const nodeConnectionList = await (0, core_1.__)(NodeConnection_1.default.find({ where: { nodeIdMaster: node.nodeId } }));
+                for (const nodeConnection of nodeConnectionList) {
+                    const condition = lodash_1.default.template(nodeConnection.condition)(resultFromOrigin);
+                    const evalCondition = eval(condition);
+                    if (evalCondition) {
+                        const nodeRes = await (0, core_1.__)(Node_1.default.findOne(nodeConnection.nodeIdChild));
+                        await this.RecursiveInstance({
+                            node: nodeRes,
+                            flowInstance,
+                            resultFromOrigin,
+                        }, manager);
+                    }
                 }
             }
         }
+        catch (error) {
+            const log = new FlowLog_1.default();
+            log.errorCustomMessage = `Error executing ${flowInstance.flowInstanceId} in NodeInstance-> RecursiveInstance `;
+            log.errorMessage = error.message;
+            log.stackTrace = error.stack || '';
+            (0, typeorm_1.getManager)().save(log);
+        }
         return {};
     }
     async ProcessDelay(params, manager) {
@@ -150,7 +160,7 @@ let NodeInstance = class NodeInstance extends core_1.Controller {
                                 node: nodeRes,
                                 flowInstance,
                                 resultFromOrigin,
-                            });
+                            }, manager);
                             //update status from wait to executed
                             await (0, core_1.__)(manager.update(NodeInstance_1.default, nodeInstance.nodeInstanceId, {
                                 status: "EXECUTED",

package/dist/entity/Event.d.ts

@@ -5,5 +5,6 @@ export default class Event extends PxpEntity {
     actionId: number;
     descJobName: string;
     dataId: number;
+    status: string;
     action: Action;
 }

package/dist/entity/Event.js

@@ -33,6 +33,10 @@ __decorate([
     (0, typeorm_1.Column)({ name: 'data_id', type: 'int', nullable: false }),
     __metadata("design:type", Number)
 ], Event.prototype, "dataId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'status', type: 'varchar', length: 30, nullable: false, default: 'pending' }),
+    __metadata("design:type", String)
+], Event.prototype, "status", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => Action_1.default, action => action.nodes),
     (0, typeorm_1.JoinColumn)({ name: 'action_id' }),

package/dist/entity/FlowLog.d.ts

@@ -0,0 +1,7 @@
+import { PxpEntity } from '@pxp-nd/common';
+export default class Action extends PxpEntity {
+    flowLogId: number;
+    errorCustomMessage: string;
+    errorMessage: string;
+    stackTrace: string;
+}

package/dist/entity/FlowLog.js

@@ -0,0 +1,35 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const typeorm_1 = require("typeorm");
+const common_1 = require("@pxp-nd/common");
+let Action = class Action extends common_1.PxpEntity {
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)({ name: 'flow_log_id' }),
+    __metadata("design:type", Number)
+], Action.prototype, "flowLogId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'error_custom_message', type: 'varchar', nullable: false, length: 2000 }),
+    __metadata("design:type", String)
+], Action.prototype, "errorCustomMessage", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'error_message', type: 'varchar', nullable: false, length: 2000 }),
+    __metadata("design:type", String)
+], Action.prototype, "errorMessage", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], Action.prototype, "stackTrace", void 0);
+Action = __decorate([
+    (0, typeorm_1.Entity)({ name: 'twf_action' })
+], Action);
+exports.default = Action;

package/dist/index.d.ts

@@ -1,3 +1,2 @@
 export * from './entity';
 export * from './controllers';
-export * from './subscribers';

package/dist/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./entity"), exports);
 __exportStar(require("./controllers"), exports);
-__exportStar(require("./subscribers"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pxp-nd/flow",
-  "version": "1.0.57",
+  "version": "1.0.59",
   "description": "Workflow module for pxp-nd framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/subscribers/Event.d.ts

@@ -1,21 +0,0 @@
-/**
- * Kplian 2021
- *
- * MIT
- *
- * Member Controller
- *
- * @summary Event Subscriber
- * @author Favio Figueroa
- *         Jaime Rivera
- *
- * Created at     : 2021-07-08 12:55:38
- * Last modified  :
- */
-import { EntitySubscriberInterface, InsertEvent } from "typeorm";
-import EventModel from "../entity/Event";
-export declare class Event implements EntitySubscriberInterface<EventModel> {
-    listenTo(): typeof EventModel;
-    afterInsert(event: InsertEvent<EventModel>): Promise<void>;
-    checkConditions(viewData: Record<string, any>, flowId: number, actionId: number): Promise<boolean>;
-}

package/dist/subscribers/Event.js

@@ -1,84 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Event = void 0;
-/**
- * Kplian 2021
- *
- * MIT
- *
- * Member Controller
- *
- * @summary Event Subscriber
- * @author Favio Figueroa
- *         Jaime Rivera
- *
- * Created at     : 2021-07-08 12:55:38
- * Last modified  :
- */
-const typeorm_1 = require("typeorm");
-const Event_1 = __importDefault(require("../entity/Event"));
-const Node_1 = __importDefault(require("../entity/Node"));
-const Action_1 = __importDefault(require("../entity/Action"));
-const Flow_1 = __importDefault(require("../entity/Flow"));
-const core_1 = require("@pxp-nd/core");
-const FlowInstance_1 = __importDefault(require("../entity/FlowInstance"));
-let Event = class Event {
-    listenTo() {
-        return Event_1.default;
-    }
-    async afterInsert(event) {
-        //todo investigate  replace variables into condition
-        const newEvent = event.entity;
-        const node = await (0, core_1.__)(Node_1.default.find({ where: { actionId: newEvent.actionId, isActive: 1 } }));
-        for (const n of node) {
-            //get data of view
-            const { action: { originName, originKey }, } = n;
-            const executeView = `select * from ${originName} where ${originKey} = ${newEvent.dataId}`;
-            const resExecuteView = await (0, typeorm_1.getManager)().query(executeView);
-            const flow = await (0, core_1.__)(Flow_1.default.findOne({ where: { flowId: n.flowId, isActive: 1, status: 'active' } }));
-            if (flow && flow.vendorId == resExecuteView[0].vendor_id &&
-                (await this.checkConditions(resExecuteView[0], n.flowId, newEvent.actionId))) {
-                //now check all conditions
-                let flowInstance = new FlowInstance_1.default();
-                flowInstance.flowId = n.flowId;
-                flowInstance.dataId = newEvent.dataId;
-                flowInstance.originName = originName;
-                flowInstance.originKey = originKey;
-                flowInstance.actionId = newEvent.actionId;
-                flowInstance.status = "pending";
-                flowInstance = await event.manager.save(FlowInstance_1.default, flowInstance);
-            }
-        }
-    }
-    async checkConditions(viewData, flowId, actionId) {
-        const action = await Action_1.default.findOne(actionId);
-        const node = await Node_1.default.findOne({ where: { actionId, flowId, isActive: 1 } });
-        let res = true;
-        if (node && action.eventConfig && node.actionConfigJson) {
-            const eventConfig = JSON.parse(action.eventConfig);
-            const actionConfigJson = JSON.parse(node.actionConfigJson);
-            if (eventConfig.filters) {
-                eventConfig.filters.forEach((filter) => {
-                    if (actionConfigJson[filter.nodeField] &&
-                        viewData[filter.originField] != actionConfigJson[filter.nodeField]) {
-                        res = false;
-                    }
-                });
-            }
-        }
-        return res;
-    }
-};
-Event = __decorate([
-    (0, typeorm_1.EventSubscriber)()
-], Event);
-exports.Event = Event;

package/dist/subscribers/index.d.ts

@@ -1,3 +0,0 @@
-import { Event as EventSubscriber } from './Event';
-export { EventSubscriber };
-export declare const subscribers: (typeof EventSubscriber)[];

package/dist/subscribers/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.subscribers = exports.EventSubscriber = void 0;
-const Event_1 = require("./Event");
-Object.defineProperty(exports, "EventSubscriber", { enumerable: true, get: function () { return Event_1.Event; } });
-exports.subscribers = [Event_1.Event];