rez_core 2.1.128 → 2.1.130

package/package.json

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

package/src/module/meta/service/entity-service-impl.service.ts

@@ -248,6 +248,21 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       loggedInUser,
     );
 
+    const validationErrors =
+      await this.entityValidationService.validateEntityData(
+        entityData,
+        entityMaster,
+        loggedInUser,
+      );
+    console.log('Validation Errors For Update:', validationErrors); // Debug log
+    if (validationErrors && validationErrors.length > 0) {
+      return {
+        success: false,
+        message: 'Validation failed',
+        errors: validationErrors,
+      };
+    }
+
     const repoService = this.reflectionHelper.getRepoService(
       entityMaster.entity_data_class,
     );

package/src/module/meta/service/entity-validation.service.ts

@@ -52,6 +52,7 @@ export class EntityValidationService {
     loggedInUser: any,
   ): Promise<ValidationError[]> {
     const errors: ValidationError[] = [];
+    const currentId = entityData.id; // assuming 'id' is the primary key
 
     for (const attr of attributeData.filter((a) => a.is_unique)) {
       const value = entityData[attr.attribute_key];
@@ -63,7 +64,7 @@ export class EntityValidationService {
           .from(db_table_name, db_table_name)
           .where(`${db_table_name}.${attr.attribute_key} = :value`, { value });
 
-        // Add AND condition for organization_id if present
+        // Add AND condition for organization_id/level_type/level_id if present
         const orgId = loggedInUser.organization_id;
         const level_type = loggedInUser.level_type;
         const level_id = loggedInUser.level_id;
@@ -73,12 +74,17 @@ export class EntityValidationService {
             `${db_table_name}.organization_id = :organization_id AND ${db_table_name}.level_type = :level_type AND ${db_table_name}.level_id = :level_id`,
             {
               organization_id: orgId,
-              level_type: level_type,
-              level_id: level_id,
+              level_type,
+              level_id,
             },
           );
         }
 
+        // Skip the current record when checking for uniqueness during update
+        if (currentId) {
+          qb = qb.andWhere(`${db_table_name}.id != :id`, { id: currentId });
+        }
+
         const existing = await qb.limit(1).getRawOne();
 
         if (existing) {

package/src/module/workflow/controller/action-template-mapping.controller.ts

@@ -4,6 +4,7 @@ import {
   HttpCode,
   HttpStatus,
   Post,
+  Req,
   UseGuards,
 } from '@nestjs/common';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
@@ -20,12 +21,14 @@ export class ActionTemplateMappingController {
   @HttpCode(HttpStatus.OK)
   async getTemplate(
     @Body() body: { stage_id: number; action_id: number; mode: number },
+    @Req() req: Request & { user: any },
   ) {
-    console.log('Incoming Body:', body);
+    const loggedInUser = req.user.userData;
     const result = this.actionTemplateMappingService.getTemplateByMode(
       body.stage_id,
       body.action_id,
       body.mode,
+      loggedInUser,
     );
     return result;
   }

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

@@ -9,6 +9,6 @@ export class CommTemplate extends BaseEntity {
     this.entity_type = COMM_TEMPLATE;
   }
 
-  @Column({ type: 'int', nullable: true })
-  mode: number;
+  @Column({ type: 'varchar', nullable: true })
+  mode: string;
 }

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -7,7 +7,12 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
   constructor(private readonly dataSource: DataSource) {
     super();
   }
-  async getTemplateByMode(stage_id: number, action_id: number, mode: number) {
+  async getTemplateByMode(
+    stage_id: number,
+    action_id: number,
+    mode: number,
+    loggedInUser,
+  ) {
     const stageAction = await this.dataSource.query(
       `
       SELECT id FROM cr_wf_stage_action_mapping
@@ -26,6 +31,11 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       `,
       [stgActMappingId],
     );
+    const listMasterItemData = await this.dataSource.query(
+      `SELECT code FROM cr_list_master_items WHERE id = ?`,
+      [mode],
+    );
+
     const templateCodes = templates.map((t) => t.template_code);
     if (!templateCodes.length) return [];
 
@@ -33,9 +43,9 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       `
       SELECT id, name
       FROM cr_wf_comm_template
-      WHERE code IN (?) AND mode = ?
+      WHERE code IN (?) AND mode = ? AND organization_id = ?
       `,
-      [templateCodes, mode],
+      [templateCodes, listMasterItemData[0].code, loggedInUser.organization_id],
     );
     return commTemplates.map((t) => ({ id: t.id, name: t.name }));
   }