rez_core 6.5.66 → 6.5.68

package/src/module/meta/entity/base-entity.entity.ts

@@ -1,75 +1,49 @@
-import { Column, PrimaryGeneratedColumn } from 'typeorm';
-import { Expose } from 'class-transformer';
+import { Column, CreateDateColumn, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
 
 export class BaseEntity {
-  constructor() {
-    this.created_date = new Date();
-  }
 
   @PrimaryGeneratedColumn({ type: 'bigint' })
-  @Expose()
   id: number;
 
-  @Column({ name: 'entity_type', type: 'varchar', length: 100, nullable: true })
-  @Expose()
+  @Column({name: 'entity_type',  type: 'varchar', length: 50, nullable: true})
   entity_type: string;
 
-  @Column({ name: 'name', type: 'varchar', length: 100, nullable: true })
-  @Expose()
-  name: string;
-
-  @Column({ name: 'status', type: 'varchar', nullable: true, length: 100 })
-  @Expose()
-  status: string;
+  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true })
+  code: string;
 
-  @Column({ name: 'parent_type', type: 'varchar', length: 100, nullable: true })
-  @Expose()
-  parent_type: string;
+  @Column({ name: 'name', type: 'varchar', length: 255, nullable: true })
+  name: string;
 
-  @Column({ name: 'parent_id', type: 'bigint', nullable: true })
-  @Expose()
-  parent_id: number;
+  @Column({ length: 1000, type: 'varchar', nullable: true })
+  description: string;
 
-  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true })
-  @Expose()
-  code: string;
+  @Column({ name: 'status', type: 'varchar', nullable: true, length: 50 })
+  status: string;
 
   @Column({ name: 'created_by', type: 'bigint', nullable: true })
-  @Expose()
   created_by: number;
 
-  @Column({
-    name: 'created_date',
-    nullable: true,
-  })
-  @Expose()
+  @CreateDateColumn({nullable: true})
   created_date: Date;
 
   @Column({ name: 'modified_by', type: 'bigint', nullable: true })
-  @Expose()
   modified_by: number;
 
-  @Column({ name: 'modified_date', nullable: true })
-  @Expose()
+  @UpdateDateColumn({nullable: true})
   modified_date: Date;
 
   @Column({ name: 'enterprise_id', type: 'int', nullable: true })
-  @Expose()
   enterprise_id: number;
 
-  @Column({ name: 'organization_id', type: 'int', nullable: true })
-  @Expose()
-  organization_id: number;
+  @Column({ name: 'level_type', type: 'varchar', length: 25, nullable: true })
+  level_type: string;
 
-  @Column({ name: 'appcode', type: 'varchar', length: 100, nullable: true })
-  @Expose()
-  appcode: string;
+  @Column({ name: 'level_id', type: 'int', nullable: true })
+  level_id: number;
 
-  @Column({ name: 'level_id', type: 'varchar', length: 100, nullable: true })
-  @Expose()
-  level_id: string;
+  @Column({ name: 'parent_type', type: 'varchar', length: 100, nullable: true })
+  parent_type: string;
 
-  @Column({ name: 'level_type', type: 'varchar', length: 100, nullable: true })
-  @Expose()
-  level_type: string;
+  @Column({ name: 'parent_id', type: 'bigint', nullable: true })
+  parent_id: number;
 }

package/src/module/meta/entity/entity-master.entity.ts

@@ -1,14 +1,9 @@
 import { BaseEntity } from './base-entity.entity';
-import { ENTITYTYPE_ENTITYMASTER } from '../../../constant/global.constant';
 import { Column, Entity, Index } from 'typeorm';
 
 @Entity({ name: 'frm_entity_master' })
-@Index('idx_entity_master_mapped_type_org', ['mapped_entity_type', 'organization_id'])
+@Index('idx_entity_master_mapped_type_org', ['mapped_entity_type', 'enterprise_id'])
 export class EntityMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_ENTITYMASTER;
