rez_core 6.5.69 → 6.5.71

package/package.json

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

package/src/module/enterprise/controller/meta.controller.ts

@@ -11,13 +11,14 @@ export class MetaController {
   @Post('populate')
   @HttpCode(HttpStatus.OK)
   async populateMetaData(
+    @Query('enterprise_id') enterpriseId: number,
     @Query('organization_id') organizationId: number,
     @Res() response: Response,
     @Req() req: Request & { user: any },
   ) {
     const loggedInUser = req.user.userData;
     const result =
-      await this.populateMetaService.populateMetaData(organizationId);
+      await this.populateMetaService.populateMetaData(enterpriseId, organizationId);
     return response.status(HttpStatus.OK).json(result);
   }
 }

package/src/module/enterprise/service/populate-meta.service.ts

@@ -8,7 +8,7 @@ export class PopulateMetaService {
   ) {
   }
 
-  async populateMetaData(organization_id: number) {
+  async populateMetaData(enterprise_id: number, organization_id: number) {
     const metadataTables = [
       'frm_entity_master',
       'frm_entity_attribute',
@@ -37,7 +37,7 @@ export class PopulateMetaService {
     if (!listMasterItemsRepo) return;
 
     const getStatus = (await listMasterItemsRepo.find({
-      where: { organization_id: organization_id, code: 'STATUS_ACTIVE' },
+      where: { enterprise_id: enterprise_id, code: 'STATUS_ACTIVE' },
     })) as any[];
 
     let status: any;
@@ -49,11 +49,11 @@ export class PopulateMetaService {
     }
 
     let oneToManyId = await listMasterItemsRepo?.find({
-      where: { value: 'ONE_TO_MANY', organization_id: organization_id },
+      where: { value: 'ONE_TO_MANY', enterprise_id: enterprise_id },
     });
 
     let oneToOneId = await listMasterItemsRepo?.find({
-      where: { value: 'ONE_TO_ONE', organization_id: organization_id },
+      where: { value: 'ONE_TO_ONE', enterprise_id: enterprise_id },
     });
 
     // Step 1: Insert basic metadata tables
@@ -67,7 +67,7 @@ export class PopulateMetaService {
 
         const factoryData = await transformRepo?.find({
           where: {
-            organization_id: -1,
+            enterprise_id: -1,
             level_type: 'ORG',
             level_id: -1,
           },
@@ -76,7 +76,7 @@ export class PopulateMetaService {
         transformedData = factoryData.map(
           ({ id, created_date, modified_date, ...rest }) => ({
             ...rest,
-            organization_id,
+            enterprise_id,
             level_type: 'ORG',
             level_id: organization_id,
             is_workflow: rest.is_workflow == 1 ? true : false,
@@ -87,7 +87,7 @@ export class PopulateMetaService {
         transformRepo = attributeMasterRepo;
         const factoryData = await transformRepo?.find({
           where: {
-            organization_id: -1,
+            enterprise_id: -1,
             level_type: 'ORG',
             level_id: -1,
           },
@@ -96,7 +96,6 @@ export class PopulateMetaService {
         transformedData = factoryData.map(
           ({ id, created_date, modified_date, ...rest }) => ({
             ...rest,
-            organization_id,
             level_type: 'ORG',
             level_id: organization_id,
             // is_unique: rest.is_unique == 1 ? true : false,
@@ -118,7 +117,6 @@ export class PopulateMetaService {
         transformedData = factoryData.map(
           ({ id, created_date, modified_date, ...rest }) => ({
             ...rest,
-            organization_id,
             level_type: 'ORG',
             level_id: organization_id,
             status: status,
@@ -171,7 +169,6 @@ export class PopulateMetaService {
       const { id, mapped_entity_type, display_type, ...rest } = entityTable;
       entityTable = {
         ...rest,
-        organization_id,
         mapped_entity_type: mapped_entity_type,
         level_type: 'ORG',
         level_id: organization_id,
@@ -198,7 +195,6 @@ export class PopulateMetaService {
         const { id, created_date, modified_date, ...columnRest } = column;
         const newColumn = {
           ...columnRest,
-          organization_id,
           parent_id: newId,
           level_type: 'ORG',
           level_id: organization_id,

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

@@ -82,6 +82,7 @@ import { AppMasterModule } from '../app_master/app-master.module';
   providers: [
     EntityMasterService,
     EntityServiceImpl,
+    {provide: 'EntityDynamicService', useClass: EntityDynamicService},
     EntityDynamicService,
     { provide: 'CommonService', useClass: CommonService },
     AttributeMasterRepository,
@@ -129,7 +130,7 @@ import { AppMasterModule } from '../app_master/app-master.module';
     AttributeMasterService,
     MasterService,
     ResolverService,
-    EntityDynamicService,
+    'EntityDynamicService',
     'CommonService',
     'EntityRelationService',
   ],

package/src/module/workflow/repository/task.repository.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { TaskDataEntity } from '../entity/task-data.entity';
 import { EntityManager, Repository } from 'typeorm';
@@ -12,6 +12,7 @@ export class TaskRepository {
   constructor(
     @InjectRepository(TaskDataEntity)
     private readonly taskRepository: Repository<TaskDataEntity>,
+    @Inject('EntityDynamicService')
     private readonly entityDynamicService: EntityDynamicService,
     private readonly reflectionHelper: ReflectionHelper,
     private readonly entityManager:EntityManager,