rez_core 3.1.125 → 3.1.127

package/dist/module/workflow/controller/stage.controller.d.ts

@@ -6,28 +6,10 @@ export declare class StageController {
         user: any;
     }, body: {
         stage_group_id: number;
-    }): Promise<{
-        name: string;
-        full_name: string;
-        stage_group_id: number;
-        sequence: number;
-        description: string;
-        id: number;
-        entity_type: string;
-        status: string;
-        parent_type: string;
-        parent_id: number;
-        code: string;
-        created_by: number;
-        created_date: Date;
-        modified_by: number;
-        modified_date: Date;
-        enterprise_id: number;
-        organization_id: number;
-        appcode: string;
-        level_id: string;
-        level_type: string;
-    }[]>;
+        mapped_entity_id: number;
+    }, query: {
+        show_previous: boolean;
+    }): Promise<any[]>;
     getStagesWithGroupName(workflow_id: number, req: Request & {
         user: any;
     }): Promise<any>;

package/dist/module/workflow/controller/stage.controller.js

@@ -20,9 +20,9 @@ let StageController = class StageController {
     constructor(stageGroupService) {
         this.stageGroupService = stageGroupService;
     }
-    async getAllStage(req, body) {
+    async getAllStage(req, body, query) {
         const { organization_id } = req.user.userData;
-        return this.stageGroupService.getAllStage(body.stage_group_id, organization_id);
+        return this.stageGroupService.getAllStage(body, organization_id, query.show_previous);
     }
     async getStagesWithGroupName(workflow_id, req) {
         const { organization_id } = req.user.userData;
@@ -34,8 +34,9 @@ __decorate([
     (0, common_1.Post)('/getAllStage'),
     __param(0, (0, common_1.Req)()),
     __param(1, (0, common_1.Body)()),
+    __param(2, (0, common_1.Query)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], StageController.prototype, "getAllStage", null);
 __decorate([

package/dist/module/workflow/controller/stage.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"stage.controller.js","sourceRoot":"","sources":["../../../../src/module/workflow/controller/stage.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAUwB;AACxB,2DAAgE;AAChE,4DAAwD;AAIjD,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAEmB,iBAA+B;QAA/B,sBAAiB,GAAjB,iBAAiB,CAAc;IAC/C,CAAC;IAGE,AAAN,KAAK,CAAC,WAAW,CACR,GAA4B,EAC3B,IAAgC;QAExC,MAAM,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CACvC,IAAI,CAAC,cAAc,EACnB,eAAe,CAChB,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,sBAAsB,CACL,WAAmB,EACjC,GAA4B;QAEnC,MAAM,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAClD,WAAW,EACX,eAAe,CAChB,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,0CAAe;AAOpB;IADL,IAAA,aAAI,EAAC,cAAc,CAAC;IAElB,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,aAAI,GAAE,CAAA;;;;kDAOR;AAIK;IAFL,IAAA,aAAI,EAAC,yBAAyB,CAAC;IAC/B,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,aAAI,EAAC,aAAa,CAAC,CAAA;IACnB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;6DAOP;0BA7BU,eAAe;IAF3B,IAAA,mBAAU,EAAC,QAAQ,CAAC;IACpB,IAAA,kBAAS,EAAC,wBAAY,CAAC;IAGnB,WAAA,IAAA,eAAM,EAAC,cAAc,CAAC,CAAA;qCACa,4BAAY;GAHvC,eAAe,CA8B3B"}
+{"version":3,"file":"stage.controller.js","sourceRoot":"","sources":["../../../../src/module/workflow/controller/stage.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AACxB,2DAAgE;AAChE,4DAAwD;AAIjD,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAEmB,iBAA+B;QAA/B,sBAAiB,GAAjB,iBAAiB,CAAc;IAC/C,CAAC;IAGE,AAAN,KAAK,CAAC,WAAW,CACR,GAA4B,EAC3B,IAA0D,EACzD,KAAiC;QAE1C,MAAM,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CACvC,IAAI,EACJ,eAAe,EACf,KAAK,CAAC,aAAa,CACpB,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,sBAAsB,CACL,WAAmB,EACjC,GAA4B;QAEnC,MAAM,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAClD,WAAW,EACX,eAAe,CAChB,CAAC;IACJ,CAAC;CACF,CAAA;AAhCY,0CAAe;AAOpB;IADL,IAAA,aAAI,EAAC,cAAc,CAAC;IAElB,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,GAAE,CAAA;;;;kDAQT;AAIK;IAFL,IAAA,aAAI,EAAC,yBAAyB,CAAC;IAC/B,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,aAAI,EAAC,aAAa,CAAC,CAAA;IACnB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;6DAOP;0BA/BU,eAAe;IAF3B,IAAA,mBAAU,EAAC,QAAQ,CAAC;IACpB,IAAA,kBAAS,EAAC,wBAAY,CAAC;IAGnB,WAAA,IAAA,eAAM,EAAC,cAAc,CAAC,CAAA;qCACa,4BAAY;GAHvC,eAAe,CAgC3B"}

package/dist/module/workflow/repository/stage.repository.d.ts

@@ -27,4 +27,5 @@ export declare class StageRepository {
         level_type: string;
     }[]>;
     getStageGroupsWithStagesByWorkflowId(stage_group_id: number, organization_id: number): Promise<any[]>;
+    getAllStageGroupAndStageByStageMovement(stage_group_id: number, organization_id: number): Promise<any[]>;
 }

package/dist/module/workflow/repository/stage.repository.js

@@ -76,6 +76,36 @@ let StageRepository = class StageRepository {
         }
         return rows;
     }
+    async getAllStageGroupAndStageByStageMovement(stage_group_id, organization_id) {
+        const currentStageGroup = await this.dataSource.manager.findOne('cr_wf_stage_group', { where: { id: stage_group_id, organization_id } });
+        if (!currentStageGroup) {
+            return [];
+        }
+        const stageGroups = await this.dataSource.manager.find('cr_wf_stage_group', {
+            where: {
+                workflow_id: currentStageGroup.workflow_id,
+                organization_id,
+            },
+            order: { sequence: 'ASC' },
+        });
+        const eligibleGroups = stageGroups.filter((g) => g.sequence <= currentStageGroup.sequence);
+        const flatResults = [];
+        for (const group of eligibleGroups) {
+            const stages = await this.stageRepository.find({
+                where: { stage_group_id: group.id, organization_id },
+                order: { sequence: 'ASC' },
+            });
+            if (!stages || stages.length === 0)
+                continue;
+            for (const stage of stages) {
+                flatResults.push({
+                    ...stage,
+                    full_name: `${group.name} - ${stage.name}`,
+                });
+            }
+        }
+        return flatResults;
+    }
 };
 exports.StageRepository = StageRepository;
 exports.StageRepository = StageRepository = __decorate([

package/dist/module/workflow/repository/stage.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"stage.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKwB;AAExB,6CAAmD;AACnD,qCAAiD;AACjD,yDAA+C;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAEmB,eAAkC,EAClC,UAAsB;QADtB,oBAAe,GAAf,eAAe,CAAmB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,cAAsB,EAAE,eAAuB;QAC/D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE;SAC9B,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,0BAAiB,CAAC,uBAAuB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;QAGvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC7C,KAAK,EAAE;gBACL,cAAc;gBACd,eAAe;aAChB;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,KAAK;YACR,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,SAAS,EAAE,GAAG,cAAc,MAAM,KAAK,CAAC,IAAI,EAAE;SAC/C,CAAC,CAAC,CAAC;QAEJ,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,oCAAoC,CACxC,cAAsB,EACtB,eAAuB;QAEvB,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE;SAC/C,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACtC;;;;;;;;KAQD,EACC,CAAC,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,CAAC,CAC1D,CAAC;QAgBF,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAzGY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,oBAAK,CAAC,CAAA;qCACU,oBAAU;QACf,oBAAU;GAJ9B,eAAe,CAyG3B"}
+{"version":3,"file":"stage.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage.repository.ts"],"names":[],"mappings":"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"}

package/dist/module/workflow/service/stage.service.d.ts

@@ -12,29 +12,12 @@ export declare class StageService extends EntityServiceImpl {
     private readonly stageMovementRepo;
     private readonly dataSource;
     private readonly actionService;
+    private readonly logger;
     constructor(stageRepository: StageRepository, stageGroupRepository: StageGroupRepository, stageMovementRepo: Repository<StageMovementData>, dataSource: DataSource, actionService: ActionService);
-    getAllStage(stage_group_id: number, organization_id: number): Promise<{
-        name: string;
-        full_name: string;
+    getAllStage(payload: {
         stage_group_id: number;
-        sequence: number;
-        description: string;
-        id: number;
-        entity_type: string;
-        status: string;
-        parent_type: string;
-        parent_id: number;
-        code: string;
-        created_by: number;
-        created_date: Date;
-        modified_by: number;
-        modified_date: Date;
-        enterprise_id: number;
-        organization_id: number;
-        appcode: string;
-        level_id: string;
-        level_type: string;
-    }[]>;
+        mapped_entity_id: number;
+    }, organization_id: number, show_previous: boolean): Promise<any[]>;
     updateEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<any>;
     getEntityData(entityType: string, id: number, loggedInUser?: UserData): Promise<BaseEntity | null>;
     deleteEntity(entityType: string, id: number, loggedInUser: UserData): Promise<any>;

package/dist/module/workflow/service/stage.service.js

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var StageService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StageService = void 0;
 const action_service_1 = require("./action.service");
@@ -21,7 +22,7 @@ const typeorm_1 = require("typeorm");
 const stage_group_repository_1 = require("../repository/stage-group.repository");
 const typeorm_2 = require("@nestjs/typeorm");
 const stage_movement_data_entity_1 = require("../entity/stage-movement-data.entity");
-let StageService = class StageService extends entity_service_impl_service_1.EntityServiceImpl {
+let StageService = StageService_1 = class StageService extends entity_service_impl_service_1.EntityServiceImpl {
     constructor(stageRepository, stageGroupRepository, stageMovementRepo, dataSource, actionService) {
         super();
         this.stageRepository = stageRepository;
@@ -29,17 +30,43 @@ let StageService = class StageService extends entity_service_impl_service_1.Enti
         this.stageMovementRepo = stageMovementRepo;
         this.dataSource = dataSource;
         this.actionService = actionService;
+        this.logger = new common_1.Logger(StageService_1.name);
     }
-    async getAllStage(stage_group_id, organization_id) {
-        const allStages = await this.stageRepository.getAllStage(stage_group_id, organization_id);
-        const statusListMaster = await this.dataSource.query(`SELECT id, name 
-     FROM cr_list_master_items 
-     WHERE listtype = 'STS' AND organization_id = ?`, [organization_id]);
-        const statusMap = new Map(statusListMaster.map((s) => [String(s.id), s.name]));
-        for (const stage of allStages) {
-            stage.status = statusMap.get(String(stage.status));
+    async getAllStage(payload, organization_id, show_previous) {
+        if (!show_previous) {
+            const allStages = await this.stageRepository.getAllStage(payload.stage_group_id, organization_id);
+            const statusListMaster = await this.dataSource.query(`SELECT id, name 
+       FROM cr_list_master_items 
+       WHERE listtype = 'STS' AND organization_id = ?`, [organization_id]);
+            const statusMap = new Map(statusListMaster.map((s) => [String(s.id), s.name]));
+            for (const stage of allStages) {
+                stage.status = statusMap.get(String(stage.status));
+            }
+            return allStages;
+        }
+        const allStageWithStageGroup = await this.stageRepository.getAllStageGroupAndStageByStageMovement(payload.stage_group_id, organization_id);
+        const allStageMovementData = await this.dataSource.manager.find('cr_wf_stage_movement_data', {
+            where: {
+                mapped_entity_id: payload.mapped_entity_id,
+                mapped_entity_type: 'LEAD',
+            },
+            order: { id: 'ASC' },
+        });
+        if (!allStageMovementData || allStageMovementData.length === 0) {
+            return allStageWithStageGroup;
+        }
+        const currentMovement = allStageMovementData.find((m) => m.is_current === 'Y');
+        if (!currentMovement) {
+            return allStageWithStageGroup;
+        }
+        const filteredStages = [];
+        for (const stage of allStageWithStageGroup) {
+            filteredStages.push(stage);
+            if (stage.id === currentMovement.stage_id) {
+                break;
+            }
         }
-        return allStages;
+        return filteredStages;
     }
     async updateEntity(entityData, loggedInUser) {
         return await super.updateEntity(entityData, loggedInUser);
@@ -72,7 +99,7 @@ let StageService = class StageService extends entity_service_impl_service_1.Enti
             }
             catch (err) {
                 if (err instanceof common_1.NotFoundException) {
-                    console.warn(`No stages for group ID ${groupId}`);
+                    this.logger.warn(`No stages for group ID ${groupId}`);
                     continue;
                 }
                 throw err;
@@ -89,7 +116,7 @@ let StageService = class StageService extends entity_service_impl_service_1.Enti
     }
 };
 exports.StageService = StageService;
-exports.StageService = StageService = __decorate([
+exports.StageService = StageService = StageService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, typeorm_2.InjectRepository)(stage_movement_data_entity_1.StageMovementData)),
     __param(4, (0, common_1.Inject)('ActionService')),

package/dist/module/workflow/service/stage.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"stage.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/stage.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stage.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/stage.service.ts"],"names":[],"mappings":"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"}