rez_core 2.1.143 → 2.1.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.143",
+  "version": "2.1.145",
   "description": "",
   "author": "",
   "private": false,

package/src/constant/global.constant.ts

@@ -50,3 +50,5 @@ export const COMM_TEMPLATE = 'TEM';
 export const ACTION_TEMPLATE_MAPPING = 'ATMP';
 export const WORKFLOW_DATA = 'WFDT';
 export const STAGE_MOVEMENT_DATA = 'STMV';
+
+export const ENTITY_MODIFICATION = 'ENMD';

package/src/module/enterprise/repository/school.repository.ts

@@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { DataSource, Repository } from 'typeorm';
 import { SchoolData } from '../entity/school.entity';
 import { UserRoleMapping } from 'src/module/user/entity/user-role-mapping.entity';
+import { STATUS_INACTIVE } from 'src/constant/global.constant';
 
 @Injectable()
 export class SchoolRepository {
@@ -39,6 +40,16 @@ export class SchoolRepository {
       currentORGLevel_id = org_id;
     }
 
+    const resolvedInactiveStatus = await this.dataSource
+      .createQueryBuilder()
+      .select('*')
+      .from('cr_list_master_items', 'cli')
+      .where('cli.code = :code AND cli.organization_id = :orgId', {
+        code: STATUS_INACTIVE,
+        orgId: org_id,
+      })
+      .getRawOne();
+
     if (hasOrgAccess.length > 0) {
       const schools = await this.dataSource
         .createQueryBuilder()
@@ -129,9 +140,14 @@ export class SchoolRepository {
             })
             .getRawOne();
 
+          const finalSchoolName =
+            schoolStatus?.id === resolvedInactiveStatus?.id
+              ? `${school_name} [INACTIVE]`
+              : school_name;
+
           result[org_id].brands[brand_id].schools.push({
             school_id,
-            school_name,
+            school_name: finalSchoolName,
             school_location,
             status: schoolStatus ? schoolStatus.name : school_status,
             type: 'School',
@@ -225,13 +241,18 @@ export class SchoolRepository {
           };
         }
 
+        const finalSchoolName =
+          school_status === resolvedInactiveStatus?.id
+            ? `${school_name} [INACTIVE]`
+            : school_name;
+
         if (
           school_id &&
           !result[brand_id].schools.some((s) => s.school_id === school_id)
         ) {
           result[brand_id].schools.push({
             school_id,
-            school_name,
+            school_name: finalSchoolName,
             school_location,
             status: school_status,
             type: 'School',

package/src/module/workflow/controller/action.controller.ts

@@ -41,4 +41,15 @@ export class ActionController {
     );
     return result;
   }
+
+  @Post('/getActions')
+  @HttpCode(HttpStatus.OK)
+  async getActions(
+    @Req() req: Request & { user: any },
+    @Body('workflow_id') workflow_id: number,
+  ) {
+    const loggedInUser = req.user.userData;
+    const result = this.actionService.getActions(loggedInUser, workflow_id);
+    return result;
+  }
 }

package/src/module/workflow/controller/entity-modification.controller.ts

@@ -0,0 +1,35 @@
+import {
+  Body,
+  Controller,
+  Get,
+  HttpCode,
+  HttpStatus,
+  Inject,
+  Post,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { EntityModificationService } from '../service/entity-modification.service';
+
+@Controller('/entity-modification')
+@UseGuards(JwtAuthGuard)
+export class EntityModificationController {
+  constructor(
+    @Inject('EntityModificationService')
+    private readonly entityModificationService: EntityModificationService,
+  ) {}
+
+  @Post('/logModification')
+  @HttpCode(HttpStatus.OK)
+  async logModification(
+    @Body() modificationData: any,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    return await this.entityModificationService.logModification(
+      modificationData,
+      loggedInUser,
+    );
+  }
+}

package/src/module/workflow/controller/workflow.controller.ts

@@ -44,7 +44,7 @@ export class WorkflowController {
   }
   SS;
 
-  @Put('/updateSequence')
+  @Post('/updateSequence')
   @HttpCode(HttpStatus.OK)
   async updateSequence(@Body() body: any, @Req() req: Request & { user: any }) {
     const loggedInUser = req.user?.userData;

package/src/module/workflow/entity/action.entity.ts

@@ -18,6 +18,9 @@ export class ActionEntity extends BaseEntity {
   @Column({ type: 'varchar', nullable: true })
   action_requirement: string;
 
+  @Column({ type: 'varchar', nullable: true })
+  template: string;
+
   @Column({ type: 'varchar', nullable: true })
   reason_code: string;
 

package/src/module/workflow/entity/entity-modification.entity.ts

@@ -0,0 +1,38 @@
+import { ENTITY_MODIFICATION } from 'src/constant/global.constant';
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'cr_wf_entity_modification' })
+export class EntityModification extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITY_MODIFICATION;
+  }
+
+  @Column({ type: 'int', nullable: true })
+  mapped_entity_id: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  mapped_entity_type: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  mode: string;
+
+  @Column({ type: 'int', nullable: true })
+  stage_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  action_id: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  attribute_key: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  current_value: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  new_value: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  reason_code: string;
+}

package/src/module/workflow/repository/comm-template.repository.ts

@@ -19,4 +19,23 @@ export class CommTemplateRepository {
       },
     });
   }
