rez_core 2.2.255 → 2.2.257

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.255",
+  "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/listmaster/service/list-master.service.ts

@@ -22,6 +22,7 @@ export class ListMasterService {
     private readonly entityManager: EntityManager,
     @Inject(forwardRef(() => EntityServiceImpl))
     private readonly entityServiceImpl: EntityServiceImpl,
+    @Inject(forwardRef(() => EntityMasterService))
     private readonly entityMasterService: EntityMasterService,
     private readonly listMasterRepo: ListMasterRepository,
     private readonly listItemsRepo: ListMasterItemsRepository,

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

@@ -11,6 +11,7 @@ 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')
 @UseGuards(JwtAuthGuard)
@@ -18,6 +19,7 @@ export class MetaController {
   constructor(
     private readonly entityTableService: EntityTableService,
     private readonly populateMetaService: PopulateMetaService,
+    private readonly entityMaster: EntityMasterService,
   ) {}
 
   @Post('get-table-data')
@@ -41,6 +43,24 @@ export class MetaController {
     });
   }
 
+  @Post('get-filter-data')
+  async getFilterData(
+    @Query('entity_type') entityType: string,
+    @Res() response: Response,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const entitydata = await this.entityMaster.getFilterMetaData(
+      entityType,
+      loggedInUser,
+    );
+    return response.status(HttpStatus.OK).json({
+      success: true,
+      data: entitydata,
+      message: 'Data fetch successfully!',
+    });
+  }
+
   @Post('populate')
   async populateMetaData(
     @Query('organization_id') organizationId: number,

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

@@ -14,4 +14,16 @@ export class EntityMasterRepository {
   async getEntityById(id: number): Promise<EntityMaster | null> {
     return await this.entityMasterRepository.findOne({ where: { id } });
   }
+
+  async getEntityByMappedEntityType(
+    mappedEntityType: string,
+    organizationId: number,
+  ): Promise<EntityMaster | null> {
+    return await this.entityMasterRepository.findOne({
+      where: {
+        mapped_entity_type: mappedEntityType,
+        organization_id: organizationId,
+      },
+    });
+  }
 }

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

@@ -1,8 +1,10 @@
-import { Injectable } from '@nestjs/common';
-import { Repository } from 'typeorm';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { DataSource, Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { EntityMaster } from '../entity/entity-master.entity';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
 
 @Injectable()
 export class EntityMasterService {
@@ -11,6 +13,10 @@ export class EntityMasterService {
     private entityMasterRepository: Repository<EntityMaster>,
 
     private entityMasterRepo: EntityMasterRepository,
+    private readonly dataSource: DataSource,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
+    private readonly savedFilterRepoService: SavedFilterRepositoryService,
   ) {}
 
   async getEntityById(id: number): Promise<EntityMaster | null> {
@@ -61,4 +67,87 @@ export class EntityMasterService {
       where: { mapped_entity_type: mappedEntityType },
     });
   }
+
+  async getFilterMetaData(entityType: string, loggedInUser: any) {
+    // Step 1: Get entity_master record by mapped_entity_type
+    const entityMasterData =
+      await this.entityMasterRepo.getEntityByMappedEntityType(
+        entityType,
+        loggedInUser.organization_id,
+      );
+
+    if (!entityMasterData) {
+      throw new Error(
+        `Entity master with mapped_entity_type "${entityType}" not found.`,
+      );
+    }
+
+    // Step 2: Get attribute_master (instead of entity_table_column)
+    const attributes = await this.dataSource.query(
+      `SELECT * 
+     FROM cr_attribute_master 
+     WHERE mapped_entity_type = ? 
+       AND organization_id = ? `,
+      [entityMasterData.mapped_entity_type, loggedInUser.organization_id],
+    );
+
+    // Step 3: Attach column_list from attribute_master
+    entityMasterData['attribute_list'] = attributes;
+
+    // Step 4: Keep existing operation_list logic
+    entityMasterData['operation_list'] = {
+      text: await this.listMasterService.getDropdownOptions(
+        'OPT',
+        {},
+        [],
+        loggedInUser,
+      ),
+      number: await this.listMasterService.getDropdownOptions(
+        'OPN',
+        {},
+        [],
+        loggedInUser,
+      ),
+      date: await this.listMasterService.getDropdownOptions(
+        'OPD',
+        {},
+        [],
+        loggedInUser,
+      ),
+      select: await this.listMasterService.getDropdownOptions(
+        'OPS',
+        {},
+        [],
+        loggedInUser,
+      ),
+      multiselect: await this.listMasterService.getDropdownOptions(
+        'OPM',
+        {},
+        [],
+        loggedInUser,
+      ),
+      year: await this.listMasterService.getDropdownOptions(
+        'OPY',
+        {},
+        [],
+        loggedInUser,
+      ),
+    };
+
+    // Step 5: Keep filters as is
+    entityMasterData['default_filter'] =
+      await this.savedFilterRepoService.getDefaultFilterByEntityType(
+        entityType,
+      );
+
+    if (loggedInUser.id) {
+      entityMasterData['saved_filter'] =
+        await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
+          loggedInUser.id,
+          entityType,
+        );
+    }
+
+    return entityMasterData;
+  }
 }

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

@@ -4,9 +4,7 @@ import { EntityTableColumnRepository } from '../repository/entity-table-column.r
 import { EntityTableDto } from '../dto/entity-table.dto';
 import { DISPLAY_LIST } from '../../../constant/global.constant';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { SavedFilterService } from 'src/module/filter/service/saved-filter.service';
 import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
-import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class EntityTableService {

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');
-  }
-}