rez_core 4.0.184 → 4.0.187

package/dist/utils/service/loggingUtil.service.d.ts

@@ -1,4 +1,11 @@
+import { ConfigService } from '@nestjs/config';
 export declare class LoggingService {
-    constructor();
-    log(level: string, serviceName: string, methodName: string, message: string, parameters?: unknown[], debuginfo?: unknown[]): Promise<void>;
+    private readonly configService;
+    private readonly logger;
+    private readonly graylogUrl;
+    private readonly environment;
+    constructor(configService: ConfigService);
+    log(level: string, serviceName: string, methodName: string, message: string, parameters?: unknown[], debugInfo?: unknown[]): Promise<void>;
+    private sendToGraylog;
+    private mapLogLevel;
 }

package/dist/utils/service/loggingUtil.service.js

@@ -8,29 +8,80 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var LoggingService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggingService = void 0;
 const common_1 = require("@nestjs/common");
-let LoggingService = class LoggingService {
-    constructor() { }
-    async log(level, serviceName, methodName, message, parameters, debuginfo) {
-        const levelInfo = level.toLowerCase().trim();
-        const logger = new common_1.Logger(serviceName);
-        const logMessage = `${methodName} : ${message} : Parameters :${JSON.stringify(parameters)}: Debug Info: ${JSON.stringify(debuginfo)}`;
-        if (levelInfo === 'debug' || levelInfo === 'info') {
-            logger.debug(logMessage);
+const config_1 = require("@nestjs/config");
+const axios_1 = require("axios");
+let LoggingService = LoggingService_1 = class LoggingService {
+    constructor(configService) {
+        this.configService = configService;
+        this.logger = new common_1.Logger(LoggingService_1.name);
+        this.graylogUrl =
+            this.configService.get('GRAYLOG_URL') ||
+                'http://localhost:12201/gelf';
+        this.environment = this.configService.get('PROFILE') || 'dev';
+    }
+    async log(level, serviceName, methodName, message, parameters, debugInfo) {
+        const logLevel = level.toLowerCase().trim();
+        const logMessage = `${serviceName}.${methodName}: ${message} | Params: ${JSON.stringify(parameters)} | Debug: ${JSON.stringify(debugInfo)}`;
+        switch (logLevel) {
+            case 'debug':
+            case 'info':
+                this.logger.debug(logMessage);
+                break;
+            case 'warn':
+                this.logger.warn(logMessage);
+                break;
+            case 'error':
+                this.logger.error(logMessage);
+                break;
+            default:
+                this.logger.log(logMessage);
         }
-        else if (levelInfo === 'error') {
-            logger.error(logMessage);
+        this.sendToGraylog({
+            version: '1.1',
+            host: serviceName || 'nestjs-app',
+            short_message: message,
+            full_message: logMessage,
+            level: this.mapLogLevel(logLevel),
+            _service: serviceName,
+            _method: methodName,
+            _parameters: parameters,
+            _debug: debugInfo,
+            _environment: this.environment,
+            timestamp: Date.now() / 1000,
+        });
+    }
+    async sendToGraylog(payload) {
+        try {
+            await axios_1.default.post(this.graylogUrl, payload, {
+                headers: { 'Content-Type': 'application/json' },
+                timeout: 2000,
+            });
         }
-        else {
-            logger.log(logMessage);
+        catch (err) {
+            this.logger.warn(`Graylog send failed: ${err.message}`);
         }
     }
+    mapLogLevel(level) {
+        const mapping = {
+            emerg: 0,
+            alert: 1,
+            crit: 2,
+            error: 3,
+            warn: 4,
+            notice: 5,
+            info: 6,
+            debug: 7,
+        };
+        return mapping[level] ?? 6;
+    }
 };
 exports.LoggingService = LoggingService;
-exports.LoggingService = LoggingService = __decorate([
+exports.LoggingService = LoggingService = LoggingService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [])
+    __metadata("design:paramtypes", [config_1.ConfigService])
 ], LoggingService);
 //# sourceMappingURL=loggingUtil.service.js.map

package/dist/utils/service/loggingUtil.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"loggingUtil.service.js","sourceRoot":"","sources":["../../../src/utils/service/loggingUtil.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoD;AAG7C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,gBAAe,CAAC;IAEhB,KAAK,CAAC,GAAG,CACP,KAAa,EACb,WAAmB,EACnB,UAAkB,EAClB,OAAe,EACf,UAAsB,EACtB,SAAqB;QAErB,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,WAAW,CAAC,CAAC;QAGvC,MAAM,UAAU,GAAG,GAAG,UAAU,MAAM,OAAO,kBAAkB,IAAI,CAAC,SAAS,CAC3E,UAAU,CACX,iBAAiB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;QAE9C,IAAI,SAAS,KAAK,OAAO,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAClD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC;aAAM,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YACjC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YAEN,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzB,CAAC;IAGH,CAAC;CACF,CAAA;AA9BY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;;GACA,cAAc,CA8B1B"}
+{"version":3,"file":"loggingUtil.service.js","sourceRoot":"","sources":["../../../src/utils/service/loggingUtil.service.ts"],"names":[],"mappings":"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"}

package/dist/utils/utils.module.js

@@ -13,12 +13,14 @@ const reflection_helper_service_1 = require("./service/reflection-helper.service
 const excelUtil_service_1 = require("./service/excelUtil.service");
 const clockIDGenUtil_service_1 = require("./service/clockIDGenUtil.service");
 const wbsCodeGen_service_1 = require("./service/wbsCodeGen.service");
+const config_1 = require("@nestjs/config");
 let UtilsModule = class UtilsModule {
 };
 exports.UtilsModule = UtilsModule;
 exports.UtilsModule = UtilsModule = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({
+        imports: [config_1.ConfigModule],
         providers: [
             loggingUtil_service_1.LoggingService,
             reflection_helper_service_1.ReflectionHelper,

package/dist/utils/utils.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.module.js","sourceRoot":"","sources":["../../src/utils/utils.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,uEAA+D;AAC/D,mFAAuE;AACvE,mEAAwD;AACxD,6EAAqE;AACrE,qEAAiE;AAmB1D,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IAjBvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,oCAAc;YACd,4CAAgB;YAChB,6BAAS;YACT,0CAAiB;YACjB,sCAAiB;SAClB;QACD,OAAO,EAAE;YACP,oCAAc;YACd,4CAAgB;YAChB,6BAAS;YACT,0CAAiB;YACjB,sCAAiB;SAClB;KACF,CAAC;GACW,WAAW,CAAG"}
+{"version":3,"file":"utils.module.js","sourceRoot":"","sources":["../../src/utils/utils.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,uEAA+D;AAC/D,mFAAuE;AACvE,mEAAwD;AACxD,6EAAqE;AACrE,qEAAiE;AACjE,2CAA8C;AAoBvC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IAlBvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,qBAAY,CAAC;QACvB,SAAS,EAAE;YACT,oCAAc;YACd,4CAAgB;YAChB,6BAAS;YACT,0CAAiB;YACjB,sCAAiB;SAClB;QACD,OAAO,EAAE;YACP,oCAAc;YACd,4CAAgB;YAChB,6BAAS;YACT,0CAAiB;YACjB,sCAAiB;SAClB;KACF,CAAC;GACW,WAAW,CAAG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "4.0.184",
+  "version": "4.0.187",
   "description": "",
   "author": "",
   "private": false,
@@ -25,9 +25,10 @@
     "@microsoft/microsoft-graph-client": "^3.0.7",
     "@nestjs-modules/mailer": "^2.0.2",
     "@nestjs/axios": "^4.0.0",
-    "@nestjs/common": "^11.0.1",
-    "@nestjs/config": "^4.0.1",
-    "@nestjs/core": "^11.0.1",
+    "@nestjs/bull": "^11.0.4",
+    "@nestjs/common": "^11.1.0",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.1.0",
     "@nestjs/jwt": "^11.0.0",
     "@nestjs/microservices": "^11.1.8",
     "@nestjs/passport": "^11.0.5",
@@ -40,8 +41,10 @@
     "aws-sdk": "^2.1692.0",
     "axios": "^1.9.0",
     "bcrypt": "^5.1.1",
+    "bull": "^4.16.5",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
+    "cron-parser": "^5.4.0",
     "crypto": "^1.0.1",
     "crypto-js": "^4.2.0",
     "dotenv": "^16.4.7",
@@ -60,6 +63,7 @@
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
     "pg": "^8.16.3",
+    "redis": "^4.7.1",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "twilio": "^5.9.0",
@@ -77,6 +81,7 @@
     "@nestjs/testing": "^11.0.1",
     "@swc/cli": "^0.6.0",
     "@swc/core": "^1.10.7",
+    "@types/bull": "^3.15.9",
     "@types/cron": "^2.0.1",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",

package/src/app.module.ts

@@ -20,7 +20,13 @@ import { IntegrationModule } from './module/integration/integration.module';
 import { ScheduleModule } from '@nestjs/schedule';
 import { AuthModule } from './module/auth/auth.module';
 import { MapperModule } from './module/mapper/mapper.module';
+import { BullModule } from '@nestjs/bull';
+import { bullConfigFactory } from './config/bull.config';
+import { WorkflowScheduleModule } from './module/workflow-schedule/workflow-schedule.module';
 import { MicroserviceClientsModule } from './module/microservice-client/microservice-clients.module';
+import { WorkflowAutomationModule } from './module/workflow-automation/workflow-automation.module';
+import { LinkedAttributesModule } from './module/linked_attributes/linked_attributes.module';
+import { EntityJSONModule } from './module/entity_json/entity_json.module';
 
 @Module({
   imports: [
@@ -45,8 +51,16 @@ import { MicroserviceClientsModule } from './module/microservice-client/microser
     AuthModule,
     MapperModule,
     ScheduleModule.forRoot(),
+    // Bull Queue Module for scheduled workflows
+    BullModule.forRootAsync(bullConfigFactory),
+    // Workflow Schedule Module - Provides scheduling capabilities
+    // Set is_workflow: true to run cron processor on this server
+    WorkflowScheduleModule.forRoot({ is_workflow: true }),
+    // Workflow Automation Module - For on-trigger and scheduled workflows
+    WorkflowAutomationModule,
     MicroserviceClientsModule,
+    LinkedAttributesModule,
+    EntityJSONModule,
   ],
 })
-export class AppModule {
-}
+export class AppModule {}

package/src/config/bull.config.ts

@@ -0,0 +1,69 @@
+import { BullModuleOptions, SharedBullConfigurationFactory } from '@nestjs/bull';
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+/**
+ * Bull Queue Configuration
+ * Configures Redis connection and queue settings for Bull
+ */
+@Injectable()
+export class BullConfigService implements SharedBullConfigurationFactory {
+  constructor(private configService: ConfigService) {}
+
+  createSharedConfiguration(): BullModuleOptions {
+    return {
+      redis: {
+        host: this.configService.get<string>('REDIS_HOST', 'localhost'),
+        port: this.configService.get<number>('REDIS_PORT', 6379),
+        password: this.configService.get<string>('REDIS_PASSWORD'),
+        db: this.configService.get<number>('REDIS_DB', 0),
+        // Enable offline queue to handle Redis disconnections
+        enableOfflineQueue: true,
+        // Retry strategy for Redis connection
+        retryStrategy: (times: number) => {
+          const delay = Math.min(times * 50, 2000);
+          return delay;
+        },
+        // Connection timeout
+        connectTimeout: 10000,
+        // Keep alive settings
+        keepAlive: 30000,
+      },
+      // Default job options for all queues
+      defaultJobOptions: {
+        attempts: 3,
+        backoff: {
+          type: 'exponential',
+          delay: 5000,
+        },
+        removeOnComplete: {
+          age: 3600 * 24 * 7, // Keep completed jobs for 7 days
+          count: 1000, // Keep max 1000 completed jobs
+        },
+        removeOnFail: {
+          age: 3600 * 24 * 30, // Keep failed jobs for 30 days
+        },
+      },
+      // Queue settings
+      settings: {
+        // Stalled job checking interval
+        stalledInterval: 30000,
+        // Maximum stalled count before job is considered failed
+        maxStalledCount: 2,
+        // Lock duration for jobs
+        lockDuration: 300000, // 5 minutes
+        // Lock renew time
+        lockRenewTime: 150000, // 2.5 minutes
+      },
+      // Prefix for all queue keys in Redis
+      prefix: 'bull',
+    };
+  }
+}
+
+/**
+ * Factory function for BullModule.forRootAsync()
+ */
+export const bullConfigFactory = {
+  useClass: BullConfigService,
+};

package/src/config/database.config.ts

@@ -36,7 +36,7 @@ export class PostgresConfiguration implements TypeOrmOptionsFactory {
       database: this.configService.get('DB_NAME') || 'core',
       schema: this.configService.get('DB_SCHEMA') || 'package',
       entities: [__dirname + '/../module/**/*.entity.{ts,js}'],
-      synchronize: false,
+      synchronize: true,
       autoLoadEntities: true,
       // Configure pg pool size via `extra.max` (pg uses node-postgres pool)
       extra: {

package/src/module/entity_json/controller/entity_json.controller.ts

@@ -0,0 +1,47 @@
+import {
+  Controller,
+  Get,
+  Param,
+  Post,
+  Query,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { EntityJSONService } from '../service/entity_json.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('entity-json')
+export class EntityJSONController {
+  constructor(private readonly entityJSONService: EntityJSONService) {}
+
+  @Get('/:entityType')
+  @UseGuards(JwtAuthGuard)
+  async getEntityJson(
+    @Param('entityType') entityType: string,
+    @Req() req: Request & { user: any },
+    @Query('mode') mode?: 'flat_json' | 'dropdown',
+  ) {
+    const loggedInUser = req.user?.userData;
+    return this.entityJSONService.getAttributeForFlatJSON(
+      entityType,
+      loggedInUser,
+      mode,
+    );
+  }
+
+  // @Post('/update-json/:entityId')
+  // @UseGuards(JwtAuthGuard)
+  // async updateEntityJson(
+  //   @Param('entityId') entityId: string,
+  //   @Query('entityType') entityType: string,
+  //   @Req() req: Request & { user: any },
+  // ) {
+  //   const loggedInUser = req.user?.userData;
+
+  //   return this.entityJSONService.updateEntityJSON(
+  //     entityType,
+  //     Number(entityId),
+  //     loggedInUser,
+  //   );
+  // }
+}

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

@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+import { EntityModule } from '../meta/entity.module';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { EntityJSONService } from './service/entity_json.service';
+import { EntityJSONController } from './controller/entity_json.controller';
+
+@Module({
+  imports: [EntityModule, TypeOrmModule.forFeature([])],
+  controllers: [EntityJSONController],
+  providers: [EntityJSONService],
+  exports: [],
+})
+export class EntityJSONModule {}

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

@@ -0,0 +1,162 @@
+import { Injectable } from '@nestjs/common';
+import { AttributeMaster } from 'src/module/meta/entity/attribute-master.entity';
+import { EntityRelation } from 'src/module/meta/entity/entity-relation.entity';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { DataSource } from 'typeorm';
+
+@Injectable()
+export class EntityJSONService extends EntityServiceImpl {
+  constructor(private readonly dataSource: DataSource) {
+    super();
+  }
+
+  async getAttributeForFlatJSON(
+    entityType: string,
+    loggedInUser: any,
+    flag?: 'flat_json' | 'dropdown',
+  ) {
+    const orgId = loggedInUser.organization_id;
+
+    // --------------------------------------------
+    // 1. Load Main Entity Attributes
+    // --------------------------------------------
+    const mainAttributes = await this.dataSource
+      .getRepository(AttributeMaster)
+      .createQueryBuilder('attr')
+      .select(['attr.id', 'attr.name', 'attr.attribute_key'])
+      .where('attr.mapped_entity_type = :entityType', { entityType })
+      .andWhere('attr.organization_id = :orgId', { orgId })
+      .getMany();
+
+    // --------------------------------------------
+    // 2. Load Related Entity Types Once
+    // --------------------------------------------
+    const relatedEntityTypes = await this.dataSource
+      .getRepository(EntityRelation)
+      .createQueryBuilder('rel')
+      .select(['rel.target_entity_type'])
+      .where('rel.source_entity_type = :entityType', { entityType })
+      .andWhere('rel.organization_id = :orgId', { orgId })
+      .andWhere('rel.relation_type = :relationType', {
+        relationType: 'ONE_TO_ONE',
+      })
+      .getRawMany();
+
+    const relatedTypesList = relatedEntityTypes.map(
+      (x) => x.rel_target_entity_type,
+    );
+
+    // --------------------------------------------
+    // 3. Fetch All Related Attributes
+    // --------------------------------------------
+    const relatedAttributes = relatedTypesList.length
+      ? await this.dataSource
+          .getRepository(AttributeMaster)
+          .createQueryBuilder('attr')
+          .select([
+            'attr.id',
+            'attr.name',
+            'attr.attribute_key',
+            'attr.mapped_entity_type',
+          ])
+          .where('attr.mapped_entity_type IN (:...types)', {
+            types: relatedTypesList,
+          })
+          .andWhere('attr.organization_id = :orgId', { orgId })
+          .getMany()
+      : [];
+
+    // --------------------------------------------
+    // 4. Fetch Linked Attributes
+    // --------------------------------------------
+    const linkedAttributes = await this.dataSource
+      .getRepository('frm_linked_attribute')
+      .createQueryBuilder('fla')
+      .innerJoin(
+        AttributeMaster,
+        'attr',
+        'fla.applicable_entity_type = attr.mapped_entity_type AND fla.applicable_attribute_key = attr.attribute_key',
+      )
+      .select([
+        'fla.applicable_entity_type',
+        'attr.id',
+        'attr.name',
+        'attr.attribute_key',
+      ])
+      .where('attr.organization_id = :orgId', { orgId })
+      .getRawMany();
+
+    // ------------------------------------------------------------------
+    // ---------------   RETURN FORMAT BASED ON FLAG   ------------------
+    // ------------------------------------------------------------------
+
+    // ============================================================
+    // MODE 1: flat_json -> return objects grouped by entity_type
+    // ============================================================
+
+    if (flag === 'flat_json') {
+      const result: Record<string, null> = {};
+
+      // MAIN ENTITY ATTRIBUTES
+      mainAttributes.forEach((attr) => {
+        if (attr.attribute_key) {
+          result[attr.attribute_key] = null;
+        }
+      });
+
+      // RELATED ENTITY TYPES
+      for (const type of relatedTypesList) {
+        const attrs = relatedAttributes.filter(
+          (a) => a.mapped_entity_type === type,
+        );
+
+        attrs.forEach((attr) => {
+          if (attr.attribute_key) {
+            result[attr.attribute_key] = null;
+          }
+        });
+      }
+
+      // LINKED ATTRIBUTES
+      linkedAttributes.forEach((link) => {
+        if (link.applicable_attribute_key) {
+          result[link.applicable_attribute_key] = null;
+        }
+      });
+
+      return result;
+    }
+
+    // ============================================================
+    // MODE 2: dropdown -> return label/value format
+    // ============================================================
+
+    const dropdown: any[] = [];
+
+    // main entity
+    dropdown.push(
+      ...mainAttributes.map((a) => ({
+        label: a.name,
+        value: a.attribute_key,
+      })),
+    );
+
+    // related entities
+    dropdown.push(
+      ...relatedAttributes.map((a) => ({
+        label: a.name,
+        value: a.attribute_key,
+      })),
+    );
+
+    // linked attributes
+    dropdown.push({
+      linked_attributes: linkedAttributes.map((a) => ({
+        label: a.attr_name,
+        value: a.attr_attribute_key,
+      })),
+    });
+
+    return dropdown;
+  }
+}

package/src/module/filter/service/filter.service.ts

@@ -1,8 +1,6 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
 import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
-import { EntityTableColumnService } from 'src/module/meta/service/entity-table-column.service';
-import { EntityTableService } from 'src/module/meta/service/entity-table.service';
 import { DataSource } from 'typeorm';
 import { FilterCondition, FilterRequestDto } from '../dto/filter-request.dto';
 import { SavedFilterService } from './saved-filter.service';