rez_core 6.5.16 → 6.5.18

package/package.json

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

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

@@ -0,0 +1,23 @@
+import { Controller, HttpCode, HttpStatus, Post, Query, Req, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { PopulateMetaService } from '../service/populate-meta.service';
+
+@Controller('meta')
+export class MetaController {
+
+  constructor(private readonly populateMetaService: PopulateMetaService) {
+  }
+
+  @Post('populate')
+  @HttpCode(HttpStatus.OK)
+  async populateMetaData(
+    @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);
+    return response.status(HttpStatus.OK).json(result);
+  }
+}

package/src/module/enterprise/enterprise.module.ts

@@ -15,6 +15,8 @@ import { EnterpriseService } from './service/enterprise.service';
 import { EnterpriseRepository } from './repository/enterprise.repository';
 import { EnterpriseData } from './entity/enterprise.entity';
 import { EnterpriseController } from './controller/enterprise.controller';
+import { PopulateMetaService } from './service/populate-meta.service';
+import { MetaController } from './controller/meta.controller';
 
 @Module({
   imports: [
@@ -25,7 +27,7 @@ import { EnterpriseController } from './controller/enterprise.controller';
     ]),
     UtilsModule,
   ],
-  controllers: [OrganizationController, EnterpriseController],
+  controllers: [OrganizationController, EnterpriseController, MetaController],
   providers: [
     OrganizationService,
     OrganizationAppMappingService,
@@ -33,8 +35,9 @@ import { EnterpriseController } from './controller/enterprise.controller';
     OrganizationRepository,
     EnterpriseService,
     EnterpriseRepository,
+    PopulateMetaService
   ],
-  exports: [OrganizationService, OrganizationRepository, EnterpriseService, EnterpriseRepository],
+  exports: [OrganizationService, OrganizationRepository, EnterpriseService, EnterpriseRepository, PopulateMetaService],
 })
 export class EnterpriseModule {
 }

package/src/module/{meta → enterprise}/service/populate-meta.service.ts

@@ -1,15 +1,12 @@
 import { Injectable } from '@nestjs/common';