-  }
 
   @Column({
     name: 'mapped_entity_type',

package/src/module/meta/entity/entity-relation-data.entity.ts

@@ -1,13 +1,8 @@
-import { ENTITYTYPE_ENTITY_RELATION_DATA } from 'src/constant/global.constant';
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from './base-entity.entity';
 
 @Entity({ name: 'frm_entity_relation_data' })
 export class EntityRelationData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_ENTITY_RELATION_DATA;
-  }
 
   @Column({ nullable: true })
   source_entity_type: string;

package/src/module/meta/entity/entity-relation.entity.ts

@@ -1,13 +1,8 @@
-import { ENTITYTYPE_ENTITY_RELATION } from 'src/constant/global.constant';
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from './base-entity.entity';
 
 @Entity({ name: 'frm_entity_relation' })
 export class EntityRelation extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_ENTITY_RELATION;
-  }
 
   @Column({ nullable: true })
   source_entity_type: string;

package/src/module/meta/entity/entity-table-column.entity.ts

@@ -1,13 +1,8 @@
-import { ENTITYTYPE_ENTITYTABLECOLUMN } from '../../../constant/global.constant';
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from './base-entity.entity';
 
 @Entity({ name: 'frm_entity_table_column' })
 export class EntityTableColumn extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_ENTITYTABLECOLUMN;
-  }
 
   @Column({ name: 'mapped_entity_type', nullable: true })
   mapped_entity_type: string;

package/src/module/meta/entity/entity-table.entity.ts

@@ -1,13 +1,8 @@
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from './base-entity.entity';
-import { ENTITYTYPE_ENTITYTABLE } from '../../../constant/global.constant';
 
 @Entity({ name: 'frm_entity_table' })
 export class EntityTable extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_ENTITYTABLE;
-  }
 
   @Column({ name: 'mapped_entity_type', nullable: true })
   mapped_entity_type: string;

package/src/module/meta/entity/media-data.entity.ts

@@ -1,13 +1,8 @@
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from './base-entity.entity';
-import { ENTITYTYPE_MEDIA } from '../../../constant/global.constant';
 
 @Entity({ name: 'frm_media_data' })
 export class MediaData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_MEDIA;
-  }
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   file_name: string;

package/src/module/meta/entity/preference.entity.ts

@@ -1,13 +1,8 @@
 import { BaseEntity } from './base-entity.entity';
 import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_PREFERENCEMASTER } from '../../../constant/global.constant';
 
 @Entity({ name: 'frm_preference_master' })
 export class PreferenceMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_PREFERENCEMASTER;
-  }
 
   @Column({
     name: 'display_name',

package/src/module/meta/entity/view-master.entity.ts

@@ -1,13 +1,8 @@
 import { BaseEntity } from './base-entity.entity';
 import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_VIEWMASTER } from '../../../constant/global.constant';
 
 @Entity({ name: 'frm_entity_view' })
 export class ViewMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_VIEWMASTER;
-  }
 
   @Column({ length: 50, nullable: true })
   mapped_entity_type: string;
@@ -36,6 +31,6 @@ export class ViewMaster extends BaseEntity {
   @Column({ nullable: true })
   type: string;
 
-  @Column({ type: 'int' , nullable: true})
+  @Column({ type: 'int', nullable: true })
   is_default: number;
 }

package/src/module/meta/repository/attribute-master.repository.ts

@@ -24,14 +24,13 @@ export class AttributeMasterRepository {
     mappedEntityId: number,
     mappedEntityType: string,
     attributeKey: string,
-    organizationId: number,
+    enterpriseId: number,
   ): Promise<AttributeMaster | null> {
     return await this.attributeMasterRepository.findOne({
       where: {
-        mapped_entity_id: mappedEntityId,
         mapped_entity_type: mappedEntityType,
         attribute_key: attributeKey,
-        organization_id: organizationId,
+        enterprise_id: enterpriseId,
       },
     });
   }
