rez_core 3.1.210 → 4.0.2

package/docs/modules/event-driven-integration-design.md

@@ -10,7 +10,7 @@ Introduce **Event-Driven Architecture (EDA)** into the integration module to:
 
 ## 2. Current State
 - **Database Tables**:
-    - `cr_integration_config` (stores provider configuration JSON and level mapping)
+    - `frm_integration_config` (stores provider configuration JSON and level mapping)
 - **Factory Pattern**:
     - Uses `IntegrationFactory` to select strategies (e.g., Gmail API, Twilio SMS, WhatsApp Cloud).
 - **Service Layer**:

package/docs/modules/integration.md

@@ -2,10 +2,10 @@
 
 ## Database Schema
 
-### Tables: cr_integration_config
+### Tables: frm_integration_config
 ```sql
--- Integration configuration storage (merged from cr_communication_config, communication_config_type & communication_hub)
-CREATE TABLE cr_integration_config (
+-- Integration configuration storage (merged from frm_communication_config, communication_config_type & communication_hub)
+CREATE TABLE frm_integration_config (
     id INT AUTO_INCREMENT PRIMARY KEY,
     app_code VARCHAR(100) NOT NULL,
     integration_type VARCHAR(20) NOT NULL, -- EMAIL, SMS, WA, TELEPHONE
@@ -24,7 +24,7 @@ CREATE TABLE cr_integration_config (
 );
 
 -- Integration source master table (existing)
-CREATE TABLE cr_integration_master (
+CREATE TABLE frm_integration_master (
     id BIGINT AUTO_INCREMENT PRIMARY KEY,
     name VARCHAR(100),
     logo VARCHAR(100),

package/package.json

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

package/src/module/dashboard/entity/dashboard_page_data.entity.ts

@@ -1,7 +1,7 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
-@Entity({ name: 'cr_dashboard_page_data' })
+@Entity({ name: 'frm_dashboard_page_data' })
 export class DashboardPageData extends BaseEntity {
   constructor() {
     super();

package/src/module/dashboard/entity/widget_master.entity.ts

@@ -1,7 +1,7 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
-@Entity({ name: 'cr_dashboard_widget' })
+@Entity({ name: 'frm_dashboard_widget' })
 export class WidgetMaster extends BaseEntity {
   constructor() {
     super();

package/src/module/dashboard/repository/dashboard.repository.ts

@@ -9,7 +9,7 @@ export class DashboardRepository {
 
   async getPages(mapped_entity_type: string, loggedInUser: any) {
     return await this.dataSource.query(
-      `SELECT * FROM cr_dashboard_page_data WHERE mapped_entity_type='${mapped_entity_type}' AND applicable_type='${loggedInUser.level_type}' AND applicable_id='${loggedInUser.level_id}' AND organization_id='${loggedInUser.organization_id}' `,
+      `SELECT * FROM frm_dashboard_page_data WHERE mapped_entity_type='${mapped_entity_type}' AND applicable_type='${loggedInUser.level_type}' AND applicable_id='${loggedInUser.level_id}' AND organization_id='${loggedInUser.organization_id}' `,
     );
   }
 

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

@@ -45,7 +45,7 @@ export class SchoolRepository {
     const resolvedInactiveStatus = await this.dataSource
       .createQueryBuilder()
       .select('*')
-      .from('cr_list_master_items', 'cli')
+      .from('frm_list_master_items', 'cli')
       .where('cli.code = :code AND cli.organization_id = :orgId', {
         code: STATUS_INACTIVE,
         orgId: org_id,
@@ -71,7 +71,7 @@ export class SchoolRepository {
           'school.status AS school_status',
         ])
         .from('sso_organization', 'org')
-        .innerJoin('sso_organization', 'brn', "brn.type = 'BRN'")
+        .innerJoin('sso_organization', 'brn', "brn.type = 'BRN' AND brn.parent_id = org.id")
         // .innerJoin(
         //   'eth_brand_profile',
         //   'brand_profile',
@@ -102,7 +102,7 @@ export class SchoolRepository {
           const orgStatus = await this.dataSource
             .createQueryBuilder()
             .select('*')
-            .from('cr_list_master_items', 'cli')
+            .from('frm_list_master_items', 'cli')
             .where('cli.id = :id AND cli.organization_id = :orgId', {
               id: org_status,
               orgId: org_id,
@@ -123,7 +123,7 @@ export class SchoolRepository {
           const brandStatus = await this.dataSource
             .createQueryBuilder()
             .select('*')
-            .from('cr_list_master_items', 'cli')
+            .from('frm_list_master_items', 'cli')
             .where('cli.id = :id AND cli.organization_id = :orgId', {
               id: brand_status,
               orgId: org_id,
@@ -143,7 +143,7 @@ export class SchoolRepository {
           const schoolStatus = await this.dataSource
             .createQueryBuilder()
             .select('*')
-            .from('cr_list_master_items', 'cli')
+            .from('frm_list_master_items', 'cli')
             .where('cli.id = :id AND cli.organization_id = :orgId', {
               id: school_status,
               orgId: org_id,

package/src/module/filter/entity/saved-filter-detail.entity.ts

@@ -2,7 +2,7 @@ import { ENTITYTYPE_SAVEDFILTERDETAIL } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
-@Entity({ name: 'cr_saved_filter_detail' })
+@Entity({ name: 'frm_saved_filter_detail' })
 export class SavedFilterDetail extends BaseEntity {
   constructor() {
     super();

package/src/module/filter/entity/saved-filter-master.entity.ts

@@ -2,7 +2,7 @@ import { ENTITYTYPE_SAVEDFILTERMASTER } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
-@Entity({ name: 'cr_saved_filter_master' })
+@Entity({ name: 'frm_saved_filter_master' })
 export class SavedFilterMaster extends BaseEntity {
   constructor() {
     super();

package/src/module/filter/repository/saved-filter.repository.ts

@@ -147,7 +147,7 @@ export class SavedFilterRepositoryService {
   ): Promise<any> {
     const [filterMaster] = await this.dataSource.query(
       `SELECT id, name, code 
