rez_core 6.5.17 → 6.5.19

package/package.json

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

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/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-automation/workflow-automation.module.ts

@@ -12,7 +12,7 @@ import { ActionRegistryService } from './service/action-registery.service';
 import { ScheduleHandlerService } from './service/schedule-handler.service';
 import { ScheduledWorkflow } from '../workflow-schedule/entities/scheduled-workflow.entity';
 import { WorkflowExecutionLog } from '../workflow-schedule/entities/workflow-execution-log.entity';
-import {EntityMaster} from "../meta/entity/entity-master.entity";
+import { EntityMaster } from "../meta/entity/entity-master.entity";
 import { ListMasterData } from '../listmaster/entity/list-master.entity';
 import { ActionCategory } from '../workflow/entity/action-category.entity';
 import { WorkflowScheduleModule } from '../workflow-schedule/workflow-schedule.module';
@@ -30,6 +30,7 @@ import { WorkflowScheduleModule } from '../workflow-schedule/workflow-schedule.m
     ]),
     forwardRef(() => FilterModule),
     forwardRef(() => EntityModule),
+    forwardRef(() => WorkflowScheduleModule), // 👈 Required for WorkflowScheduleService
     DiscoveryModule, // 👈 enables provider scanning
   ],
   providers: [
@@ -51,4 +52,4 @@ import { WorkflowScheduleModule } from '../workflow-schedule/workflow-schedule.m
   ],
   controllers: [WorkflowAutomationController],
 })
-export class WorkflowAutomationModule {}
+export class WorkflowAutomationModule { }