rez_core 6.5.68 → 6.5.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "6.5.68",
+  "version": "6.5.70",
   "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
@@ -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/service/entity-dynamic.service.ts

@@ -27,7 +27,6 @@ export class EntityDynamicService extends EntityServiceImpl{
     loggedInUser: any,
     mainID?: number,
   ): Promise<any> {
-    const organizationId = loggedInUser.organization_id;
     const enterprise_id = loggedInUser.enterprise_id;
 
     const tableName = await this.getTableName(entityType, enterprise_id);
@@ -44,9 +43,6 @@ export class EntityDynamicService extends EntityServiceImpl{
     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;
 
@@ -66,7 +62,7 @@ export class EntityDynamicService extends EntityServiceImpl{
     const statusList = listMasterItemsRepo.find({
       where: {
         code: STATUS_ACTIVE,
-        organization_id: organizationId,
+        enterprise_id: enterprise_id,
       },
     });
 
@@ -104,7 +100,6 @@ export class EntityDynamicService extends EntityServiceImpl{
     const bypassColumns = [
       'created_date',
       'created_by',
-      'organization_id',
       'enterprise_id',
       'level_type',
       'level_id',
@@ -163,7 +158,6 @@ export class EntityDynamicService extends EntityServiceImpl{
   ): Promise<any> {
     const entityType = data.entity_type;
     const enterpriseId = loggedInUser.enterprise_id;
-    const organizationId = loggedInUser.organization_id;
 
     const repo = this.reflectionHelper.getRepoService('EntityRelation');
 
@@ -213,7 +207,6 @@ export class EntityDynamicService extends EntityServiceImpl{
             this.reflectionHelper.getRepoService('EntityRelationData');
 
           await relationRepo.save({
-            organizationId: organizationId,
             enterprise_id: enterpriseId,
             source_entity_id: mainID,
             source_entity_type: entityType,
@@ -323,7 +316,6 @@ export class EntityDynamicService extends EntityServiceImpl{
     loggedInUser: any,
   ): Promise<any> {
     const entityType = data.entity_type;
-    const organizationId = loggedInUser.organization_id;
     const enterpriseId = loggedInUser.enterprise_id;
     const { mappedEntities, ...mainData } = data;
 
@@ -402,7 +394,6 @@ export class EntityDynamicService extends EntityServiceImpl{
             const entityRelationDataRepo =
               this.reflectionHelper.getRepoService('EntityRelationData');
             await entityRelationDataRepo.save({
-              organizationId: organizationId,
               enterprise_id: enterpriseId,
               source_entity_id: data.id,
               source_entity_type: entityType,
@@ -463,9 +454,6 @@ export class EntityDynamicService extends EntityServiceImpl{
     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;
     }
@@ -480,7 +468,6 @@ export class EntityDynamicService extends EntityServiceImpl{
       'created_by',
       'modified_date',
       'modified_by',
-      'organization_id',
       'enterprise_id',
       'level_type',
       'level_id',