-     FROM cr_saved_filter_master 
+     FROM frm_saved_filter_master 
      WHERE code = ? AND organization_id = ? 
      LIMIT 1
 `,

package/src/module/filter/service/filter-evaluator.service.ts

@@ -26,7 +26,7 @@ export class FilterEvaluatorService {
     console.log('IN FILTER EVALUATOR SERVICE');
     const triggerFilters: SavedFilterDetail[] = await this.dataSource.query(
       `SELECT * 
-       FROM cr_saved_filter_detail 
+       FROM frm_saved_filter_detail 
        WHERE mapped_filter_code = ?`,
       [savedFilterCode],
     );

package/src/module/filter/service/filter.service.ts

@@ -275,6 +275,14 @@ export class FilterService {
       });
     }
 
+    if (entity_type == "USR" || entity_type == "UPR") {
+      baseWhere.push({
+        query: 'e.is_customer != 1',
+        params: {},
+      });
+    }
+    
+
     if (customLevelType && customLevelId && customAppCode) {
       baseWhere.push({
         query:
@@ -314,7 +322,7 @@ export class FilterService {
     // layout preference query
     const layoutPreference = await this.dataSource.query(
       `SELECT mapped_json 
-       FROM cr_entity_layout_pref
+       FROM frm_entity_layout_pref
        WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ? AND type = 'layout'`,
       [user_id, entity_type, level_id, level_type],
     );

package/src/module/integration/entity/integration-config.entity.ts

@@ -6,7 +6,7 @@ import {
   UpdateDateColumn,
 } from 'typeorm';
 
-@Entity({ name: 'cr_integration_config' })
+@Entity({ name: 'frm_integration_config' })
 export class IntegrationConfig {
   @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
   id: number;

package/src/module/integration/entity/integration-entity-mapper.entity.ts

@@ -1,7 +1,7 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
-@Entity({ name: 'cr_integration_entity_mapper' })
+@Entity({ name: 'frm_integration_entity_mapper' })
 export class IntegrationEntityMapper extends BaseEntity {
   @Column({ name: 'integration_config_id', type: 'bigint', nullable: true })
   integration_config_id: number;

package/src/module/integration/entity/integration-source.entity.ts

@@ -1,7 +1,7 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
-@Entity({ name: 'cr_integration_master' })
+@Entity({ name: 'frm_integration_master' })
 export class IntegrationSource extends BaseEntity {
   @Column({ name: 'logo', type: 'varchar', length: 500 })
   logo: string;

package/src/module/integration/entity/user-integration.entity.ts

@@ -7,7 +7,7 @@ import {
   Index,
 } from 'typeorm';
 
-@Entity({ name: 'cr_integration_user_mapping' })
+@Entity({ name: 'frm_integration_user_mapping' })
 @Index(['user_id', 'integration_config_id'], { unique: true })
 @Index(['integration_config_id'])
 @Index(['user_id'])

package/src/module/integration/service/integration.service.ts

@@ -212,7 +212,7 @@ export class IntegrationService {
     try {
       const allIntegrationData = await this.dataSource.query(
         `SELECT *
