rez_core 6.5.61 → 6.5.62

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

@@ -190,7 +190,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
         status: firstStage.status,
         current_user_id: loggedInUser.id,
         stage_action_mapping_id: firstStage.id,
-        organization_id: loggedInUser.organization_id,
         enterprise_id: loggedInUser.enterprise_id,
         stage_group_id: stageGroup.id,
         stage_id: firstStage.id,
@@ -250,7 +249,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
               description: `Stage Group changed from ${currentStage.stage_group_name} to ${nextStage.stage_group_name}.`,
               action: 'completed',
               category: ACTIVITY_CATEGORIES.STAGEGROUP,
-              appcode: loggedInUser.appcode,
             },
             loggedInUser,
           );
@@ -276,7 +274,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
         status: nextStage.status,
         current_user_id: loggedInUser.id,
         stage_action_mapping_id: nextStage.id,
-        organization_id: loggedInUser.organization_id,
         enterprise_id: loggedInUser.enterprise_id,
         start_date: now,
         stage_group_id: nextStage?.stage_group_id,
@@ -301,7 +298,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
             description: `Stage changed from ${currentStage.name} to ${nextStage.name}.`,
             action: 'status',
             category: ACTIVITY_CATEGORIES.STAGE,
-            appcode: loggedInUser.appcode,
           },
           loggedInUser,
         );