@@ -78,8 +77,8 @@ export class AttributeMasterRepository {
         return {
           'label': attribute.name,
           'value': attribute.attribute_key,
-          'data_type': attribute.data_type,
-          'data_source_list': attribute.datasource_list,
+          'element_type': attribute.element_type,
+          'ds_category': attribute.ds_category,
         };
       });
 

package/src/module/meta/repository/entity-master.repository.ts

@@ -93,7 +93,7 @@ export class EntityMasterRepository {
     const attributes = await this.attributeMasterRepository.find({
       where: {
         mapped_entity_type: entity_type,
-        data_type: 'DATE',
+        element_type: 'date',
         enterprise_id,
       },
     });

package/src/module/meta/service/attribute-master.service.ts

@@ -26,7 +26,7 @@ export class AttributeMasterService {
   ): Promise<AttributeMaster> {
     attributeData.enterprise_id = loggedInUser.enterprise_id;
     attributeData.level_type = loggedInUser.level_type;
-    attributeData.level_id = loggedInUser.level_id;
+    attributeData.level_id = Number(loggedInUser.level_id);
 
     // 1️⃣ Save attribute in master table
     const createdAttr =
@@ -87,7 +87,7 @@ export class AttributeMasterService {
   ): Promise<AttributeMaster | null> {
     attributeData.enterprise_id = loggedInUser.enterprise_id;
     attributeData.level_type = loggedInUser.level_type;
-    attributeData.level_id = loggedInUser.level_id;
+    attributeData.level_id = Number(loggedInUser.level_id);
 
     return this.attributeMasterRepository.updateAttribute(attributeData, id);
   }

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

@@ -547,7 +547,7 @@ export class EntityDynamicService extends EntityServiceImpl{
       .map((attr) => `${attr.attribute_key}`)
       .join(', ');
     const selectQuery = `SELECT ${columns}
-                         FROM ${dataSource}
+                         FROM ${this.schema}.${dataSource}
                          WHERE id = $1`;
 
     const result = await this.entityManager.query(selectQuery, [id]);

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

@@ -103,7 +103,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         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.level_id) entityData.level_id = Number(loggedInUser.level_id);
       if (!entityData.status) entityData.status = statusList.id;
     }
 
@@ -291,7 +291,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     );
     if (!repoService) {
       throw new Error(
-        `Repository service not found for entityType: ${entityData.entity_type}`,
+        `Repository service not found`,
       );
     }
 

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

@@ -57,47 +57,47 @@ export class EntityValidationService {
     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];