-         FROM cr_integration_master`,
+         FROM frm_integration_master`,
       );
 
       // if entityType is provided, filter the results

package/src/module/integration/service/wrapper.service.ts

@@ -31,7 +31,7 @@ export class WrapperService {
         `Fetching configs for level_id=${level_id}, level_type=${level_type}`,
       );
       const configs = await this.datasource.query(
-        `SELECT * FROM cr_integration_config 
+        `SELECT * FROM frm_integration_config 
          WHERE level_id = ? 
            AND level_type = ? 
            AND status = 1
@@ -47,7 +47,7 @@ export class WrapperService {
           `Looking up templateCode=${payload.templateCode} for current level`,
         );
         const template = await this.datasource.query(
-          `SELECT rich_text FROM cr_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = ? LIMIT 1`,
+          `SELECT rich_text FROM frm_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = ? LIMIT 1`,
           [payload.templateCode, level_id, level_type],
         );
         this.logger.debug(
@@ -87,7 +87,7 @@ export class WrapperService {
           `No user-level configs found. Falling back to ORG-level`,
         );
         const fallbackConfigs = await this.datasource.query(
-          `SELECT * FROM cr_integration_config 
+          `SELECT * FROM frm_integration_config 
            WHERE level_type = 'ORG' 
              AND integration_type = 'EMAIL'
              AND status = 1`,
@@ -202,7 +202,7 @@ export class WrapperService {
 
         // Try to find template at user's level first
         let templates = await this.datasource.query(
-          `SELECT id FROM cr_wf_comm_template 
+          `SELECT id FROM frm_wf_comm_template 
          WHERE code = ? 
            AND level_id = ? 
            AND level_type = ? 
@@ -217,7 +217,7 @@ export class WrapperService {
           );
 
           templates = await this.datasource.query(
-            `SELECT id FROM cr_wf_comm_template 
+            `SELECT id FROM frm_wf_comm_template 
            WHERE code = ? 
              AND level_type = 'ORG' 
              AND organization_id = ? 
@@ -331,7 +331,7 @@ export class WrapperService {
       this.logger.log(`No user-level config found, checking ORG-level...`);
 
       const orgConfigs = await this.datasource.query(
-        `SELECT * FROM cr_integration_config 
+        `SELECT * FROM frm_integration_config 
        WHERE level_id = 1
          AND level_type = 'ORG' 
          AND integration_type = 'EMAIL'
@@ -366,7 +366,7 @@ export class WrapperService {
     this.logger.debug(`Fetching config JSON for configId=${configId}`);
     const configRes = await this.datasource.query(
       `SELECT config_json 
-       FROM cr_integration_config 
+       FROM frm_integration_config 
        WHERE id = ?`,
       [configId],
     );
@@ -386,7 +386,7 @@ export class WrapperService {
 
     if (payload.template_code) {
       let templates = await this.datasource.query(
-        `SELECT id FROM cr_wf_comm_template 
+        `SELECT id FROM frm_wf_comm_template 
          WHERE code = ? 
          ORDER BY 1 DESC 
          LIMIT 1`,

package/src/module/layout_preference/entity/layout_preference.entity.ts

@@ -1,7 +1,7 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
-@Entity({ name: 'cr_entity_layout_pref' })
+@Entity({ name: 'frm_entity_layout_pref' })
 export class LayoutPreference extends BaseEntity {
   @Column({ length: 50, nullable: true })
   user_id: string;

package/src/module/listmaster/entity/list-master-items.entity.ts

@@ -2,7 +2,7 @@ import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { ENTITYTYPE_LISTMASTERITEMS } from '../../../constant/global.constant';
 
-@Entity({ name: 'cr_list_master_items' })
+@Entity({ name: 'frm_list_master_items' })
 export class ListMasterItems extends BaseEntity {
   constructor() {
     super();

package/src/module/listmaster/entity/list-master.entity.ts

@@ -2,7 +2,7 @@ import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { ENTITYTYPE_LISTMASTER } from '../../../constant/global.constant';
 
-@Entity({ name: 'cr_list_master' })
+@Entity({ name: 'frm_list_master' })
 export class ListMasterData extends BaseEntity {
   constructor() {
     super();

package/src/module/listmaster/service/list-master-item.service.ts

@@ -191,7 +191,7 @@ export class ListMasterItemService extends EntityServiceImpl {
   ): Promise<any> {
     const data = await this.dataSource.query(
       `SELECT name AS label, type AS value
-     FROM cr_list_master
+     FROM frm_list_master
      WHERE organization_id = ? AND source = ?`,
       [loggedInUser.organization_id, source],
     );

package/src/module/listmaster/service/list-master.service.ts

@@ -174,20 +174,20 @@ export class ListMasterService {
     );
     let result: { label: string; value: number }[] = [];
     if (!sourceList) return result;
-
+  
     const entityMaster = await this.entityMasterService.getEntityData(
       sourceList,
       loggedInUser,
     );
     const tableName = entityMaster.data_source;
-
+  
     const applyCommonFilters = (qb: any, status?: number) => {
       if (status) {
         const isView = tableName.endsWith('_vw'); // auto-detect view
         const statusColumn = isView ? 'status_id' : 'status';
         qb.andWhere(`${tableName}.${statusColumn} = :status`, { status });
       }
-
+  
       if (loggedInUser?.level_type && loggedInUser?.level_id) {
         // Skip level filter for certain entities
         if (!this.skipLevelFilterEntities.includes(sourceList)) {
@@ -202,16 +202,12 @@ export class ListMasterService {
         } else {
           // IN the case of BRN, we don't filter by level
           qb.andWhere(
-            `${tableName}.parent_id = :organization_id
-            AND ${tableName}.type = 'BRN'
-            `,
-            {
-              organization_id: loggedInUser.organization_id,
-            },
+            `${tableName}.parent_id = :organization_id AND ${tableName}.type = 'BRN'`,
+            { organization_id: loggedInUser.organization_id },
           );
         }
       }
-
+  
       if (loggedInUser?.appcode && sourceList === 'ROL') {
         if (!this.skipLevelFilterEntities.includes(sourceList)) {
           qb.andWhere(`${tableName}.appcode = :appcode`, {
@@ -219,22 +215,28 @@ export class ListMasterService {
           });
         }
       }
-
+  
+      // ✅ Apply dynamic params
       for (const key in params) {
         qb.andWhere(`${tableName}.${key} = :${key}`, {
           [key]: params[key],
         });
       }
-
+  
+      // ✅ New: Exclude customers for USR/UPR
+      if (sourceList === 'USR' || sourceList === 'UPR') {
+        qb.andWhere(`${tableName}.is_customer != 1`);
+      }
+  
       return qb;
     };
-
+  
     const resolveStatus = await this.getResolvedListCode(
       STATUS_ACTIVE,
       loggedInUser?.organization_id || 0,
     );
-
-    // Fetpords
+  
+    // Fetch active records
     const activeQuery = applyCommonFilters(
       this.entityManager
         .createQueryBuilder()
@@ -242,20 +244,20 @@ export class ListMasterService {
         .from(tableName, tableName),
       resolveStatus.id,
     );
-
+  
     const activeResults = await activeQuery.getRawMany();
     const activeIds = new Set(activeResults.map((r) => r.id));
-
+  
     // Add active entries first
     activeResults.forEach((r) => {
       result.push({ label: r.name, value: r.id });
     });
-
+  
     const resolveInactiveStatus = await this.getResolvedListCode(
       STATUS_INACTIVE,
       loggedInUser?.organization_id || 0,
     );
-
+  
     // Fetch inactive records (with same filters but without status condition)
     if (inactiveIdsArray?.length) {
       const inactiveQuery = applyCommonFilters(
@@ -265,14 +267,13 @@ export class ListMasterService {
           .from(tableName, tableName),
         resolveInactiveStatus.id,
       );
-
+  
       inactiveQuery.andWhere(`${tableName}.id IN (:...ids)`, {
         ids: inactiveIdsArray,
       });
-
+  
       const inactiveResults = await inactiveQuery.getRawMany();
-
-      // Add only those inactive records not already present in active
+  
       inactiveResults.forEach((item) => {
         if (!activeIds.has(item.id)) {
           result.push({
@@ -282,9 +283,10 @@ export class ListMasterService {
         }
       });
     }
-
+  
     return result;
   }
+  
 
   private async fetchFromExternalSource(
     customSourceId: number,

package/src/module/mapper/entity/field-lovs.entity.ts

@@ -1,7 +1,7 @@
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 
-@Entity({ name: 'cr_mapper_field_lov' })
+@Entity({ name: 'frm_mapper_field_lov' })
 export class FieldLovMapper extends BaseEntity {
   constructor() {
     super();

package/src/module/mapper/entity/field-mapper.entity.ts

@@ -1,7 +1,7 @@
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 
-@Entity({ name: 'cr_mapper_field' })
+@Entity({ name: 'frm_mapper_field' })
 export class FieldMapper extends BaseEntity {
   constructor() {
     super();

package/src/module/mapper/entity/mapper.entity.ts

@@ -1,7 +1,7 @@
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 
-@Entity({ name: 'cr_mapper_master' })
+@Entity({ name: 'frm_mapper_master' })
 export class Mapper extends BaseEntity {
   constructor() {
     super();

package/src/module/mapper/service/field-mapper.service.ts

@@ -130,7 +130,7 @@ export class FieldMapperService extends EntityServiceImpl {
           } else {
             const relations = await this.datasource.query(
               `SELECT target_entity_id
-             FROM cr_entity_relation_data
+             FROM frm_entity_relation_data
              WHERE source_entity_type = ?
                AND source_entity_id = ?
                AND target_entity_type = ?`,

package/src/module/mapper/service/mapper.service.ts

@@ -21,7 +21,7 @@ export class MapperService extends EntityServiceImpl {
 
     const mappers = await this.dataSource.query(
       `SELECT id, name, code, status
-       FROM cr_mapper_master
+       FROM frm_mapper_master
        WHERE mapped_entity_type = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?)`,
       [mappedEntityType, filter || -1, `%${filter}%`, `%${filter}%`],
     );
@@ -34,7 +34,7 @@ export class MapperService extends EntityServiceImpl {
     const statusMap = new Map();
     if (distinctStatuses.length > 0) {
       const statuses = await this.dataSource.query(
-        `SELECT id, name FROM cr_list_master_items WHERE id IN (?)`,
+        `SELECT id, name FROM frm_list_master_items WHERE id IN (?)`,
         [distinctStatuses],
       );
       statuses.forEach((status) => {

package/src/module/master/service/master.service.ts

@@ -22,37 +22,37 @@ export class MasterService {
   ) {}
 
   // private readonly metaSheets = [
-  //   'cr_entity_master',
-  //   'cr_entity_attribute',
-  //   'cr_list_master',
-  //   'cr_list_master_items',
-  //   'cr_entity_table',
-  //   'cr_entity_table_column',
-  //   'cr_entity_view',
+  //   'frm_entity_master',
+  //   'frm_entity_attribute',
+  //   'frm_list_master',
+  //   'frm_list_master_items',
+  //   'frm_entity_table',
+  //   'frm_entity_table_column',
+  //   'frm_entity_view',
   // ];
   private readonly sequence = [
     {
-      table: 'cr_entity_master',
+      table: 'frm_entity_master',
       unique_fields: ['id', 'organization_id'],
     },
     {
-      table: 'cr_entity_attribute',
+      table: 'frm_entity_attribute',
       unique_fields: ['mapped_entity_type', 'attribute_key', 'organization_id'],
     },
     {
-      table: 'cr_list_master',
+      table: 'frm_list_master',
       unique_fields: ['type', 'organization_id'],
     },
     {
-      table: 'cr_list_master_items',
+      table: 'frm_list_master_items',
       unique_fields: ['listtype', 'code', 'organization_id'],
     },
     {
-      table: 'cr_entity_table',
+      table: 'frm_entity_table',
       unique_fields: ['list_type', 'mapped_entity_type', 'organization_id'],
     },
     {
-      table: 'cr_entity_table_column',
+      table: 'frm_entity_table_column',
       unique_fields: [
         'parent_id',
         'parent_type',
@@ -61,7 +61,7 @@ export class MasterService {
       ],
     },
     {
-      table: 'cr_entity_view',
+      table: 'frm_entity_view',
       unique_fields: ['mapped_entity_type', 'organization_id'],
     },
     {
@@ -277,7 +277,7 @@ export class MasterService {
       for (const attr of attributes) {
         if (attr.data_source_type === 'master' && row[attr.attribute_key]) {
           const refData = await this.entityManager.query(
-            `SELECT * FROM cr_list_master_items WHERE name = ? and organization_id = ? LIMIT 1`,
+            `SELECT * FROM frm_list_master_items WHERE name = ? and organization_id = ? LIMIT 1`,
             [row[attr.attribute_key], loggedInUser.organization_id],
           );
 

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

@@ -1,7 +1,7 @@
 import { BaseEntity } from './base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
-@Entity({ name: 'cr_entity_attribute' })
+@Entity({ name: 'frm_entity_attribute' })
 export class AttributeMaster extends BaseEntity {
   @Column({ name: 'mapped_entity_type', type: 'varchar', nullable: true })
   mapped_entity_type: string;

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

@@ -2,7 +2,7 @@ import { BaseEntity } from './base-entity.entity';
 import { ENTITYTYPE_ENTITYMASTER } from '../../../constant/global.constant';
 import { Column, Entity } from 'typeorm';
 
-@Entity({ name: 'cr_entity_master' })
+@Entity({ name: 'frm_entity_master' })
 export class EntityMaster extends BaseEntity {
   constructor() {
     super();

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

@@ -2,7 +2,7 @@ import { ENTITYTYPE_ENTITY_RELATION_DATA } from 'src/constant/global.constant';
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from './base-entity.entity';
 
-@Entity({ name: 'cr_entity_relation_data' })
+@Entity({ name: 'frm_entity_relation_data' })
 export class EntityRelationData extends BaseEntity {
   constructor() {
     super();

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

@@ -2,7 +2,7 @@ import { ENTITYTYPE_ENTITY_RELATION } from 'src/constant/global.constant';
 import { Column, Entity } from 'typeorm';
 import { BaseEntity } from './base-entity.entity';
 
-@Entity({ name: 'cr_entity_relation' })
+@Entity({ name: 'frm_entity_relation' })
 export class EntityRelation extends BaseEntity {
   constructor() {
     super();