-import { DataSource } from 'typeorm';
-import { EntityServiceImpl } from './entity-service-impl.service';
 import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
 
 @Injectable()
 export class PopulateMetaService {
   constructor(
-    private readonly dataSource: DataSource,
-    private readonly entityServiceImpl: EntityServiceImpl,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {}
+  ) {
+  }
 
   async populateMetaData(organization_id: number) {
     const metadataTables = [

package/src/module/entity_json/service/entity_json.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable, forwardRef } from '@nestjs/common';
 import { LinkedAttributes } from 'src/module/linked_attributes/entity/linked_attribute.entity';
 import { AttributeMaster } from 'src/module/meta/entity/attribute-master.entity';
 import { EntityRelation } from 'src/module/meta/entity/entity-relation.entity';
@@ -9,15 +9,16 @@ import { EntityJSONRepository } from './entityJson.repository';
 import { FilterService } from '../../filter/service/filter.service';
 
 @Injectable()
-export class EntityJSONService extends EntityServiceImpl {
+export class EntityJSONService {
   constructor(
     private readonly dataSource: DataSource,
     private readonly loggerService: LoggingService,
     private readonly EntityJSONRepository: EntityJSONRepository,
+    @Inject(forwardRef(() => FilterService))
     private readonly filterService: FilterService,
-  ) {
-    super();
-  }
+    @Inject(forwardRef(() => EntityServiceImpl))
+    private readonly entityServiceImpl: EntityServiceImpl,
+  ) {}
 
   async getAttributeForFlatJSON(
     entityType: string,
@@ -138,7 +139,7 @@ export class EntityJSONService extends EntityServiceImpl {
       if (attr.attribute_key) attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key;
     });
 
-    const mainData = await this.getResolvedEntityData(entityType, entityId, loggedInUser);
+    const mainData = await this.entityServiceImpl.getResolvedEntityData(entityType, entityId, loggedInUser);
     this.mergeEntityDataIntoFlatJson(flatJson, mainData, attrMap);
 
     const relations = await this.dataSource
@@ -151,7 +152,7 @@ export class EntityJSONService extends EntityServiceImpl {
       .getRawMany();
 
     for (const rel of relations) {
-      const relatedData = await this.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
+      const relatedData = await this.entityServiceImpl.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
       this.mergeEntityDataIntoFlatJson(flatJson, relatedData, attrMap);
     }
 

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

@@ -1,17 +1,7 @@
-import {
-  Body,
-  Controller, HttpCode,
-  HttpStatus,
-  Post,
-  Query,
-  Req,
-  Res,
-  UseGuards,
-} from '@nestjs/common';
+import { Body, Controller, HttpCode, HttpStatus, Post, Query, Req, Res, UseGuards } from '@nestjs/common';
 import { EntityTableService } from '../service/entity-table.service';
 import { Response } from 'express';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
-import { PopulateMetaService } from '../service/populate-meta.service';
 import { EntityMasterService } from '../service/entity-master.service';
 
 @Controller('meta')
@@ -19,9 +9,9 @@ import { EntityMasterService } from '../service/entity-master.service';
 export class MetaController {
   constructor(
     private readonly entityTableService: EntityTableService,
-    private readonly populateMetaService: PopulateMetaService,
     private readonly entityMaster: EntityMasterService,
-  ) {}
+  ) {
+  }
 
   @Post('get-table-data')
   @HttpCode(HttpStatus.OK)
@@ -64,18 +54,6 @@ export class MetaController {
     });
   }
 
-  @Post('populate')
-  @HttpCode(HttpStatus.OK)
-  async populateMetaData(
-    @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);
-    return response.status(HttpStatus.OK).json(result);
-  }
 
   @Post('operation-list')
   @HttpCode(HttpStatus.OK)

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

@@ -44,7 +44,6 @@ import { UserRoleMapping } from '../user/entity/user-role-mapping.entity';
 import { AppMasterService } from './service/app-master.service';
 import { AppMasterRespository } from './repository/app-master.repository';
 import { AppMaster } from './entity/app-master.entity';
-import { PopulateMetaService } from './service/populate-meta.service';
 import { AttributeMasterController } from './controller/attribute-master.controller';
 import { EntityDynamicController } from './controller/entity-dynamic.controller';
 import { EntityDynamicService } from './service/entity-dynamic.service';
@@ -82,7 +81,7 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     forwardRef(() => FilterModule),
     UtilsModule,
     forwardRef(() => WorkflowAutomationModule),
-    
+
   ],
   providers: [
     EntityMasterService,
@@ -96,7 +95,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MasterService,
     EntityTableRepository,
     EntityTableService,
-    PopulateMetaService,
     EntityTableColumnRepository,
     EntityTableColumnService,
     MediaDataRepository,
@@ -129,7 +127,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     PreferenceService,
     EntityValidationService,
     EntityTableService,
-    PopulateMetaService,
     EntityTableColumnService,
     MediaDataService,
     EntityUpdateService,
@@ -146,7 +143,7 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     EntityDynamicService,
     'CommonService',
     'EntityRelationService',
-    AppMasterRespository
+    AppMasterRespository,
   ],
   controllers: [
     EntityController,
@@ -163,4 +160,5 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
 
   ],
 })
-export class EntityModule {}
+export class EntityModule {
+}

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

@@ -14,14 +14,24 @@ import { ResolverService } from './resolver.service';
 
 @Injectable()
 export class EntityServiceImpl implements EntityService<BaseEntity> {
-  @Inject() protected readonly entityMasterService: EntityMasterService;
-  @Inject()
+  @Inject(forwardRef(() => EntityMasterService))
+  protected readonly entityMasterService: EntityMasterService;
+
+  @Inject(forwardRef(() => EntityTableColumnService))
   protected readonly entityTableColumnService: EntityTableColumnService;
-  @Inject() protected readonly entityTableService: EntityTableService;
-  @Inject() protected readonly reflectionHelper: ReflectionHelper;
-  @Inject() protected readonly loggingService: LoggingService;
-  @Inject()
+
+  @Inject(forwardRef(() => EntityTableService))
+  protected readonly entityTableService: EntityTableService;
+
+  @Inject(forwardRef(() => ReflectionHelper))
+  protected readonly reflectionHelper: ReflectionHelper;
+
+  @Inject(forwardRef(() => LoggingService))
+  protected readonly loggingService: LoggingService;
+
+  @Inject(forwardRef(() => EntityValidationService))
   protected readonly entityValidationService: EntityValidationService;
+
   @Inject(forwardRef(() => ResolverService))
   protected readonly resolverService: ResolverService;
 

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

@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Inject, Injectable, forwardRef } from '@nestjs/common';
 import { UserData } from '../../user/entity/user.entity';
 import * as moment from 'moment';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
