rez_core 2.1.112 → 2.1.114

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "rez_core",
-  "version": "2.1.112",
+  "version": "2.1.114",
   "description": "",
-  "author": "", 
+  "author": "",
   "private": false,
   "license": "UNLICENSED",
   "scripts": {

package/src/core.module.ts

@@ -13,6 +13,7 @@ import { FilterModule } from './module/filter/filter.module';
 import { AuthModule } from './module/auth/auth.module';
 import { LeadModule } from './module/lead/lead.module';
 import { LayoutPreferenceModule } from './module/layout_preference/layout_preference.module';
+import { WorkflowModule } from './module/workflow/workflow.module';
 import { ResolverModule } from './module/resolver/resolver.module';
 
 @Global()
@@ -34,6 +35,7 @@ export class CoreModule {
       AuthModule,
       LeadModule,
       LayoutPreferenceModule,
+      WorkflowModule,
       ResolverModule,
     ];
 
@@ -48,6 +50,7 @@ export class CoreModule {
       FilterModule,
       LeadModule,
       LayoutPreferenceModule,
+      WorkflowModule,
       ResolverModule,
     ];
 

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

@@ -167,7 +167,7 @@ export class MasterService {
 
       const attributes =
         await this.attributeMasterService.findAttributesByMappedEntityType(
-          entityMasterData?.mapped_entity_type,
+          entityMasterData.mapped_entity_type,
           loggedInUser.organization_id,
         );
 

package/src/module/resolver/resolver.module.ts

@@ -4,7 +4,7 @@ import { ResolverController } from './controller/resolver.controller';
 import { EntityModule } from '../meta/entity.module';
 
 @Module({
-  imports: [EntityModule],
+  imports: [],
   controllers: [ResolverController],
   providers: [ResolverService],
   exports: [ResolverService],

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

@@ -4,10 +4,8 @@ import { UserData } from 'src/module/user/entity/user.entity';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 
 @Injectable()
-export class ResolverService extends EntityServiceImpl {
-  constructor(private readonly dataSource: DataSource) {
-    super();
-  }
+export class ResolverService {
+  constructor(private readonly dataSource: DataSource) {}
 
   async getResolvedData(
     loggedInUser: UserData,
@@ -29,24 +27,35 @@ export class ResolverService extends EntityServiceImpl {
 
       // -------- ENTITY data_source_type --------
       if (attr.data_source_type === 'entity') {
+        const [entityDef] = await this.dataSource.query(
+          `SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? AND organization_id = ?`,
+          [attr.datasource_list, loggedInUser.organization_id],
+        );
+
+        if (!entityDef) {
+          // fallback or skip if no mapping found
+          resolvedEntityData[field] = codeValue;
+          continue;
+        }
+
+        const tableName = entityDef.db_table_name;
+
         if (Array.isArray(codeValue)) {
           const resolvedValues: string[] = [];
 
           for (const code of codeValue) {
-            const item = await super.getEntityData(
-              attr.datasource_list,
-              code,
-              loggedInUser,
+            const [item] = await this.dataSource.query(
+              `SELECT * FROM ${tableName} WHERE code = ? AND organization_id = ?`,
+              [code, loggedInUser.organization_id],
             );
             resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
           }
 
           resolvedEntityData[field] = resolvedValues;
         } else {
-          const item = await super.getEntityData(
-            attr.datasource_list,
-            codeValue,
-            loggedInUser,
+          const [item] = await this.dataSource.query(
+            `SELECT * FROM ${tableName} WHERE code = ? AND organization_id = ?`,
+            [codeValue, loggedInUser.organization_id],
           );
           resolvedEntityData[field] =
             item?.[attr.data_source_attribute] ?? codeValue;

package/src/resources/local.properties.yaml

@@ -0,0 +1,23 @@
+# DB_HOST: "13.234.25.234"
+DB_HOST: 'localhost'
+DB_PORT: '3306'
+DB_USER: 'root'
+DB_PASS: 'root'
+DB_NAME: 'eth_core'
+MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
+MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
+SECRET_KEY: '1hard_to_guess_secret7890a'
+CLIENT_ID: '324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com'
+CLIENT_SECRET: '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'
+CALLBACK_URL: 'http://localhost:3000/auth/google/callback'
+OTP_EXPIRY: '10'
+OTP_LENGTH: '6'
+VERIFY_OTP: 'false'
+DEFAULT_OTP: '123456'
+TOKEN_EXPIRY: 1
+AWS:
+  S3:
+    AWS_ACCESS_KEY_ID: 'AKIAYYKIBDDSQF3KILGE'
+    AWS_SECRET_KEY: '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'
+    AWS_REGION: 'ap-south-1'
+    BUCKET_NAME: 'testether'