rez_core 2.2.112 → 2.2.114

package/package.json

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

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

@@ -1,5 +1,11 @@
+import { level } from 'winston';
 import { Injectable } from '@nestjs/common';
+import {
+  ENTITYTYPE_ENTITYMASTER,
+  STATUS_ACTIVE,
+} from 'src/constant/global.constant';
 import { DataSource } from 'typeorm';
+import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class EntityDynamicService {
@@ -8,7 +14,7 @@ export class EntityDynamicService {
   // -----------------------------
   async createEntity(
     entityType: string,
-    data: Record<string, any>,
+    entityData: Record<string, any>,
     loggedInUser: any,
   ): Promise<any> {
     const organizationId = loggedInUser.organization_id;
@@ -19,12 +25,59 @@ export class EntityDynamicService {
       organizationId,
     );
 
+    const statusList = await this.dataSource.query(
+      `SELECT id FROM cr_list_master_items WHERE code = ? AND organization_id = ?`,
+      [STATUS_ACTIVE, loggedInUser?.organization_id || 0],
+    );
+
+    entityData.created_date = new Date();
+    if (loggedInUser) {
+      entityData.created_by = loggedInUser.id;
+      if (!entityData.organization_id)
+        entityData.organization_id = loggedInUser.organization_id;
+      if (!entityData.enterprise_id)
+        entityData.enterprise_id = loggedInUser.enterprise_id;
+      if (!entityData.level_type)
+        entityData.level_type = loggedInUser.level_type;
+      if (!entityData.level_id) entityData.level_id = loggedInUser.level_id;
+      if (!entityData.status) entityData.status = statusList[0].id;
+    }
+
+    if (!entityData.code && loggedInUser) {
+      const result = await this.dataSource.query(
+        `SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
+     FROM ${tableName}
+     WHERE entity_type = ?`,
+        [entityData.entity_type],
+      );
+
+      // result will be like [ { max_seq_no: 12 } ]
+      let maxSeqNo = result?.[0]?.max_seq_no ? Number(result[0].max_seq_no) : 0;
+
+      maxSeqNo += 1;
+      entityData.code = `${entityData.entity_type}${maxSeqNo}`;
+    }
+
+    const bypassColumn = [
+      'created_date',
+      'created_by',
+      'organization_id',
+      'enterprise_id',
+      'level_type',
+      'level_id',
+      'status',
+      'entity_type',
+      'code',
+    ];
+
+    validAttributes.push(...bypassColumn);
+
     const columns: string[] = [];
     const values: any[] = [];
 
     validAttributes.forEach((attr) => {
       columns.push(attr);
-      values.push(attr in data ? data[attr] : null);
+      values.push(attr in entityData ? entityData[attr] : null);
     });
 
     const placeholders = columns.map(() => '?').join(', ');
@@ -396,7 +449,7 @@ export class EntityDynamicService {
   async updateEntity(
     entityType: string,
     id: number | string,
-    data: Record<string, any>,
+    entityData: Record<string, any>,
     loggedInUser: any,
   ): Promise<any> {
     const organizationId = loggedInUser.organization_id;
@@ -410,10 +463,35 @@ export class EntityDynamicService {
     const updates: string[] = [];
     const values: any[] = [];
 
-    for (const key of Object.keys(data)) {
+    entityData.modified_date = new Date();
+    if (loggedInUser) {
+      entityData.modified_by = loggedInUser.id;
+      if (!entityData.organization_id && entityData.entity_type !== 'ORG')
+        entityData.organization_id = loggedInUser.organization_id;
+      if (!entityData.enterprise_id)
+        entityData.enterprise_id = loggedInUser.enterprise_id;
+    }
+
+    const bypassColumn = [
+      'created_date',
+      'created_by',
+      'modified_date',
+      'modified_by',
+      'organization_id',
+      'enterprise_id',
+      'level_type',
+      'level_id',
+      'status',
+      'entity_type',
+      'code',
+    ];
+
+    validAttributes.push(...bypassColumn);
+
+    for (const key of Object.keys(entityData)) {
       if (validAttributes.includes(key)) {
         updates.push(`\`${key}\` = ?`);
-        values.push(data[key]);
+        values.push(entityData[key]);
       }
     }