rez_core 4.0.5 → 4.0.7

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "dbaeumer.vscode-eslint"
+    ]
+}

package/dist/module/meta/controller/media.controller.d.ts

@@ -8,6 +8,8 @@ export declare class MediaController {
         attribute_key: string;
         mapped_entity_type?: string;
         mapped_entity_id?: number;
+        parent_id?: number;
+        parent_type?: string;
     }, req: Request & {
         user: any;
     }, res: Response): Promise<void>;
@@ -16,5 +18,10 @@ export declare class MediaController {
     }, expiresIn?: number): Promise<void>;
     generateUploadPath(req: Request & {
         user: any;
-    }, mapped_entity_type: string, mapped_entity_id?: number, parent_id?: number, parent_type?: string): Promise<string | null>;
+    }, body: {
+        mapped_entity_type: string;
+        mapped_entity_id?: number;
+        parent_id?: number;
+        parent_type?: string;
+    }): Promise<string | null>;
 }

package/dist/module/meta/controller/media.controller.js

@@ -22,7 +22,7 @@ let MediaController = class MediaController {
     }
     async initiateUpload(body, req, res) {
         const loggedInUser = req.user.userData;
-        const result = await this.mediaDataService.generateMediaUploadDetails(body.file_name, body.attribute_key, loggedInUser, body.mapped_entity_type, body.mapped_entity_id);
+        const result = await this.mediaDataService.generateMediaUploadDetails(body.file_name, body.attribute_key, loggedInUser, body.mapped_entity_type, body.mapped_entity_id, body.parent_id, body.parent_type);
         if (result) {
             res.status(common_1.HttpStatus.OK).json({
                 message: 'Upload initiated successfully',
@@ -51,9 +51,9 @@ let MediaController = class MediaController {
             });
         }
     }
-    async generateUploadPath(req, mapped_entity_type, mapped_entity_id, parent_id, parent_type) {
+    async generateUploadPath(req, body) {
         const loggedInUser = req.user.userData;
-        return this.mediaDataService.buildUploadPathGeneric(mapped_entity_type, loggedInUser, mapped_entity_id, parent_id, parent_type);
+        return this.mediaDataService.buildUploadPathGeneric(body.mapped_entity_type, loggedInUser, body.mapped_entity_id, body.parent_id, body.parent_type);
     }
 };
 exports.MediaController = MediaController;
@@ -79,12 +79,9 @@ __decorate([
 __decorate([
     (0, common_1.Post)('generateUploadPath'),
     __param(0, (0, common_1.Req)()),
-    __param(1, (0, common_1.Query)('mapped_entity_type')),
-    __param(2, (0, common_1.Query)('mapped_entity_id')),
-    __param(3, (0, common_1.Query)('parent_id')),
-    __param(4, (0, common_1.Query)('parent_type')),
+    __param(1, (0, common_1.Body)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String, Number, Number, String]),
+    __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], MediaController.prototype, "generateUploadPath", null);
 exports.MediaController = MediaController = __decorate([

package/dist/module/meta/controller/media.controller.js.map

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

package/dist/module/meta/service/media-data.service.d.ts

@@ -1,9 +1,9 @@
-import { EntityServiceImpl } from './entity-service-impl.service';
-import { MediaDataRepository } from '../repository/media-data.repository';
 import { ConfigService } from '@nestjs/config';
 import { S3 } from 'aws-sdk';
-import { MediaData } from '../entity/media-data.entity';
 import { DataSource } from 'typeorm';
+import { MediaData } from '../entity/media-data.entity';
+import { MediaDataRepository } from '../repository/media-data.repository';
+import { EntityServiceImpl } from './entity-service-impl.service';
 export declare class MediaDataService extends EntityServiceImpl {
     private readonly configService;
     private readonly mediaRepository;
@@ -14,7 +14,7 @@ export declare class MediaDataService extends EntityServiceImpl {
     s3Region: any;
     bucketName: string | undefined;
     s3: S3;
-    generateMediaUploadDetails(fileName: string, mappedAttributeKey: string, loggedInUser: any, mappedEntityType?: string, mappedEntityId?: number): Promise<{
+    generateMediaUploadDetails(fileName: string, mappedAttributeKey: string, loggedInUser: any, mappedEntityType?: string, mappedEntityId?: number, parentId?: number, parentType?: string): Promise<{
         id: any;
         path: string;
         uploadUrl: string;
@@ -29,6 +29,8 @@ export declare class MediaDataService extends EntityServiceImpl {
         id: number;
         size: number | undefined;
     }>;
+    buildUploadPathGenericdd(mappedEntityType: string, loggedInUser: any, mappedEntityId?: number, parentId?: number, parentType?: string): Promise<string | null>;
     buildUploadPathGeneric(mappedEntityType: string, loggedInUser: any, mappedEntityId?: number, parentId?: number, parentType?: string): Promise<string | null>;
     private resolveUploadPath;
+    buildUploadPath(mappedEntityType: string, loggedInUser: any, mappedEntityId?: number, parentId?: number, parentType?: string): Promise<string | null>;
 }

package/dist/module/meta/service/media-data.service.js

@@ -11,14 +11,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MediaDataService = void 0;
 const common_1 = require("@nestjs/common");
-const entity_service_impl_service_1 = require("./entity-service-impl.service");
-const media_data_repository_1 = require("../repository/media-data.repository");
 const config_1 = require("@nestjs/config");
 const aws_sdk_1 = require("aws-sdk");
-const media_data_entity_1 = require("../entity/media-data.entity");
-const global_constant_1 = require("../../../constant/global.constant");
-const uuid_1 = require("uuid");
+const axios_1 = require("axios");
 const typeorm_1 = require("typeorm");
+const uuid_1 = require("uuid");
+const global_constant_1 = require("../../../constant/global.constant");
+const media_data_entity_1 = require("../entity/media-data.entity");
+const media_data_repository_1 = require("../repository/media-data.repository");
+const entity_service_impl_service_1 = require("./entity-service-impl.service");
 let MediaDataService = class MediaDataService extends entity_service_impl_service_1.EntityServiceImpl {
     constructor(configService, mediaRepository, dataSource) {
         super();
@@ -36,13 +37,14 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
             signatureVersion: 'v4',
         });
     }
-    async generateMediaUploadDetails(fileName, mappedAttributeKey, loggedInUser, mappedEntityType, mappedEntityId) {
+    async generateMediaUploadDetails(fileName, mappedAttributeKey, loggedInUser, mappedEntityType, mappedEntityId, parentId, parentType) {
         if (!fileName || !mappedAttributeKey) {
             return null;
         }
         const ext = fileName.split('.').pop()?.toLowerCase() ?? '';
         const id = (0, uuid_1.v4)();
-        const s3Key = `uploads/${id}.${ext}`;
+        const s3Path = (await this.buildUploadPathGeneric(mappedEntityType || '', loggedInUser, mappedEntityId, parentId, parentType)) || `uploads`;
+        const s3Key = `${s3Path}/${id}.${ext}`;
         const uploadUrl = await this.s3.getSignedUrlPromise('putObject', {
             Bucket: this.bucketName,
             Key: s3Key,
@@ -90,10 +92,12 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
             const mediaData = entityData;
             let fileSize;
             if (this.bucketName) {
-                const head = await this.s3.headObject({
+                const head = await this.s3
+                    .headObject({
                     Bucket: this.bucketName,
                     Key: mediaData.media_url,
-                }).promise();
+                })
+                    .promise();
                 fileSize = head.ContentLength;
             }
             const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
@@ -101,14 +105,19 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
                 Key: mediaData.media_url,
                 Expires: Number(expiresIn) || 60 * 5,
             });
-            return { signedUrl, fileName: mediaData.file_name, id: mediaData.id, size: fileSize };
+            return {
+                signedUrl,
+                fileName: mediaData.file_name,
+                id: mediaData.id,
+                size: fileSize,
+            };
         }
         catch (error) {
             console.error('Error generating signed URL for media:', error);
             throw new Error('Failed to generate signed URL');
         }
     }
-    async buildUploadPathGeneric(mappedEntityType, loggedInUser, mappedEntityId, parentId, parentType) {
+    async buildUploadPathGenericdd(mappedEntityType, loggedInUser, mappedEntityId, parentId, parentType) {
         const entityMaster = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
         if (!entityMaster) {
             throw new Error(`Entity master not found for ${mappedEntityType}`);
@@ -121,11 +130,57 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
         const replacements = {};
         let organizationData = await this.dataSource.query('SELECT * FROM sso_organization WHERE id = ?', [loggedInUser.organization_id]);
         replacements['org_code'] = organizationData[0].code;
-        const levelEntityId = entityOverwrite ? mappedEntityId : loggedInUser.level_id;
-        const levelEntityData = await super.getEntityData(loggedInUser.level_type, levelEntityId, loggedInUser);
+        let levelEntityId;
+        let levelEntityType;
+        if (parentId && parentType) {
+            levelEntityId = parentId;
+            levelEntityType = parentType;
+        }
+        else {
+            levelEntityId = entityOverwrite ? mappedEntityId : loggedInUser.level_id;
+            levelEntityType = entityOverwrite
+                ? mappedEntityType
+                : loggedInUser.level_type;
+        }
+        const getEntityData = await this.dataSource.query(`SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? and organization_id = ?`, [levelEntityType, loggedInUser.organization_id]);
+        if (getEntityData.length == 0)
+            return null;
+        const levelEntityDataResult = await this.dataSource.query(`SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = ?`, [levelEntityId]);
+        const levelEntityData = levelEntityDataResult[0] || null;
         if (levelEntityData?.code) {
             replacements['level_code'] = levelEntityData.code;
         }
+        if (parentId && parentType && mappedEntityId && mappedEntityType) {
+            const mappedEntityKey = `${mappedEntityType.toLowerCase()}_code`;
+            const mappedEntityData = await super.getEntityData(mappedEntityType, mappedEntityId, loggedInUser);
+            if (mappedEntityData?.code) {
+                replacements[mappedEntityKey] = mappedEntityData.code;
+                const mappedVariable = `\${${mappedEntityKey}}`;
+                if (!pathTemplate.includes(mappedVariable)) {
+                    pathTemplate = pathTemplate + `/${mappedVariable}`;
+                }
+            }
+        }
+        if (parentId && parentType) {
+            const getEntityData = await this.dataSource.query(`SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? and organization_id = ?`, [mappedEntityType, loggedInUser.organization_id]);
+            if (getEntityData.length == 0)
+                return null;
+            const levelEntityDataResult = await this.dataSource.query(`SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = ?`, [mappedEntityId]);
+            if (levelEntityDataResult?.[0].code &&
+                parentType != 'SCH' &&
+                loggedInUser.level_type != 'SCH') {
+                replacements['template_code'] = levelEntityDataResult[0].code;
+                pathTemplate = '${org_code}/template/${template_code}';
+            }
+            else {
+                const getEntityData = await this.dataSource.query(`SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? and organization_id = ?`, [mappedEntityType, loggedInUser.organization_id]);
+                if (getEntityData.length == 0)
+                    return null;
+                const levelEntityDataResult = await this.dataSource.query(`SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = ?`, [mappedEntityId]);
+                replacements['template_code'] = levelEntityDataResult?.[0].code;
+                pathTemplate = '${org_code}/${level_code}/template/${template_code}';
+            }
+        }
         const matches = pathTemplate.match(/\$\{(\w+)\}/g) || [];
         for (const variable of matches) {
             const key = variable.replace(/\$\{|\}/g, '');
@@ -133,14 +188,28 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
                 continue;
             if (key === 'org_code')
                 continue;
+            if (key === 'level_code')
+                continue;
+            if (key === 'template_code')
+                continue;
             if (key.endsWith('_code')) {
                 const entityType = key.replace('_code', '').toUpperCase();
                 let entityId;
-                if (parentType?.toUpperCase() === entityType && parentId) {
-                    entityId = parentId;
+                if (key === 'template_code') {
+                    if (parentType?.toUpperCase() === 'TEMPLATE' && parentId) {
+                        entityId = parentId;
+                    }
+                    else if (mappedEntityType === 'TEMPLATE') {
+                        entityId = mappedEntityId;
+                    }
                 }
                 else {
-                    entityId = mappedEntityId;
+                    if (parentType?.toUpperCase() === entityType && parentId) {
+                        entityId = parentId;
+                    }
+                    else if (mappedEntityType === entityType) {
+                        entityId = mappedEntityId;
+                    }
                 }
                 if (entityId) {
                     const entityData = await super.getEntityData(entityType, entityId, loggedInUser);
@@ -149,7 +218,6 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
             }
         }
         if (loggedInUser.level_type === 'ORG' && entityOverwrite === 0) {
-            replacements['level_code'] = null;
         }
         if (pathTemplate) {
             const finalPath = this.resolveUploadPath(pathTemplate, replacements);
@@ -157,11 +225,70 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
         }
         return null;
     }
+    async buildUploadPathGeneric(mappedEntityType, loggedInUser, mappedEntityId, parentId, parentType) {
+        let appCode = '';
+        let org_id = loggedInUser.organization_id;
+        let level_type = loggedInUser.level_type;
+        let level_id = loggedInUser.level_type == 'ORG' && mappedEntityType == 'SCH'
+            ? mappedEntityId
+            : loggedInUser.level_id;
+        let organizationData = {};
+        let levelData = {};
+        let mappedEntityData = {};
+        if (loggedInUser && loggedInUser.appcode) {
+            appCode = loggedInUser.appcode;
+        }
+        if (appCode && appCode != 'ADM') {
+            const baseUrl = this.configService.get('REDIRECT_BE_URL');
+            const queryParams = new URLSearchParams({
+                loggedInUser: JSON.stringify(loggedInUser),
+            }).toString();
+            organizationData = await axios_1.default
+                .get(`${baseUrl}/organization/public/?${queryParams}`)
+                .then((res) => res.data)
+                .catch((err) => {
+                console.error('Error fetching organization data:', err.message);
+                return null;
+            });
+            levelData = await axios_1.default
+                .get(`${baseUrl}/school/public/?${queryParams}`)
+                .then((res) => res.data)
+                .catch((err) => {
+                console.error('Error fetching school data:', err.message);
+                return null;
+            });
+        }
+        else {
+            organizationData = await this.dataSource.query('SELECT * FROM adm_org_profile WHERE id = ?', [loggedInUser.organization_id]);
+            levelData = await this.dataSource.query('SELECT * FROM adm_school_profile WHERE id = ?', [loggedInUser.level_id]);
+        }
+        console.log(levelData);
+        let subfolder = mappedEntityType == level_type
+            ? 'data'
+            : parentType
+                ? `${parentType}/${parentId}/${mappedEntityType}`
+                : mappedEntityType;
+        let path = '${org_code}/${level_code}/' +
+            (subfolder !== 'data'
+                ? `${subfolder}/${mappedEntityId}`
+                : `${subfolder}`);
+        const replacements = {};
+        replacements['org_code'] = organizationData[0]?.code;
+        replacements['level_code'] = levelData[0]?.code;
+        if (path) {
+            const finalPath = this.resolveUploadPath(path, replacements);
+            return finalPath;
+        }
+        return null;
+    }
     resolveUploadPath(template, replacements) {
         let path = template;
         path = path.replace(/\$\{(\w+)\}/g, (_, key) => replacements[key] || '');
         return path.replace(/\/+/g, '/').replace(/\/$/, '');
     }
+    async buildUploadPath(mappedEntityType, loggedInUser, mappedEntityId, parentId, parentType) {
+        return this.buildUploadPathGeneric(mappedEntityType, loggedInUser, mappedEntityId, parentId, parentType);
+    }
 };
 exports.MediaDataService = MediaDataService;
 exports.MediaDataService = MediaDataService = __decorate([

package/dist/module/meta/service/media-data.service.js.map

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

package/dist/module/meta/service/view-master.service.js

@@ -52,7 +52,7 @@ let ViewMasterService = class ViewMasterService extends entity_service_impl_serv
         let getTheme = null;
         try {
             const baseUrl = this.configService.get('REDIRECT_BE_URL');
-            const response = await axios_1.default.get(`${baseUrl}/school/theme_json/${loggedInUserData?.level_id}`, {
+            const response = await axios_1.default.get(`${baseUrl}/school/public/theme_json/${loggedInUserData?.level_id}`, {
                 headers: {
                     'Content-Type': 'application/json',
                 },

package/dist/module/meta/service/view-master.service.js.map

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

package/dist/module/notification/controller/otp.controller.d.ts

@@ -28,6 +28,15 @@ export declare class OtpController {
         level_type?: undefined;
         level_id?: undefined;
         slug?: undefined;
+    } | {
+        success: boolean;
+        message: string;
+        type?: undefined;
+        accessToken?: undefined;
+        appcode?: undefined;
+        level_type?: undefined;
+        level_id?: undefined;
+        slug?: undefined;
     } | {
         success: boolean;
         accessToken: string;

package/dist/module/notification/service/otp.service.d.ts

@@ -34,6 +34,15 @@ export declare class OtpService {
         level_type?: undefined;
         level_id?: undefined;
         slug?: undefined;
+    } | {
+        success: boolean;
+        message: string;
+        type?: undefined;
+        accessToken?: undefined;
+        appcode?: undefined;
+        level_type?: undefined;
+        level_id?: undefined;
+        slug?: undefined;
     } | {
         success: boolean;
         accessToken: string;

package/dist/module/user/service/login.service.d.ts

@@ -36,6 +36,15 @@ export declare class LoginService {
         level_type?: undefined;
         level_id?: undefined;
         slug?: undefined;
+    } | {
+        success: boolean;
+        message: string;
+        type?: undefined;
+        accessToken?: undefined;
+        appcode?: undefined;
+        level_type?: undefined;
+        level_id?: undefined;
+        slug?: undefined;
     } | {
         success: boolean;
         accessToken: string;
@@ -64,6 +73,15 @@ export declare class LoginService {
         level_type?: undefined;
         level_id?: undefined;
         slug?: undefined;
+    } | {
+        success: boolean;
+        message: string;
+        type?: undefined;
+        accessToken?: undefined;
+        appcode?: undefined;
+        level_type?: undefined;
+        level_id?: undefined;
+        slug?: undefined;
     } | {
         success: boolean;
         accessToken: string;

package/dist/module/user/service/login.service.js

@@ -73,7 +73,10 @@ let LoginService = class LoginService {
             where: { user_id: user.id, appcode },
         });
         if (!roleMappings.length) {
-            throw new common_1.BadRequestException('User does not have any access mapped for this app.');
+            return {
+                success: false,
+                message: 'You do not have access to this application.',
+            };
         }
         const defaultAccess = await this.getDefaultAccess(user, roleMappings);
         await this.userService.setLastLevelTypeAndId(user.id, defaultAccess.level_type, defaultAccess.level_id, defaultAccess.appcode);

package/dist/module/user/service/login.service.js.map

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

package/dist/module/workflow/service/workflow-meta.service.d.ts

@@ -7,15 +7,17 @@ import { ActionDataService } from './action-data.service';
 import { ActivityLogService } from './activity-log.service';
 import { EntityModificationService } from './entity-modification.service';
 import { TaskService } from './task.service';
+import { TaskRepository } from '../repository/task.repository';
 export declare class WorkflowMetaService extends EntityServiceImpl {
     private readonly stageMovementRepo;
     private readonly stageMovementRepository;
     private readonly dataSource;
+    private readonly taskRepository;
     private readonly actionDataService;
     private readonly taskService;
     private readonly activityLogService;
     private readonly modificationService;
-    constructor(stageMovementRepo: Repository<StageMovementData>, stageMovementRepository: StageMovementRepository, dataSource: DataSource, actionDataService: ActionDataService, taskService: TaskService, activityLogService: ActivityLogService, modificationService: EntityModificationService);
+    constructor(stageMovementRepo: Repository<StageMovementData>, stageMovementRepository: StageMovementRepository, dataSource: DataSource, taskRepository: TaskRepository, actionDataService: ActionDataService, taskService: TaskService, activityLogService: ActivityLogService, modificationService: EntityModificationService);
     getFirstStage(loggedInUser: UserData, mapped_entity_type: string, mapped_entity_id: number): Promise<any | null>;
     getCurrentStage(mapped_entity_type: string, mapped_entity_id: number, loggedInUser: UserData): Promise<any | null>;
     getNextStage(currentStage: any): Promise<any | null>;

package/dist/module/workflow/service/workflow-meta.service.js

@@ -24,12 +24,14 @@ const action_data_service_1 = require("./action-data.service");
 const activity_log_service_1 = require("./activity-log.service");
 const entity_modification_service_1 = require("./entity-modification.service");
 const task_service_1 = require("./task.service");
+const task_repository_1 = require("../repository/task.repository");
 let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(stageMovementRepo, stageMovementRepository, dataSource, actionDataService, taskService, activityLogService, modificationService) {
+    constructor(stageMovementRepo, stageMovementRepository, dataSource, taskRepository, actionDataService, taskService, activityLogService, modificationService) {
         super();
         this.stageMovementRepo = stageMovementRepo;
         this.stageMovementRepository = stageMovementRepository;
         this.dataSource = dataSource;
+        this.taskRepository = taskRepository;
         this.actionDataService = actionDataService;
         this.taskService = taskService;
         this.activityLogService = activityLogService;
@@ -121,6 +123,13 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
             const { nextStage } = stageData;
             if (nextStage.stage_group_id !== currentStage.stage_group_id) {
                 try {
+                    const stageActions = await this.stageMovementRepository.getAllActionByStageId(currentStage.stage_id);
+                    for (const action of stageActions) {
+                        const actionCategory = await this.dataSource.query(`SELECT code FROM frm_wf_action_category WHERE id = ${Number(action.action_category)}`);
+                        if (actionCategory[0]?.code == 'SGCP') {
+                            await this.taskRepository.updateTaskStatus(loggedInUser, mapped_entity_type, mapped_entity_id, currentStage.stage_id, action.id);
+                        }
+                    }
                     await this.activityLogService.logActivity({
                         mapped_entity_id,
                         mapped_entity_type,
@@ -342,12 +351,13 @@ exports.WorkflowMetaService = WorkflowMetaService;
 exports.WorkflowMetaService = WorkflowMetaService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(stage_movement_data_entity_1.StageMovementData)),
-    __param(4, (0, common_1.Inject)('TaskService')),
-    __param(5, (0, common_1.Inject)('ActivityLogService')),
-    __param(6, (0, common_1.Inject)('EntityModificationService')),
+    __param(5, (0, common_1.Inject)('TaskService')),
+    __param(6, (0, common_1.Inject)('ActivityLogService')),
+    __param(7, (0, common_1.Inject)('EntityModificationService')),
     __metadata("design:paramtypes", [typeorm_2.Repository,
         stage_movement_repository_1.StageMovementRepository,
         typeorm_2.DataSource,
+        task_repository_1.TaskRepository,
         action_data_service_1.ActionDataService,
         task_service_1.TaskService,
         activity_log_service_1.ActivityLogService,