rez_core 4.0.153 → 4.0.154

package/.prettierrc

@@ -1,4 +1,4 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all"
+{
+  "singleQuote": true,
+  "trailingComma": "all"
 }

package/README.md

@@ -1,99 +1,99 @@
-<p align="center">
-  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
-</p>
-
-[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
-[circleci-url]: https://circleci.com/gh/nestjs/nest
-
-  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
-    <p align="center">
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
-<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
-<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
-<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
-<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
-<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
-  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg" alt="Donate us"/></a>
-    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
-  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow" alt="Follow us on Twitter"></a>
-</p>
-  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
-  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
-
-## Description
-
-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
-
-## Project setup
-
-```bash
-$ npm install
-```
-
-## Compile and run the project
-
-```bash
-# development
-$ npm run start
-
-# watch mode
-$ npm run start:dev
-
-# production mode
-$ npm run start:prod
-```
-
-## Run tests
-
-```bash
-# unit tests
-$ npm run test
-
-# e2e tests
-$ npm run test:e2e
-
-# test coverage
-$ npm run test:cov
-```
-
-## Deployment
-
-When you're ready to deploy your NestJS application to production, there are some key steps you can take to ensure it runs as efficiently as possible. Check out the [deployment documentation](https://docs.nestjs.com/deployment) for more information.
-
-If you are looking for a cloud-based platform to deploy your NestJS application, check out [Mau](https://mau.nestjs.com), our official platform for deploying NestJS applications on AWS. Mau makes deployment straightforward and fast, requiring just a few simple steps:
-
-```bash
-$ npm install -g mau
-$ mau deploy
-```
-
-With Mau, you can deploy your application in just a few clicks, allowing you to focus on building features rather than managing infrastructure.
-
-## Resources
-
-Check out a few resources that may come in handy when working with NestJS:
-
-- Visit the [NestJS Documentation](https://docs.nestjs.com) to learn more about the framework.
-- For questions and support, please visit our [Discord channel](https://discord.gg/G7Qnnhy).
-- To dive deeper and get more hands-on experience, check out our official video [courses](https://courses.nestjs.com/).
-- Deploy your application to AWS with the help of [NestJS Mau](https://mau.nestjs.com) in just a few clicks.
-- Visualize your application graph and interact with the NestJS application in real-time using [NestJS Devtools](https://devtools.nestjs.com).
-- Need help with your project (part-time to full-time)? Check out our official [enterprise support](https://enterprise.nestjs.com).
-- To stay in the loop and get updates, follow us on [X](https://x.com/nestframework) and [LinkedIn](https://linkedin.com/company/nestjs).
-- Looking for a job, or have a job to offer? Check out our official [Jobs board](https://jobs.nestjs.com).
-
-## Support
-
-Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
-
-## Stay in touch
-
-- Author - [Kamil Myśliwiec](https://twitter.com/kammysliwiec)
-- Website - [https://nestjs.com](https://nestjs.com/)
-- Twitter - [@nestframework](https://twitter.com/nestframework)
-
-## License
-
-Nest is [MIT licensed](https://github.com/nestjs/nest/blob/master/LICENSE).
+<p align="center">
+  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
+</p>
+
+[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
+[circleci-url]: https://circleci.com/gh/nestjs/nest
+
+  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
+    <p align="center">
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
+<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
+<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
+<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
+<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
+<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
+  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg" alt="Donate us"/></a>
+    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
+  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow" alt="Follow us on Twitter"></a>
+</p>
+  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
+  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
+
+## Description
+
+[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
+
+## Project setup
+
+```bash
+$ npm install
+```
+
+## Compile and run the project
+
+```bash
+# development
+$ npm run start
+
+# watch mode
+$ npm run start:dev
+
+# production mode
+$ npm run start:prod
+```
+
+## Run tests
+
+```bash
+# unit tests
+$ npm run test
+
+# e2e tests
+$ npm run test:e2e
+
+# test coverage
+$ npm run test:cov
+```
+
+## Deployment
+
+When you're ready to deploy your NestJS application to production, there are some key steps you can take to ensure it runs as efficiently as possible. Check out the [deployment documentation](https://docs.nestjs.com/deployment) for more information.
+
+If you are looking for a cloud-based platform to deploy your NestJS application, check out [Mau](https://mau.nestjs.com), our official platform for deploying NestJS applications on AWS. Mau makes deployment straightforward and fast, requiring just a few simple steps:
+
+```bash
+$ npm install -g mau
+$ mau deploy
+```
+
+With Mau, you can deploy your application in just a few clicks, allowing you to focus on building features rather than managing infrastructure.
+
+## Resources
+
+Check out a few resources that may come in handy when working with NestJS:
+
+- Visit the [NestJS Documentation](https://docs.nestjs.com) to learn more about the framework.
+- For questions and support, please visit our [Discord channel](https://discord.gg/G7Qnnhy).
+- To dive deeper and get more hands-on experience, check out our official video [courses](https://courses.nestjs.com/).
+- Deploy your application to AWS with the help of [NestJS Mau](https://mau.nestjs.com) in just a few clicks.
+- Visualize your application graph and interact with the NestJS application in real-time using [NestJS Devtools](https://devtools.nestjs.com).
+- Need help with your project (part-time to full-time)? Check out our official [enterprise support](https://enterprise.nestjs.com).
+- To stay in the loop and get updates, follow us on [X](https://x.com/nestframework) and [LinkedIn](https://linkedin.com/company/nestjs).
+- Looking for a job, or have a job to offer? Check out our official [Jobs board](https://jobs.nestjs.com).
+
+## Support
+
+Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
+
+## Stay in touch
+
+- Author - [Kamil Myśliwiec](https://twitter.com/kammysliwiec)
+- Website - [https://nestjs.com](https://nestjs.com/)
+- Twitter - [@nestframework](https://twitter.com/nestframework)
+
+## License
+
+Nest is [MIT licensed](https://github.com/nestjs/nest/blob/master/LICENSE).

package/dist/config/config.module.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseModule = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
-const database_config_1 = require("./database.config");
 const config_1 = require("@nestjs/config");
+const database_config_1 = require("./database.config");
 let DatabaseModule = class DatabaseModule {
 };
 exports.DatabaseModule = DatabaseModule;
@@ -19,7 +19,7 @@ exports.DatabaseModule = DatabaseModule = __decorate([
     (0, common_1.Module)({
         imports: [
             typeorm_1.TypeOrmModule.forRootAsync({
-                useClass: database_config_1.PostgresConfiguration,
+                useClass: database_config_1.MySqlConfiguration,
             }),
             config_1.ConfigModule.forRoot({ isGlobal: true }),
         ],

package/dist/config/config.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,6CAAgD;AAChD,uDAA0D;AAC1D,2CAA8C;AAavC,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAX1B,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,YAAY,CAAC;gBACzB,QAAQ,EAAE,uCAAqB;aAChC,CAAC;YACF,qBAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SACzC;QAED,OAAO,EAAE,CAAC,uBAAa,CAAC;KACzB,CAAC;GACW,cAAc,CAAG"}
+{"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,6CAAgD;AAEhD,2CAA4C;AAC5C,uDAAuD;AAahD,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAX1B,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,YAAY,CAAC;gBACzB,QAAQ,EAAE,oCAAkB;aAC7B,CAAC;YACF,qBAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SACzC;QAED,OAAO,EAAE,CAAC,uBAAa,CAAC;KACzB,CAAC;GACW,cAAc,CAAG"}

package/dist/config/database.config.d.ts

@@ -1,6 +1,6 @@
 import { ConfigService } from '@nestjs/config';
 import { TypeOrmModuleOptions, TypeOrmOptionsFactory } from '@nestjs/typeorm';
-export declare class PostgresConfiguration implements TypeOrmOptionsFactory {
+export declare class MySqlConfiguration implements TypeOrmOptionsFactory {
     private configService;
     constructor(configService: ConfigService);
     createTypeOrmOptions(): TypeOrmModuleOptions;

package/dist/config/database.config.js

@@ -9,35 +9,31 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PostgresConfiguration = void 0;
+exports.MySqlConfiguration = void 0;
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
-let PostgresConfiguration = class PostgresConfiguration {
+let MySqlConfiguration = class MySqlConfiguration {
     constructor(configService) {
         this.configService = configService;
     }
     createTypeOrmOptions() {
         return {
-            type: 'postgres',
-            host: this.configService.get('DB_HOST') || '127.0.0.1',
-            port: parseInt(this.configService.get('DB_PORT') || '5432', 10),
-            username: this.configService.get('DB_USER') || 'postgres',
-            password: this.configService.get('DB_PASS') || 'postgres',
+            type: 'mysql',
+            host: this.configService.get('DB_HOST') || '13.234.25.234',
+            port: parseInt(this.configService.get('DB_PORT') || '3306', 10),
+            username: this.configService.get('DB_USER') || 'root',
+            password: this.configService.get('DB_PASS') || 'Rezolut@123',
             database: this.configService.get('DB_NAME') || 'core',
-            schema: this.configService.get('DB_SCHEMA') || 'package',
             entities: [__dirname + '/../module/**/*.entity.{ts,js}'],
             synchronize: false,
             autoLoadEntities: true,
-            extra: {
-                max: parseInt(this.configService.get('PG_POOL_MAX') || '5', 10),
-                searchPath: this.configService.get('DB_SCHEMA') || 'package',
-            },
+            poolSize: 5,
         };
     }
 };
-exports.PostgresConfiguration = PostgresConfiguration;
-exports.PostgresConfiguration = PostgresConfiguration = __decorate([
+exports.MySqlConfiguration = MySqlConfiguration;
+exports.MySqlConfiguration = MySqlConfiguration = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [config_1.ConfigService])
-], PostgresConfiguration);
+], MySqlConfiguration);
 //# sourceMappingURL=database.config.js.map

package/dist/config/database.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"database.config.js","sourceRoot":"","sources":["../../src/config/database.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAwBxC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEpD,oBAAoB;QAClB,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,WAAW;YACtD,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM,EAAE,EAAE,CAAC;YAC/D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,UAAU;YACzD,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,UAAU;YACzD,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM;YACrD,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,SAAS;YACxD,QAAQ,EAAE,CAAC,SAAS,GAAG,gCAAgC,CAAC;YACxD,WAAW,EAAE,KAAK;YAClB,gBAAgB,EAAE,IAAI;YAEtB,KAAK,EAAE;gBACL,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC;gBAC/D,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,SAAS;aAC7D;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAtBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAEwB,sBAAa;GADrC,qBAAqB,CAsBjC"}
+{"version":3,"file":"database.config.js","sourceRoot":"","sources":["../../src/config/database.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAIxC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEpD,oBAAoB;QAClB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,eAAe;YAC1D,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM,EAAE,EAAE,CAAC;YAC/D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM;YACrD,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,aAAa;YAC5D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM;YACrD,QAAQ,EAAE,CAAC,SAAS,GAAG,gCAAgC,CAAC;YACxD,WAAW,EAAE,KAAK;YAClB,gBAAgB,EAAE,IAAI;YACtB,QAAQ,EAAE,CAAC;SACZ,CAAC;IACJ,CAAC;CACF,CAAA;AAjBY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEwB,sBAAa;GADrC,kBAAkB,CAiB9B"}

package/dist/module/auth/guards/role.guard.js

@@ -34,9 +34,9 @@ let RolesGuard = class RolesGuard {
         }
         const requiredModule = this.reflector.get('moduleCode', context.getHandler());
         const requiredActions = this.reflector.get('actions', context.getHandler());
-        const roleAccess = await this.entityManager.query(`SELECT *
-             FROM sso_module_access
-             WHERE role_id = ${user['role_id']}
+        const roleAccess = await this.entityManager.query(`SELECT *
+             FROM sso_module_access
+             WHERE role_id = ${user['role_id']}
                AND module_code = '${requiredModule}'`);
         if (!roleAccess || roleAccess.length === 0) {
             throw new common_1.ForbiddenException('Access denied: No permissions found for this module');

package/dist/module/auth/services/auth.service.js

@@ -24,9 +24,9 @@ let AuthService = class AuthService {
     }
     async fcmtoken(fcmtoken, loggedInUser, ip, browser, os) {
         const { id: userId, sessionToken } = loggedInUser;
-        await this.dataSource.query(`UPDATE sso_user_session
-       SET fcm_token = $1, ip = $2, browser = $3, os = $4
-       WHERE session_key = $5 AND user_id = $6 `, [fcmtoken, ip, browser, os, sessionToken, userId]);
+        await this.dataSource.query(`UPDATE sso_user_session
+       SET fcm_token = ?, ip = ?, browser = ?, os = ?
+       WHERE session_key = ? AND user_id = ? `, [fcmtoken, ip, browser, os, sessionToken, userId]);
         return { message: 'FCM token updated successfully' };
     }
 };

package/dist/module/auth/services/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/module/auth/services/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AAEzE,qCAAyC;AAEzC,qCAAqC;AAG9B,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACU,UAAsB,EACtB,UAAsB;QADtB,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;IAC7B,CAAC;IAcJ,KAAK,CAAC,KAAK,CAAC,IAAc;QACxB,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QACtD,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,QAAgB,EAChB,YAAiB,EACjB,EAAU,EACV,OAAe,EACf,EAAU;QAEV,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CAAC;QAGlD,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACzB;;gDAE0C,EAC1C,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,CAClD,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC;IACvD,CAAC;CACF,CAAA;AA1CY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGW,gBAAU;QACV,oBAAU;GAHrB,WAAW,CA0CvB"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/module/auth/services/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AAEzE,qCAAyC;AAEzC,qCAAqC;AAG9B,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACU,UAAsB,EACtB,UAAsB;QADtB,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;IAC7B,CAAC;IAcJ,KAAK,CAAC,KAAK,CAAC,IAAc;QACxB,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QACtD,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,QAAgB,EAChB,YAAiB,EACjB,EAAU,EACV,OAAe,EACf,EAAU;QAEV,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CAAC;QAGlD,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACzB;;8CAEwC,EACxC,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,CAClD,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC;IACvD,CAAC;CACF,CAAA;AA1CY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGW,gBAAU;QACV,oBAAU;GAHrB,WAAW,CA0CvB"}

package/dist/module/enterprise/entity/organization.entity.js

@@ -103,7 +103,7 @@ __decorate([
     __metadata("design:type", String)
 ], OrganizationData.prototype, "bankaccAccountNumber", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'bankacc_branch_ifsc', nullable: true }),
+    (0, typeorm_1.Column)({ name: 'bankacc_branch_IFSC', nullable: true }),
     __metadata("design:type", String)
 ], OrganizationData.prototype, "bankacc_account_number", void 0);
 __decorate([

package/dist/module/enterprise/repository/school.repository.js

@@ -72,9 +72,9 @@ let SchoolRepository = class SchoolRepository {
                 'school.status AS school_status',
             ])
                 .from('sso_organization', 'org')
-                .innerJoin('sso_organization', 'brn', "brn.type = 'BRN' AND brn.parent_id::varchar = org.id::varchar")
-                .innerJoin('sso_school', 'school', 'school.brand_id::varchar = brn.id::varchar')
-                .where('org.id = :orgId', { orgId: String(currentORGLevel_id) })
+                .innerJoin('sso_organization', 'brn', "brn.type = 'BRN' AND brn.parent_id = org.id")
+                .innerJoin('sso_school', 'school', 'school.brand_id = brn.id')
+                .where('org.id = :orgId', { orgId: currentORGLevel_id })
                 .distinct(true)
                 .getRawMany();
             if (schools.length > 0) {

package/dist/module/enterprise/repository/school.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,qCAAiD;AAEjD,yFAAkF;AAClF,uEAA+D;AAGxD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,OAAO,MAAM,IAAI,CAAC,UAAU;aACzB,kBAAkB,EAAE;aACpB,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;aACb,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC;aACzB,KAAK,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,CAAC;aAChD,UAAU,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAa;QAClC,OAAO,MAAM,IAAI,CAAC,UAAU;aACzB,kBAAkB,EAAE;aACpB,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;aACb,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC;aACzB,KAAK,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,CAAC;aACzC,UAAU,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,MAAc,EAAE,OAAe,EAAE,MAAM;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,0CAAe,CAAC,CAAC;QAEpE,MAAM,YAAY,GAAG,MAAM,YAAY;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;aAC/C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;aAC7D,UAAU,EAAE,CAAC;QAEhB,IAAI,kBAAkB,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC;QACvD,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,IAAI,CAAC,EAAE,CAAC;YACvC,kBAAkB,GAAG,MAAM,CAAC;QAC9B,CAAC;QAED,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,UAAU;aACjD,kBAAkB,EAAE;aACpB,MAAM,CAAC,GAAG,CAAC;aACX,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC;aACpC,KAAK,CAAC,mDAAmD,EAAE;YAC1D,IAAI,EAAE,iCAAe;YACrB,KAAK,EAAE,MAAM;SACd,CAAC;aACD,SAAS,EAAE,CAAC;QAEf,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;iBAClC,kBAAkB,EAAE;iBACpB,MAAM,CAAC;gBACN,kBAAkB;gBAClB,sBAAsB;gBACtB,4BAA4B;gBAC5B,0BAA0B;gBAE1B,oBAAoB;gBACpB,wBAAwB;gBACxB,4BAA4B;gBAE5B,wBAAwB;gBACxB,4BAA4B;gBAC5B,oCAAoC;gBACpC,gCAAgC;aACjC,CAAC;iBACD,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC;iBAC/B,SAAS,CAAC,kBAAkB,EAAE,KAAK,EAAE,6CAA6C,CAAC;iBAMnF,SAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,0BAA0B,CAAC;iBAC7D,KAAK,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;iBACvD,QAAQ,CAAC,IAAI,CAAC;iBACd,UAAU,EAAE,CAAC;YAEhB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,MAAM,GAAG,EAAE,CAAC;gBAClB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;oBAC1B,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,WAAW,EACX,UAAU,EACV,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,SAAS,EACT,WAAW,EACX,eAAe,EACf,aAAa,GACd,GAAG,GAAG,CAAC;oBAER,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;yBACpC,kBAAkB,EAAE;yBACpB,MAAM,CAAC,GAAG,CAAC;yBACX,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC;yBACpC,KAAK,CAAC,+CAA+C,EAAE;wBACtD,EAAE,EAAE,UAAU;wBACd,KAAK,EAAE,MAAM;qBACd,CAAC;yBACD,SAAS,EAAE,CAAC;oBAEf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;wBACpB,MAAM,CAAC,MAAM,CAAC,GAAG;4BACf,MAAM;4BACN,QAAQ;4BACR,WAAW;4BACX,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;4BAC/C,IAAI,EAAE,cAAc;4BACpB,MAAM,EAAE,EAAE;yBACX,CAAC;oBACJ,CAAC;oBAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU;yBACtC,kBAAkB,EAAE;yBACpB,MAAM,CAAC,GAAG,CAAC;yBACX,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC;yBACpC,KAAK,CAAC,+CAA+C,EAAE;wBACtD,EAAE,EAAE,YAAY;wBAChB,KAAK,EAAE,MAAM;qBACd,CAAC;yBACD,SAAS,EAAE,CAAC;oBAEf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACrC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG;4BAChC,QAAQ;4BACR,UAAU;4BACV,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY;4BACrD,IAAI,EAAE,OAAO;4BACb,OAAO,EAAE,EAAE;yBACZ,CAAC;oBACJ,CAAC;oBAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU;yBACvC,kBAAkB,EAAE;yBACpB,MAAM,CAAC,GAAG,CAAC;yBACX,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC;yBACpC,KAAK,CAAC,+CAA+C,EAAE;wBACtD,EAAE,EAAE,aAAa;wBACjB,KAAK,EAAE,MAAM;qBACd,CAAC;yBACD,SAAS,EAAE,CAAC;oBAEf,MAAM,eAAe,GACnB,YAAY,EAAE,EAAE,KAAK,sBAAsB,EAAE,EAAE;wBAC7C,CAAC,CAAC,GAAG,WAAW,aAAa;wBAC7B,CAAC,CAAC,WAAW,CAAC;oBAElB,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;wBAC3C,SAAS;wBACT,WAAW,EAAE,eAAe;wBAC5B,eAAe;wBACf,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa;wBACxD,IAAI,EAAE,QAAQ;qBACf,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;oBAC9C,GAAG,GAAG;oBACN,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;iBAClC,CAAC,CAAC,CAAC;YACN,CAAC;iBAAM,CAAC;gBACN,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;gBAE9D,UAAU;qBACP,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;qBACb,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC;qBAC/B,KAAK,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;gBAE3D,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,CAAC;gBAE/C,OAAO;oBACL;wBACE,MAAM,EAAE,kBAAkB;wBAC1B,QAAQ,EAAE,SAAS,CAAC,IAAI;wBACxB,WAAW,EAAE,SAAS,CAAC,OAAO;wBAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,cAAc;wBACtC,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU;iBACtC,kBAAkB,EAAE;iBACpB,MAAM,CAAC;gBACN,sBAAsB;gBACtB,0BAA0B;gBAC1B,8BAA8B;gBAC9B,wBAAwB;gBACxB,4BAA4B;gBAC5B,oCAAoC;gBACpC,gCAAgC;aACjC,CAAC;iBACD,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC;iBACpC,SAAS,CAAC,kBAAkB,EAAE,OAAO,EAAE,yBAAyB,CAAC;iBACjE,SAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,4BAA4B,CAAC;iBAC/D,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;iBAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;iBAC/C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;iBAC7D,QAAQ,CAAC,IAAI,CAAC;iBACd,UAAU,EAAE,CAAC;YAEhB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU;iBACtC,kBAAkB,EAAE;iBACpB,MAAM,CAAC;gBACN,sBAAsB;gBACtB,0BAA0B;gBAC1B,8BAA8B;gBAC9B,wBAAwB;gBACxB,4BAA4B;gBAC5B,oCAAoC;gBACpC,gCAAgC;aACjC,CAAC;iBACD,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC;iBACpC,SAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,0BAA0B,CAAC;iBAC7D,SAAS,CAAC,kBAAkB,EAAE,OAAO,EAAE,4BAA4B,CAAC;iBACpE,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;iBAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;iBAC/C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;iBAC7D,QAAQ,CAAC,IAAI,CAAC;iBACd,UAAU,EAAE,CAAC;YAEhB,MAAM,WAAW,GAAG,CAAC,GAAG,WAAW,EAAE,GAAG,WAAW,CAAC,CAAC;YAErD,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAC9B,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,SAAS,EACT,WAAW,EACX,eAAe,EACf,aAAa,GACd,GAAG,GAAG,CAAC;gBAER,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACtB,MAAM,CAAC,QAAQ,CAAC,GAAG;wBACjB,QAAQ;wBACR,UAAU;wBACV,MAAM,EAAE,YAAY;wBACpB,IAAI,EAAE,OAAO;wBACb,OAAO,EAAE,EAAE;qBACZ,CAAC;gBACJ,CAAC;gBAED,MAAM,eAAe,GACnB,aAAa,KAAK,sBAAsB,EAAE,EAAE;oBAC1C,CAAC,CAAC,GAAG,WAAW,aAAa;oBAC7B,CAAC,CAAC,WAAW,CAAC;gBAElB,IACE,SAAS;oBACT,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,EAChE,CAAC;oBACD,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;wBAC5B,SAAS;wBACT,WAAW,EAAE,eAAe;wBAC5B,eAAe;wBACf,MAAM,EAAE,aAAa;wBACrB,IAAI,EAAE,QAAQ;qBACf,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;CACF,CAAA;AA7QY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,gBAAgB,CA6Q5B"}

package/dist/module/filter/repository/saved-filter.repository.js

@@ -117,10 +117,10 @@ let SavedFilterRepositoryService = class SavedFilterRepositoryService {
         }));
     }
     async getSavedFilterByCode(code, loggedInUser) {
-        const [filterMaster] = await this.dataSource.query(`SELECT id, name, code 
-     FROM frm_saved_filter_master 
-     WHERE code = $1 AND organization_id = $2 
-     LIMIT 1
+        const [filterMaster] = await this.dataSource.query(`SELECT id, name, code 
+     FROM frm_saved_filter_master 
+     WHERE code = ? AND organization_id = ? 
+     LIMIT 1
 `, [code, loggedInUser.organization_id]);
         if (!filterMaster) {
             return null;

package/dist/module/filter/service/filter-evaluator.service.js

@@ -20,9 +20,9 @@ let FilterEvaluatorService = class FilterEvaluatorService {
     }
     async evaluateTriggerAttributes(oldEntity, newEntity, savedFilterCode) {
         console.log('IN FILTER EVALUATOR SERVICE');
-        const triggerFilters = await this.dataSource.query(`SELECT * 
-       FROM frm_saved_filter_detail 
-       WHERE mapped_filter_code = $1`, [savedFilterCode]);
+        const triggerFilters = await this.dataSource.query(`SELECT * 
+       FROM frm_saved_filter_detail 
+       WHERE mapped_filter_code = ?`, [savedFilterCode]);
         if (!triggerFilters || triggerFilters.length === 0) {
             return true;
         }

package/dist/module/filter/service/filter-evaluator.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter-evaluator.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/filter-evaluator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAqC;AAErC,qDAAiD;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAAsB,EACtB,aAA4B;QAD5B,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;IAC5C,CAAC;IASJ,KAAK,CAAC,yBAAyB,CAC7B,SAAqC,EACrC,SAA8B,EAC9B,eAAuB;QAGvB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAwB,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACrE;;qCAE+B,EAC/B,CAAC,eAAe,CAAC,CAClB,CAAC;QAGF,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,IAAI,EAAE,CAAC;QAGjC,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;YACrC,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC;YAE1C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAE/B,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,aAAa,IAAI,MAAM,IAAI,aAAa,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAGD,OAAO,KAAK,CAAC;IACf,CAAC;IASD,KAAK,CAAC,gBAAgB,CACpB,UAAkB,EAClB,kBAA0B,EAC1B,QAAgB,EAChB,YAAiB;QAEjB,IAAI,CAAC,kBAAkB;YAAE,OAAO,IAAI,CAAC;QAErC,MAAM,aAAa,GAAG;YACpB,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,kBAAkB;YACnC,WAAW,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;YAC7B,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,CAAC;YACP,YAAY,EAAE,YAAY,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE;SACjD,CAAC;QAET,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAE1E,OAAO,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AA/EY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAGoB,oBAAU;QACP,8BAAa;GAHpC,sBAAsB,CA+ElC"}
+{"version":3,"file":"filter-evaluator.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/filter-evaluator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAqC;AAErC,qDAAiD;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAAsB,EACtB,aAA4B;QAD5B,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;IAC5C,CAAC;IASJ,KAAK,CAAC,yBAAyB,CAC7B,SAAqC,EACrC,SAA8B,EAC9B,eAAuB;QAGvB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAwB,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACrE;;oCAE8B,EAC9B,CAAC,eAAe,CAAC,CAClB,CAAC;QAGF,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,IAAI,EAAE,CAAC;QAGjC,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;YACrC,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC;YAE1C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAE/B,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,aAAa,IAAI,MAAM,IAAI,aAAa,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAGD,OAAO,KAAK,CAAC;IACf,CAAC;IASD,KAAK,CAAC,gBAAgB,CACpB,UAAkB,EAClB,kBAA0B,EAC1B,QAAgB,EAChB,YAAiB;QAEjB,IAAI,CAAC,kBAAkB;YAAE,OAAO,IAAI,CAAC;QAErC,MAAM,aAAa,GAAG;YACpB,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,kBAAkB;YACnC,WAAW,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;YAC7B,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,CAAC;YACP,YAAY,EAAE,YAAY,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE;SACjD,CAAC;QAET,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAE1E,OAAO,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AA/EY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAGoB,oBAAU;QACP,8BAAa;GAHpC,sBAAsB,CA+ElC"}

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

@@ -6,7 +6,6 @@ import { SavedFilterService } from './saved-filter.service';
 import { EntityRelationService } from 'src/module/meta/service/entity-relation.service';
 import { ResolverService } from 'src/module/meta/service/resolver.service';
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
-import { ConfigService } from '@nestjs/config';
 export declare class FilterService {
     private dataSource;
     private readonly attributeMasterService;
@@ -15,8 +14,7 @@ export declare class FilterService {
     private readonly entityRelationService;
     private readonly resolverService;
     protected readonly loggingService: LoggingService;
-    private readonly configService;
-    constructor(dataSource: DataSource, attributeMasterService: AttributeMasterService, entityMasterService: EntityMasterService, savedFilterService: SavedFilterService, entityRelationService: EntityRelationService, resolverService: ResolverService, loggingService: LoggingService, configService: ConfigService);
+    constructor(dataSource: DataSource, attributeMasterService: AttributeMasterService, entityMasterService: EntityMasterService, savedFilterService: SavedFilterService, entityRelationService: EntityRelationService, resolverService: ResolverService, loggingService: LoggingService);
     private readonly skipAppCodeFilterEntities;
     private readonly skipOrgFilterEntities;
     private gettab_value_counts;
@@ -69,5 +67,4 @@ export declare class FilterService {
     private buildSelectCondition;
     private buildMultiSelectCondition;
     private buildYearCondition;
-    queryWithSchema(sql: string, params?: any[]): Promise<any>;
 }

package/dist/module/filter/service/filter.service.js

@@ -22,9 +22,8 @@ const moment = require("moment");
 const entity_relation_service_1 = require("../../meta/service/entity-relation.service");
 const resolver_service_1 = require("../../meta/service/resolver.service");
 const loggingUtil_service_1 = require("../../../utils/service/loggingUtil.service");
-const config_1 = require("@nestjs/config");
 let FilterService = class FilterService {
-    constructor(dataSource, attributeMasterService, entityMasterService, savedFilterService, entityRelationService, resolverService, loggingService, configService) {
+    constructor(dataSource, attributeMasterService, entityMasterService, savedFilterService, entityRelationService, resolverService, loggingService) {
         this.dataSource = dataSource;
         this.attributeMasterService = attributeMasterService;
         this.entityMasterService = entityMasterService;
@@ -32,7 +31,6 @@ let FilterService = class FilterService {
         this.entityRelationService = entityRelationService;
         this.resolverService = resolverService;
         this.loggingService = loggingService;
-        this.configService = configService;
         this.skipAppCodeFilterEntities = ['ORGP'];
         this.skipOrgFilterEntities = ['ORGP'];
     }
@@ -41,35 +39,31 @@ let FilterService = class FilterService {
             return [];
         let whereSQL = '';
         const values = [];
-        let paramIndex = 1;
         if (whereClauses.length > 0) {
             const clauseParts = whereClauses.map((clause) => {
                 let parsedQuery = clause.query.replace(/\be\./g, '');
                 Object.entries(clause.params).forEach(([key, val]) => {
                     if (Array.isArray(val)) {
-                        const placeholders = val
-                            .map(() => `$${paramIndex++}`)
-                            .join(', ');
+                        const placeholders = val.map(() => '?').join(', ');
                         parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
-                        values.push(...val.map((v) => String(v)));
+                        values.push(...val);
                     }
                     else {
-                        const placeholder = `$${paramIndex++}`;
-                        parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), placeholder);
-                        values.push(String(val));
+                        parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
+                        values.push(val);
                     }
                 });
                 return parsedQuery;
             });
             whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
         }
-        const rawSQL = `
-    SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
-    FROM ${tableName}
-    ${whereSQL}
-    GROUP BY ${column}
-  `;
-        const rows = await this.queryWithSchema(rawSQL, values);
+        const rawSQL = `
+      SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
+      FROM ${tableName}
+      ${whereSQL}
+      GROUP BY ${column}
+    `;
+        const rows = await this.dataSource.query(rawSQL, values);
         const total = rows.reduce((sum, r) => sum + parseInt(r.tab_value_count, 10), 0);
         return [
             { tab_value: 'All', tab_value_count: total },
@@ -182,21 +176,21 @@ let FilterService = class FilterService {
             }
             else if (level_type === 'SCH') {
                 baseWhere.push({
-                    query: `
-        (
-          (e.level_type = 'SCH' AND e.level_id = ${loggedInUser.level_id} AND e.organization_id = ${loggedInUser.organization_id})
-          OR 
-          (
-            e.level_type = 'ORG'
-            AND e.level_id = ${loggedInUser.organization_id}
-            AND e.organization_id = ${loggedInUser.organization_id}
-            AND e.code NOT IN (
-              SELECT sub.code 
-              FROM frm_wf_comm_template AS sub 
-              WHERE sub.level_type = 'SCH' AND sub.level_id = ${loggedInUser.level_id}
-            )
-          )
-        )
+                    query: `
+        (
+          (e.level_type = 'SCH' AND e.level_id = ${loggedInUser.level_id} AND e.organization_id = ${loggedInUser.organization_id})
+          OR 
+          (
+            e.level_type = 'ORG'
+            AND e.level_id = ${loggedInUser.organization_id}
+            AND e.organization_id = ${loggedInUser.organization_id}
+            AND e.code NOT IN (
+              SELECT sub.code 
+              FROM frm_wf_comm_template AS sub 
+              WHERE sub.level_type = 'SCH' AND sub.level_id = ${loggedInUser.level_id}
+            )
+          )
+        )
       `,
                     params: {},
                 });
@@ -253,9 +247,9 @@ let FilterService = class FilterService {
             });
         }
         console.log('🟠 [FilterService] Constructed baseWhere clauses:', baseWhere);
-        const layoutPreference = await this.dataSource.query(`SELECT mapped_json 
-       FROM frm_entity_layout_pref
-       WHERE user_id = $1 AND mapped_entity_type = $2 AND mapped_level_id = $3 AND mapped_level_type = $4 AND type = 'layout'`, [user_id, entity_type, level_id, level_type]);
+        const layoutPreference = await this.dataSource.query(`SELECT mapped_json 
+       FROM frm_entity_layout_pref
+       WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ? AND type = 'layout'`, [user_id, entity_type, level_id, level_type]);
         const layout = layoutPreference?.[0]?.mapped_json?.quick_tab || {};
         const showList = layout?.show_list?.map((val) => {
             if (typeof val === 'string') {
@@ -314,10 +308,6 @@ let FilterService = class FilterService {
         const page = dto.page && dto.page > 0 ? dto.page : 1;
         const size = dto.size && dto.size > 0 ? dto.size : 10;
         qb.skip((page - 1) * size).take(size);
-        let query = await qb.getQuery();
-        console.log('------------------------------------------------------\n');
-        console.log(query);
-        console.log('\n------------------------------------------------------');
         const entity_list = await qb.getRawMany();
         console.log(`📦 [FilterService] Fetched ${entity_list.length} records`);
         const dateAttributes = Object.entries(attributeMetaMap)
@@ -702,14 +692,6 @@ let FilterService = class FilterService {
                 throw new common_1.BadRequestException(`Unsupported operator for year: ${op}`);
         }
     }
-    async queryWithSchema(sql, params = []) {
-        await this.dataSource.query('BEGIN');
-        const schema = this.configService.get('DB_SCHEMA');
-        await this.dataSource.query(`SET LOCAL search_path TO ${schema}`);
-        const result = await this.dataSource.query(sql, params);
-        await this.dataSource.query('COMMIT');
-        return result;
-    }
 };
 exports.FilterService = FilterService;
 exports.FilterService = FilterService = __decorate([
@@ -723,7 +705,6 @@ exports.FilterService = FilterService = __decorate([
         saved_filter_service_1.SavedFilterService,
         entity_relation_service_1.EntityRelationService,
         resolver_service_1.ResolverService,
-        loggingUtil_service_1.LoggingService,
-        config_1.ConfigService])
+        loggingUtil_service_1.LoggingService])
 ], FilterService);
 //# sourceMappingURL=filter.service.js.map