+
+  async getTemplateByCode(
+    entity_type: string,
+    code: string,
+    loggedInUser,
+  ): Promise<CommTemplate | null> {
+    const template = await this.commTemplateRepository.findOne({
+      where: {
+        entity_type: entity_type,
+        code: code,
+      },
+    });
+
+    if (!template) {
+      throw new NotFoundException(`Template with code ${code} not found`);
+    }
+
+    return template;
+  }
 }

package/src/module/workflow/service/action.service.ts

@@ -209,4 +209,34 @@ export class ActionService extends EntityServiceImpl {
       value: row.name,
     }));
   }
+
+  async getActions(loggedInUser: UserData, workflow_id: number) {
+    const { organization_id } = loggedInUser;
+
+    const result = await this.dataSource.query(
+      `
+    SELECT 
+      a.name AS action_name,
+      ac.name AS action_category,
+      ar.name AS action_requirement,
+      'Email Template' AS template
+
+    FROM cr_wf_action a
+
+    LEFT JOIN cr_wf_action_category ac 
+      ON ac.id = a.action_cat_id
+
+    LEFT JOIN cr_list_master_items ar 
+      ON ar.id = a.action_requirement
+      AND ar.listtype = 'ACRQ'
+      AND ar.organization_id = ?
+
+    WHERE a.organization_id = ?
+    AND a.workflow_id = ?
+    `,
+      [organization_id, organization_id, workflow_id],
+    );
+
+    return result;
+  }
 }

package/src/module/workflow/service/comm-template.service.ts

@@ -8,6 +8,22 @@ export class CommTemplateService extends EntityServiceImpl {
     super();
   }
 