@@ -547,7 +543,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
     stage_id: number,
     actions: any[],
   ): Promise<number> {
-    const { organization_id, level_id, level_type } = loggedInUser;
+    const { enterprise_id, level_id, level_type } = loggedInUser;
 
     let owners = [] as any;
 
@@ -583,8 +579,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
     const lastRow = await leadRepo
       .createQueryBuilder("cl")
       .select("cl.lead_owner", "lead_owner")
-      .where("cl.organization_id = :orgId", { orgId: organization_id })
-      .andWhere("cl.level_id = :levelId", { levelId: Number(level_id) })
+      .where("cl.level_id = :levelId", { levelId: Number(level_id) })
       .andWhere("cl.level_type = :levelType", { levelType: level_type })
       .andWhere("cl.lead_owner IN (:...owners)", { owners: userIds })
       .orderBy("cl.created_date", "DESC")

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

@@ -52,11 +52,11 @@ export class WorkflowService extends EntityServiceImpl {
   ): Promise<any> {
     const resolveStatus = await this.listMasterService.getResolvedListCode(
       STATUS_INACTIVE,
-      loggedInUser?.organization_id || 0,
+      loggedInUser?.enterprise_id || 0,
     );
 
     const workflowId = entityData.id;
-    const { level_id, level_type, organization_id } = loggedInUser;
+    const { level_id, level_type } = loggedInUser;
 
     // Handle INACTIVE status validation
     if (entityData.status == resolveStatus.id) {

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

@@ -4,6 +4,8 @@ import {
   Injectable,
   Logger,
   NotFoundException,
+  Optional,
+  forwardRef,
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DataSource, Repository } from 'typeorm';
@@ -32,6 +34,8 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     private readonly dataSource: DataSource,
     @InjectRepository(ScheduledWorkflow)
     private readonly scheduledWorkflowRepository: Repository<ScheduledWorkflow>,
+    @Optional()
+    @Inject(forwardRef(() => WorkflowScheduleService))
     private readonly workflowScheduleService: WorkflowScheduleService,
   ) {
     super();
@@ -104,7 +108,6 @@ export class WorkflowAutomationService extends EntityServiceImpl {
           name: `Event_Filter_${workflow.id}`,
           filterDetails: event?.eventFilterJson ?? [],
           filter_scope: 'RULE',
-          organization_id: loggedInUser.organization_id,
           enterprise_id: loggedInUser.enterprise_id,
         };
 
@@ -112,7 +115,8 @@ export class WorkflowAutomationService extends EntityServiceImpl {
           this.logger.debug(
             `Existing event filter found: ${workflow.condition_filter_code}`,
           );
-          const existing = await this.savedFilterService.getSavedFilterByCode(
+          const existing = await this.savedFilterService.getEntityDataByCode(
+            ENTITYTYPE_SAVEDFILTERMASTER,
             workflow.condition_filter_code,
             loggedInUser,
           );
@@ -194,7 +198,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
           existing.payload = a.actionPayload ?? {};
           existing.actioncategoryname =
             a.actionCategoryName ?? existing.actioncategoryname;
-           existing.status = a.status ?? existing.status;
+          existing.status = a.status ?? existing.status;
           await this.dataSource
             .getRepository(WorkflowAutomationActionEntity)
             .save(existing);
@@ -258,7 +262,8 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     if (workflowAutomation.trigger_type === 'on_event') {
       if (workflowAutomation.condition_filter_code) {
         const eventFilterMaster: any =
-          await this.savedFilterService.getSavedFilterByCode(
+          await this.savedFilterService.getEntityDataByCode(
+            ENTITYTYPE_SAVEDFILTERMASTER,
             workflowAutomation.condition_filter_code,
             loggedInUser,
           );
@@ -325,6 +330,15 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       `Registering schedule automation for workflow ${workflow.id}`,
     );
 
+    // Check if WorkflowScheduleService is available (it's optional for package imports)
+    if (!this.workflowScheduleService) {
+      this.logger.warn(
+        `WorkflowScheduleService not available. Skipping schedule registration for workflow ${workflow.id}. ` +
+        `Make sure WorkflowScheduleModule is imported if you need scheduling functionality.`,
+      );
+      return;
+    }
+
     const scheduleJson = workflow.schedule;
     if (!scheduleJson) {
       this.logger.warn(`No schedule JSON provided for workflow ${workflow.id}`);
@@ -353,11 +367,9 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       actions: scheduleJson.actions ?? [],
       metadata: scheduleJson.metadata ?? {},
       is_enabled: scheduleJson.is_enabled ?? true,
-      organization_id: loggedInUser.organization_id,
       enterprise_id: loggedInUser.enterprise_id,
       level_id: loggedInUser.level_id,
-      level_type: loggedInUser.level_type,
-      appcode: loggedInUser.appcode,
+      level_type: loggedInUser.level_type
     };
 
     if (existingSchedule) {

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';
@@ -28,8 +28,9 @@ import { WorkflowScheduleModule } from '../workflow-schedule/workflow-schedule.m
       ListMasterData,
       ActionCategory
     ]),
-    FilterModule,
+    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 { }

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

@@ -84,11 +84,9 @@ export class WorkflowScheduleService {
         },
         metadata: createScheduleDto.metadata || {},
         is_enabled: createScheduleDto.is_enabled !== false,
-        organization_id: createScheduleDto.organization_id || loggedInUser.organization_id,
         enterprise_id: createScheduleDto.enterprise_id || loggedInUser.enterprise_id,
         level_id: createScheduleDto.level_id || loggedInUser.level_id,
         level_type: createScheduleDto.level_type || loggedInUser.level_type,
-        appcode: createScheduleDto.appcode || loggedInUser.appcode,
         created_by: loggedInUser.id,
         created_date: new Date(),
         status: createScheduleDto.status || 'ACTIVE',

package/src/resources/dev.properties.yaml

@@ -4,8 +4,8 @@ DB_HOST: '43.205.35.45'
 DB_PORT: '5432'
 DB_USER: 'root'
 DB_PASS: 'Rezolut123'
-DB_NAME: 'dev'
-DB_SCHEMA: 'ether_crm'
+DB_NAME: 'dev_ab'
+DB_SCHEMA: 'ether_sso'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'

package/src/table.config.ts

@@ -3,7 +3,6 @@ import { WidgetMaster } from './module/dashboard/entity/widget_master.entity';
 import { EnterpriseData } from './module/enterprise/entity/enterprise.entity';
 import { OrganizationAppMapping } from './module/enterprise/entity/organization-app-mapping.entity';
 import { OrganizationData } from './module/enterprise/entity/organization.entity';
-import { EntityJson } from './module/entity_json/entity/entityJson.entity';
 import { SavedFilterDetail } from './module/filter/entity/saved-filter-detail.entity';
 import { SavedFilterMaster } from './module/filter/entity/saved-filter-master.entity';
 import { IntegrationConfig } from './module/integration/entity/integration-config.entity';
@@ -19,7 +18,7 @@ import { ListMasterData } from './module/listmaster/entity/list-master.entity';
 import { FieldLovMapper } from './module/mapper/entity/field-lovs.entity';
 import { FieldMapper } from './module/mapper/entity/field-mapper.entity';
 import { Mapper } from './module/mapper/entity/mapper.entity';
-import { AppMaster } from './module/meta/entity/app-master.entity';
+import { AppMaster } from './module/app_master/entity/app-master.entity';
 import { AttributeMaster } from './module/meta/entity/attribute-master.entity';
 import { EntityMaster } from './module/meta/entity/entity-master.entity';
 import { EntityRelationData } from './module/meta/entity/entity-relation-data.entity';
@@ -88,7 +87,8 @@ export const frameworkTables = [
   UserIntegration,
   ViewMaster,
   LinkedAttributes,
-  EntityJson
+  HeaderItems,
+  HeaderSection
 ];
 
 export const workflowTables = [

package/dist/migrations/1732612800000-AddEntityJsonGinIndex.d.ts

@@ -1,6 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-export declare class AddEntityJsonGinIndex1732612800000 implements MigrationInterface {
-    name: string;
-    up(queryRunner: QueryRunner): Promise<void>;
-    down(queryRunner: QueryRunner): Promise<void>;
-}

package/dist/migrations/1732612800000-AddEntityJsonGinIndex.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddEntityJsonGinIndex1732612800000 = void 0;
-class AddEntityJsonGinIndex1732612800000 {
-    constructor() {
-        this.name = 'AddEntityJsonGinIndex1732612800000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`
-      CREATE INDEX IF NOT EXISTS idx_entity_json_data_gin
-      ON frm_entity_json
-      USING GIN (json_data jsonb_path_ops);
-    `);
-        await queryRunner.query(`
-      CREATE INDEX IF NOT EXISTS idx_entity_json_entity_type
-      ON frm_entity_json (entity_type);
-    `);
-        await queryRunner.query(`
-      CREATE INDEX IF NOT EXISTS idx_entity_json_composite
-      ON frm_entity_json (entity_type, entity_id);
-    `);
-        console.log('✅ GIN indexes created successfully');
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX IF EXISTS idx_entity_json_data_gin;`);
-        await queryRunner.query(`DROP INDEX IF EXISTS idx_entity_json_entity_type;`);
-        await queryRunner.query(`DROP INDEX IF EXISTS idx_entity_json_composite;`);
-        console.log('✅ GIN indexes dropped successfully');
-    }
-}
-exports.AddEntityJsonGinIndex1732612800000 = AddEntityJsonGinIndex1732612800000;
-//# sourceMappingURL=1732612800000-AddEntityJsonGinIndex.js.map

package/dist/migrations/1732612800000-AddEntityJsonGinIndex.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"1732612800000-AddEntityJsonGinIndex.js","sourceRoot":"","sources":["../../src/migrations/1732612800000-AddEntityJsonGinIndex.ts"],"names":[],"mappings":";;;AAEA,MAAa,kCAAkC;IAA/C;QACE,SAAI,GAAG,oCAAoC,CAAC;IAqC9C,CAAC;IAnCQ,KAAK,CAAC,EAAE,CAAC,WAAwB;QAGtC,MAAM,WAAW,CAAC,KAAK,CAAC;;;;KAIvB,CAAC,CAAC;QAGH,MAAM,WAAW,CAAC,KAAK,CAAC;;;KAGvB,CAAC,CAAC;QAGH,MAAM,WAAW,CAAC,KAAK,CAAC;;;KAGvB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IACpD,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACxC,MAAM,WAAW,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAC1E,MAAM,WAAW,CAAC,KAAK,CACrB,mDAAmD,CACpD,CAAC;QACF,MAAM,WAAW,CAAC,KAAK,CACrB,iDAAiD,CAClD,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IACpD,CAAC;CACF;AAtCD,gFAsCC"}

package/dist/module/filter/service/flatjson-filter.service.d.ts

@@ -1,32 +0,0 @@
-import { EntityManager } from 'typeorm';
-import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
-import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
-import { ResolverService } from 'src/module/meta/service/resolver.service';
-import { LoggingService } from 'src/utils/service/loggingUtil.service';
-import { ConfigService } from '@nestjs/config';
-import { FilterRequestDto } from '../dto/filter-request.dto';
-import { SavedFilterRepositoryService } from '../repository/saved-filter.repository';
-import { EntityJSONService } from 'src/module/entity_json/service/entity_json.service';
-export declare class FlatjsonFilterService {
-    private readonly entityManager;
-    private readonly entityMasterService;
-    private readonly attributeMasterService;
-    private readonly resolverService;
-    private readonly loggingService;
-    private readonly configService;
-    private readonly savedFilterRepositoryService;
-    private readonly entityJsonService;
-    constructor(entityManager: EntityManager, entityMasterService: EntityMasterService, attributeMasterService: AttributeMasterService, resolverService: ResolverService, loggingService: LoggingService, configService: ConfigService, savedFilterRepositoryService: SavedFilterRepositoryService, entityJsonService: EntityJSONService);
-    applyFlatjsonFilter(dto: FilterRequestDto): Promise<any>;
-    private buildJsonbConditions;
-    private resolveEntityData;
-    private buildJsonbCondition;
-    private buildTextCondition;
-    private buildNumberCondition;
-    private buildDateCondition;
-    private buildSelectCondition;
-    private buildMultiSelectCondition;
-    private buildYearCondition;
-    private getJsonbTabCounts;
-    private applyJsonbSorting;
-}