rez_core 2.2.256 → 2.2.257

package/package.json

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

package/src/module/communication/communication.module.ts

@@ -45,19 +45,18 @@ import { GoogleService } from './service/calendar-event.service';
 import { WrapperService } from './service/wrapper.service';
 import { WrapperController } from './controller/wrapper.controller';
 import { IcsMeetingModule } from '../ics/ics.module';
-import { WebhookController } from './controller/webhook.controller';
+import { IntegrationConfig } from './entity/integration-source.entity';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([CommunicationConfig, CommunicationHub]),
+    TypeOrmModule.forFeature([
+      CommunicationConfig,
+      CommunicationHub,
+      IntegrationConfig,
+    ]),
     IcsMeetingModule,
   ],
-  controllers: [
-    CommunicationController,
-    GoogleController,
-    WrapperController,
-    WebhookController,
-  ],
+  controllers: [CommunicationController, GoogleController, WrapperController],
   providers: [
     // Main Services
     CommunicationService,

package/src/module/communication/entity/integration-source.entity.ts

@@ -0,0 +1,14 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'cr_integration_master' })
+export class IntegrationConfig extends BaseEntity {
+  @Column({ name: 'logo', type: 'varchar', length: 100 })
+  logo: string;
+
+  @Column({ name: 'base_url', type: 'varchar', length: 100 })
+  base_url: string;
+
+  @Column({ name: 'integration_type', type: 'varchar', length: 20 })
+  integration_type: string;
+}

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

@@ -69,26 +69,19 @@ export class EntityMasterService {
   }
 
   async getFilterMetaData(entityType: string, loggedInUser: any) {
-    console.log(entityType, loggedInUser);
-
     // Step 1: Get entity_master record by mapped_entity_type
-    const entityMaster = await this.dataSource.query(
-      `SELECT * 
-     FROM cr_entity_master 
-     WHERE mapped_entity_type = ? 
-       AND organization_id = ? 
-     LIMIT 1`,
-      [entityType, loggedInUser.organization_id],
-    );
+    const entityMasterData =
+      await this.entityMasterRepo.getEntityByMappedEntityType(
+        entityType,
+        loggedInUser.organization_id,
+      );
 
-    if (!entityMaster || entityMaster.length === 0) {
+    if (!entityMasterData) {
       throw new Error(
         `Entity master with mapped_entity_type "${entityType}" not found.`,
       );
     }
 
-    const entityMasterData = entityMaster[0] as any; // cast as DTO if you have one
-
     // Step 2: Get attribute_master (instead of entity_table_column)
     const attributes = await this.dataSource.query(
       `SELECT * 
@@ -99,10 +92,10 @@ export class EntityMasterService {
     );
 
     // Step 3: Attach column_list from attribute_master
-    entityMasterData.column_list = attributes;
+    entityMasterData['attribute_list'] = attributes;
 
     // Step 4: Keep existing operation_list logic
-    entityMasterData.operation_list = {
+    entityMasterData['operation_list'] = {
       text: await this.listMasterService.getDropdownOptions(
         'OPT',
         {},
@@ -142,13 +135,13 @@ export class EntityMasterService {
     };
 
     // Step 5: Keep filters as is
-    entityMasterData.default_filter =
+    entityMasterData['default_filter'] =
       await this.savedFilterRepoService.getDefaultFilterByEntityType(
         entityType,
       );
 
     if (loggedInUser.id) {
-      entityMasterData.saved_filter =
+      entityMasterData['saved_filter'] =
         await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
           loggedInUser.id,
           entityType,

package/src/module/workflow/repository/action.repository.ts

@@ -204,6 +204,7 @@ export class ActionRepository {
         'ac.modalName AS modalName',
         'ac.logo AS logo',
         'ac.name AS action_category_name',
+        'a.dependent_action_id AS dependent_action_id',
       ])
       .from('cr_wf_action', 'a')
       .leftJoin('cr_wf_action_category', 'ac', 'ac.id = a.action_category')
@@ -249,6 +250,7 @@ export class ActionRepository {
 
       return {
         value: row.action_id,
+        dependent_action_id: row.dependent_action_id,
         label: row.action_name,
         modalName: row.modalName,
         logo: row.logo,

package/dist/module/communication/controller/webhook.controller.d.ts

@@ -1,4 +0,0 @@
-import { Response } from 'express';
-export declare class WebhookController {
-    handleTubelightWebhook(req: any, res: Response): void;
-}

package/dist/module/communication/controller/webhook.controller.js

@@ -1,38 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebhookController = void 0;
-const common_1 = require("@nestjs/common");
-let WebhookController = class WebhookController {
-    handleTubelightWebhook(req, res) {
-        const apiKey = req.headers['x-api-key'];
-        console.log('API Key:', apiKey);
-        console.log('handleTubelightWebhook: START');
-        console.log(req);
-        res.status(200).send('Webhook received');
-    }
-};
-exports.WebhookController = WebhookController;
-__decorate([
-    (0, common_1.Post)('tubelight'),
-    __param(0, (0, common_1.Req)()),
-    __param(1, (0, common_1.Res)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", void 0)
-], WebhookController.prototype, "handleTubelightWebhook", null);
-exports.WebhookController = WebhookController = __decorate([
-    (0, common_1.Controller)('webhook')
-], WebhookController);
-//# sourceMappingURL=webhook.controller.js.map

package/dist/module/communication/controller/webhook.controller.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"webhook.controller.js","sourceRoot":"","sources":["../../../../src/module/communication/controller/webhook.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4D;AAIrD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAE5B,sBAAsB,CAAQ,GAAQ,EAAS,GAAa;QAC1D,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC3C,CAAC;CACF,CAAA;AATY,8CAAiB;AAE5B;IADC,IAAA,aAAI,EAAC,WAAW,CAAC;IACM,WAAA,IAAA,YAAG,GAAE,CAAA;IAAY,WAAA,IAAA,YAAG,GAAE,CAAA;;;;+DAM7C;4BARU,iBAAiB;IAD7B,IAAA,mBAAU,EAAC,SAAS,CAAC;GACT,iBAAiB,CAS7B"}

package/src/module/communication/controller/webhook.controller.ts

@@ -1,14 +0,0 @@
-import { Controller, Post, Req, Res } from '@nestjs/common';
-import { Response } from 'express';
-
-@Controller('webhook')
-export class WebhookController {
-  @Post('tubelight')
-  handleTubelightWebhook(@Req() req: any, @Res() res: Response) {
-    const apiKey = req.headers['x-api-key'];
-    console.log('API Key:', apiKey);
-    console.log('handleTubelightWebhook: START');
-    console.log(req);
-    res.status(200).send('Webhook received');
-  }
-}