+  async getEntityData(
+    entityType: string,
+    id: number,
+    loggedInUser,
+  ): Promise<any> {
+    //TODO: check if current level_id and levl_type has that code if not go to parent level
+
+    const getTemplate = await this.commTemplateRepository.getTemplateByCode(
+      entityType,
+      id.toString(),
+      loggedInUser,
+    );
+
+    return getTemplate;
+  }
+
   async getAllCommTemplate(entity_type: string, loggedInUser) {
     const commTemplateData =
       await this.commTemplateRepository.getAllCommTemplate(

package/src/module/workflow/service/entity-modification.service.ts

@@ -0,0 +1,67 @@
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { UserData } from 'src/module/user/entity/user.entity';
+import { DataSource } from 'typeorm';
+
+@Injectable()
+export class EntityModificationService extends EntityServiceImpl {
+  constructor(private readonly dataSource: DataSource) {
+    super();
+  }
+  async logModification(modificationData: any, loggedInUser: UserData) {
+    const { mapped_entity_type, mapped_entity_id, attribute_key } =
+      modificationData;
+    const { organization_id } = loggedInUser;
+
+    if (!mapped_entity_type || !mapped_entity_id || !attribute_key) {
+      throw new BadRequestException(
+        'Missing required modification data: mapped_entity_type, mapped_entity_id, or attribute_key',
+      );
+    }
+
+    // Step 1: Fetch db_table_name from cr_entity_master
+    const [entityMeta] = await this.dataSource.query(
+      `
+    SELECT db_table_name 
+    FROM cr_entity_master 
+    WHERE mapped_entity_type = ? AND organization_id = ?
+    `,
+      [mapped_entity_type, organization_id],
+    );
+
+    if (!entityMeta || !entityMeta.db_table_name) {
+      throw new NotFoundException(
+        'Entity metadata not found in cr_entity_master',
+      );
+    }
+
+    const tableName = entityMeta.db_table_name;
+
+    // Step 2: Get the row from the target table using mapped_entity_id
+    const [entityRow] = await this.dataSource.query(
+      `
+    SELECT * FROM ${tableName} WHERE id = ?
+    `,
+      [mapped_entity_id],
+    );
+
+    if (!entityRow) {
+      throw new NotFoundException(
+        `No record found in ${tableName} with ID ${mapped_entity_id}`,
+      );
+    }
+
+    // Step 3: Extract current value from the target column
+    const currentAttributeValue = entityRow[attribute_key];
+
+    // Step 4: Set current_value in modificationData
+    modificationData.current_value = currentAttributeValue;
+
+    // Step 5: Call super.createEntity with updated modificationData
+    return await super.createEntity(modificationData, loggedInUser);
+  }
+}

package/src/module/workflow/service/stage-group.service.ts

@@ -4,6 +4,7 @@ import { StageGroupRepository } from '../repository/stage-group.repository';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { StageService } from './stage.service';
+import { DataSource } from 'typeorm';
 
 @Injectable()
 export class StageGroupService extends EntityServiceImpl {
@@ -11,6 +12,7 @@ export class StageGroupService extends EntityServiceImpl {
     private readonly stageGroupRepository: StageGroupRepository,
     @Inject('StageService')
     private readonly stageService: StageService,
+    private readonly dataSource: DataSource,
   ) {
     super();
   }
@@ -46,10 +48,9 @@ export class StageGroupService extends EntityServiceImpl {
     id: number,
     loggedInUser: UserData,
   ): Promise<any> {
-    const getAllStage = await this.stageService.getAllStage(
-      id,
-      loggedInUser.level_id,
-      loggedInUser.level_type,
+    const getAllStage = await this.dataSource.query(
+      `SELECT id FROM cr_wf_stage WHERE stage_group_id = ? AND level_id =? AND level_type = ?`,
+      [id, loggedInUser.level_id, loggedInUser.level_type],
     );
 
     if (getAllStage.length > 0) {

package/src/module/workflow/service/workflow.service.ts

@@ -1,3 +1,4 @@
+import { get } from 'http';
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { DataSource, In } from 'typeorm';
@@ -106,17 +107,34 @@ export class WorkflowService extends EntityServiceImpl {
     id: number,
     loggedInUser: UserData,
   ): Promise<any> {
-    const getAllStage = await this.stageGroupRepository.getAllStageGroup(
-      id,
-      loggedInUser.level_id,
-      loggedInUser.level_type,
+    const getWorkflow = await this.getEntityData(entityType, id, loggedInUser);
+
+    if (!getWorkflow) {
+      throw new BadRequestException('Workflow not found');
+    }
+
+    if ((getWorkflow as Workflow).is_default) {
+      throw new BadRequestException(
+        'Cannot delete workflow because it is default.',
+      );
+    }
+
+    if ((getWorkflow as Workflow).is_factory) {
+      throw new BadRequestException(
+        'Cannot delete workflow because it is factory.',
+      );
+    }
+
+    const getAllStageGroup = await this.dataSource.query(
+      `SELECT id FROM cr_wf_stage_group WHERE workflow_id = ? AND level_id = ? AND level_type = ?`,
+      [id, loggedInUser.level_id, loggedInUser.level_type],
     );
 
-    if (getAllStage.length > 0) {
-      for (const stage of getAllStage) {
+    if (getAllStageGroup.length > 0) {
+      for (const stageGroup of getAllStageGroup) {
         await this.stateGroupService.deleteEntity(
           'STGP',
-          stage.id,
+          stageGroup.id,
           loggedInUser,
         );
       }

package/src/module/workflow/workflow.module.ts

@@ -30,6 +30,10 @@ import { StageGroupController } from './controller/stage-group.controller';
 import { StageController } from './controller/stage.controller';
 import { StageRepository } from './repository/stage.repository';
 import { ActionController } from './controller/action.controller';
+import { EntityController } from '../meta/controller/entity.controller';
+import { EntityModificationService } from './service/entity-modification.service';
+import { EntityModification } from './entity/entity-modification.entity';
+import { EntityModificationController } from './controller/entity-modification.controller';
 
 @Module({
   imports: [
@@ -42,6 +46,7 @@ import { ActionController } from './controller/action.controller';
       CommTemplate,
       ActionTemplateMapping,
       StageActionMapping,
+      EntityModification,
     ]),
     EntityModule,
     ListMasterModule,
@@ -57,6 +62,10 @@ import { ActionController } from './controller/action.controller';
     { provide: 'StageService', useClass: StageService },
     { provide: 'StageGroupService', useClass: StageGroupService },
     { provide: 'WorkflowService', useClass: WorkflowService },
+    {
+      provide: 'EntityModificationService',
+      useClass: EntityModificationService,
+    },
     WorkflowListMasterService,
     ActionTemplateMappingService,
     WorkflowRepository,
@@ -72,6 +81,7 @@ import { ActionController } from './controller/action.controller';
     'ActionService',
     'StageService',
     'StageGroupService',
+    'EntityModificationService',
     WorkflowRepository,
     StageGroupRepository,
     StageRepository,
@@ -84,6 +94,7 @@ import { ActionController } from './controller/action.controller';
     StageGroupController,
     StageController,
     ActionController,
+    EntityModificationController,
   ],
 })
 export class WorkflowModule {}