-
-      if (this.hasValidValue(value)) {
-        let qb = this.entityManager
-          .createQueryBuilder()
-          .select('*')
-          .from(`${this.schema}.${db_table_name}`, db_table_name)
-          .where(`${db_table_name}.${attr.attribute_key} = :value`, { value });
-
-        // Add AND condition for organization_id/level_type/level_id if present
-        if (entityType !== 'ORG' && entityType !== 'ORGP') {
-          const level_type = loggedInUser.level_type;
-          const level_id = loggedInUser.level_id;
-
-          if (level_type !== undefined && level_type !== null) {
-            qb = qb.andWhere(
-              `${db_table_name}.level_type = :level_type AND ${db_table_name}.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) {
-          errors.push({
-            field: attr.name,
-            message: `Field ${attr.name} must be unique. Value ${value} already exists.`,
-          });
-        }
-      }
-    }
+    // for (const attr of attributeData.filter((a) => a.is_unique)) {
+    //   const value = entityData[attr.attribute_key];
+    //
+    //   if (this.hasValidValue(value)) {
+    //     let qb = this.entityManager
+    //       .createQueryBuilder()
+    //       .select('*')
+    //       .from(`${this.schema}.${db_table_name}`, db_table_name)
+    //       .where(`${db_table_name}.${attr.attribute_key} = :value`, { value });
+    //
+    //     // Add AND condition for organization_id/level_type/level_id if present
+    //     if (entityType !== 'ORG' && entityType !== 'ORGP') {
+    //       const level_type = loggedInUser.level_type;
+    //       const level_id = loggedInUser.level_id;
+    //
+    //       if (level_type !== undefined && level_type !== null) {
+    //         qb = qb.andWhere(
+    //           `${db_table_name}.level_type = :level_type AND ${db_table_name}.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) {
+    //       errors.push({
+    //         field: attr.name,
+    //         message: `Field ${attr.name} must be unique. Value ${value} already exists.`,
+    //       });
+    //     }
+    //   }
+    // }
 
     return errors;
   }

package/src/module/meta/service/resolver.service.ts

@@ -54,13 +54,13 @@ export class ResolverService {
 
       // -------- ENTITY or MASTER via getDropdownOptions --------
       if (
-        attr.data_source_type === 'entity' ||
-        (attr.data_source_type === 'master' && attr.category != 'Internal')
+        attr.ds_category === 'ENTITY' ||
+        (attr.ds_category === 'LIST_MASTER')
       ) {
         const type =
-          attr.data_source_type === 'entity'
-            ? attr.datasource_list
-            : attr.datasource_list;
+          attr.ds_category === 'ENTITY'
+            ? attr.ds_entitytype
+            : attr.ds_entitytype;
         const params = {}; // you can pass any additional filters here
 
         if (Array.isArray(codeValue)) {
@@ -75,7 +75,7 @@ export class ResolverService {
             const item = options.find(
               (opt) => opt.value == code || opt.code == code,
             );
-            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+            resolvedValues.push(item?.[attr.name] ?? code);
           }
           resolvedEntityData[field] = resolvedValues;
         } else {
@@ -89,7 +89,7 @@ export class ResolverService {
             (opt) => opt.value == codeValue || opt.code == codeValue,
           );
           resolvedEntityData[field] = Array.isArray(item)
-            ? (item?.[attr.data_source_attribute] ?? codeValue)
+            ? (item?.[attr.name] ?? codeValue)
             : (item?.label ?? codeValue);
         }
       }
@@ -145,8 +145,8 @@ export class ResolverService {
     if (!attr) return rawValue;
 
     // -------- ENTITY data_source_type --------
-    if (attr.data_source_type === 'entity') {
-      const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(attr.datasource_list, loggedInUser.enterprise_id);
+    if (attr.ds_category === 'ENTITY') {
+      const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(attr.ds_entitytype, loggedInUser.enterprise_id);
 
       if (!entityDef) return rawValue;
 
@@ -171,7 +171,7 @@ export class ResolverService {
               : [value];
 
           const [item] = await this.entityManger.query(query, params);
-          resolvedValues.push(item?.[attr.data_source_attribute] ?? value);
+          resolvedValues.push(item?.[attr.name] ?? value);
         }
         return resolvedValues;
       } else {
@@ -183,12 +183,12 @@ export class ResolverService {
         const params = [rawValue];
 
         const [item] = await this.entityManger.query(query, params);
-        return item?.[attr.data_source_attribute] ?? rawValue;
+        return item?.[attr.name] ?? rawValue;
       }
     }
 
     // -------- MASTER data_source_type --------
-    else if (attr.data_source_type === 'master') {
+    else if (attr.ds_category === 'LIST_MASTER') {
       const repo = this.reflectionHelper.getRepoService('ListMasterItems');
       if (Array.isArray(rawValue)) {
         const resolvedValues: string[] = [];
@@ -198,7 +198,7 @@ export class ResolverService {
               id: code
             },
           });
-          resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+          resolvedValues.push(item?.[attr.name] ?? code);
         }
         return resolvedValues;
       } else {
@@ -208,7 +208,7 @@ export class ResolverService {
             id: Number(rawValue)
           },
         });
-        return item?.[attr.data_source_attribute] ?? rawValue;
+        return item?.[attr.name] ?? rawValue;
       }
     }
 
@@ -235,8 +235,8 @@ export class ResolverService {
     if (!attr) return displayValue;
 
     // -------- ENTITY data_source_type --------
-    if (attr.data_source_type === 'entity') {
-      const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(attr.datasource_list, loggedInUser.enterprise_id);
+    if (attr.ds_category === 'ENTITY') {
+      const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(attr.ds_entitytype, loggedInUser.enterprise_id);
 
       if (!entityDef) return displayValue;
 
@@ -246,10 +246,10 @@ export class ResolverService {
         tableName === 'sso_organization'
           ? `SELECT id
              FROM ${tableName}
-             WHERE ${attr.data_source_attribute} = $1`
+             WHERE ${attr.name} = $1`
           : `SELECT id
              FROM ${tableName}
-             WHERE ${attr.data_source_attribute} = $1
+             WHERE ${attr.name} = $1
                AND enterprise_id = $2`;
 
       const params =
@@ -262,14 +262,14 @@ export class ResolverService {
     }
 
     // -------- MASTER data_source_type --------
-    else if (attr.data_source_type === 'master') {
+    else if (attr.ds_category === 'LIST_MASTER') {
       const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
 
       const item = await listMasterItemsRepo.findOne({
         where: {
-          [attr.data_source_attribute]: displayValue,
+          [attr.name]: displayValue,
           enterprise_id: loggedInUser.enterprise_id,
-          listtype: attr.datasource_list,
+          listtype: attr.ds_entitytype,
         },
       });
 

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

@@ -1,13 +1,8 @@
-import { ACTION_CATEGORY } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_action_category' })
 export class ActionCategory extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ACTION_CATEGORY;
-  }
 
   @Column({ type: 'varchar', nullable: true })
   logo: string;

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

@@ -3,10 +3,6 @@ import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_action_data' })
 export class ActionDataEntity extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'ACTION_DATA';
-  }
 
   @Column({ nullable: true })
   action_id: number;
@@ -35,7 +31,7 @@ export class ActionDataEntity extends BaseEntity {
   @Column({ nullable: true })
   sequence: number;
 
-  @Column({ default: 0 , nullable: true})
+  @Column({ default: 0, nullable: true })
   is_done: boolean;
 
   @Column({ type: 'varchar', nullable: true })

package/src/module/workflow/entity/action-resources-mapping.entity.ts

@@ -1,16 +1,8 @@
-import {
-  ACTION_CATEGORY,
-  ACTION_RESOURCES_MAPPING,
-} from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_action_resources_mapping' })
 export class ActionResourcesMapping extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ACTION_RESOURCES_MAPPING;
-  }
 
   @Column({ type: 'varchar', nullable: true })
   template_code: string;

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

@@ -1,13 +1,8 @@
-import { ACTION_TEMPLATE_MAPPING } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_action_template_mapping' })
 export class ActionTemplateMapping extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ACTION_TEMPLATE_MAPPING;
-  }
 
   @Column({ type: 'int', nullable: true })
   stg_act_mapping_id: number;

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

@@ -1,13 +1,8 @@
-import { ACTION } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_action' })
 export class ActionEntity extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ACTION;
-  }
 
   @Column({ type: 'int', nullable: true })
   workflow_id: number;

package/src/module/workflow/entity/activity-log.entity.ts

@@ -3,10 +3,6 @@ import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_activity_log' })
 export class ActivityLog extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'ACLG';
-  }
 
   @Column({ type: 'varchar', nullable: true })
   mapped_entity_type: string;

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

@@ -1,13 +1,8 @@
-import { COMM_TEMPLATE } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_comm_template' })
 export class CommTemplate extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = COMM_TEMPLATE;
-  }
 
   @Column({ nullable: true })
   mode: string;

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

@@ -1,13 +1,8 @@
-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: 'frm_wf_entity_modification' })
 export class EntityModification extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITY_MODIFICATION;
-  }
 
   @Column({ type: 'int', nullable: true })
   mapped_entity_id: number;