@@ -18,6 +18,7 @@ export class ResolverService {
     private readonly moduleRef: ModuleRef,
     private readonly attributeMasterRepo: AttributeMasterRepository,
     private readonly reflectionHelper: ReflectionHelper,
+    @Inject(forwardRef(() => EntityMasterRepository))
     private readonly entityMasterRepo: EntityMasterRepository,
     private readonly entityManger: EntityManager,
   ) {

package/src/module/user/controller/login.controller.ts

@@ -22,8 +22,7 @@ export class LoginController {
   constructor(
     private loginService: LoginService,
     private userSessionService: UserSessionService,
-    private configService: ConfigService,
-    private integrationService: IntegrationService,
+    private configService: ConfigService
   ) {}
 
   @Post('login')
@@ -86,12 +85,12 @@ export class LoginController {
         const actualState = state.replace('gmail_config:', '');
 
         // Forward to communication service for Gmail config handling using already exchanged tokens
-        const result = await this.integrationService.handleGmailTokensCallback(
-          email,
-          googleAccessToken,
-          googleRefreshToken,
-          actualState,
-        );
+        // const result = await this.integrationService.handleGmailTokensCallback(
+        //   email,
+        //   googleAccessToken,
+        //   googleRefreshToken,
+        //   actualState,
+        // );
 
         return res.send(
           `<html><body><script>

package/src/module/user/user.module.ts

@@ -36,8 +36,7 @@ import { EnterpriseData } from '../enterprise/entity/enterprise.entity';
     ]),
     forwardRef(() => AuthModule),
     UtilsModule,
-    forwardRef(() => EnterpriseModule),
-    IntegrationModule
+    forwardRef(() => EnterpriseModule)
   ],
   providers: [
     { provide: 'UserService', useClass: UserService },

package/src/module/workflow/service/populate-workflow.service.ts

@@ -2,7 +2,7 @@ import { create } from 'domain';
 import { CommTemplate } from './../entity/comm-template.entity';
 import { ActionCategory } from './../entity/action-category.entity';
 import { DataSource } from 'typeorm';
-import { PopulateMetaService } from './../../meta/service/populate-meta.service';
+import { PopulateMetaService } from '../../enterprise/service/populate-meta.service';
 import { Inject, Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { WorkflowService } from './workflow.service';

package/src/module/workflow/workflow.module.ts

@@ -65,6 +65,7 @@ import { MapperModule } from '../mapper/mapper.module';
 import { WorkflowAutomationModule } from '../workflow-automation/workflow-automation.module';
 import { ListMasterData } from '../listmaster/entity/list-master.entity';
 import { ListMasterItems } from '../listmaster/entity/list-master-items.entity';
+import { EnterpriseModule } from '../enterprise/enterprise.module';
 
 @Module({
   imports: [
@@ -93,6 +94,7 @@ import { ListMasterItems } from '../listmaster/entity/list-master-items.entity';
     NotificationModule,
     MapperModule,
     WorkflowAutomationModule,
+    EnterpriseModule
   ],
   providers: [
     { provide: 'ActionCategoryService', useClass: ActionCategoryService },

package/dist/module/meta/service/populate-meta.service.d.ts

@@ -1,13 +0,0 @@
-import { DataSource } from 'typeorm';
-import { EntityServiceImpl } from './entity-service-impl.service';
-import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
-export declare class PopulateMetaService {
-    private readonly dataSource;
-    private readonly entityServiceImpl;
-    private readonly reflectionHelper;
-    constructor(dataSource: DataSource, entityServiceImpl: EntityServiceImpl, reflectionHelper: ReflectionHelper);
-    populateMetaData(organization_id: number): Promise<{
-        message: string;
-        status: string;
-    } | undefined>;
-}

package/dist/module/meta/service/populate-meta.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"populate-meta.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/populate-meta.service.ts"],"names":[],"mappings":"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"}