rez_core 4.0.186 → 4.0.188

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,+DAA+D,CAAC;iBAMrG,SAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,4CAA4C,CAAC;iBAC/E,KAAK,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;iBAC/D,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/entity_json/controller/entity_json.controller.d.ts

@@ -4,8 +4,5 @@ export declare class EntityJSONController {
     constructor(entityJSONService: EntityJSONService);
     getEntityJson(entityType: string, req: Request & {
         user: any;
-    }): Promise<any[]>;
-    updateEntityJson(entityId: string, entityType: string, req: Request & {
-        user: any;
-    }): Promise<any[]>;
+    }, mode?: 'flat_json' | 'dropdown'): Promise<any[] | Record<string, null>>;
 }

package/dist/module/entity_json/controller/entity_json.controller.js

@@ -20,13 +20,9 @@ let EntityJSONController = class EntityJSONController {
     constructor(entityJSONService) {
         this.entityJSONService = entityJSONService;
     }
-    async getEntityJson(entityType, req) {
+    async getEntityJson(entityType, req, mode) {
         const loggedInUser = req.user?.userData;
-        return this.entityJSONService.getAttributeForFlatJSON(entityType, loggedInUser);
-    }
-    async updateEntityJson(entityId, entityType, req) {
-        const loggedInUser = req.user?.userData;
-        return this.entityJSONService.updateEntityJSON(entityType, Number(entityId), loggedInUser);
+        return this.entityJSONService.getAttributeForFlatJSON(entityType, loggedInUser, mode);
     }
 };
 exports.EntityJSONController = EntityJSONController;
@@ -35,20 +31,11 @@ __decorate([
     (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
     __param(0, (0, common_1.Param)('entityType')),
     __param(1, (0, common_1.Req)()),
+    __param(2, (0, common_1.Query)('mode')),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:paramtypes", [String, Object, String]),
     __metadata("design:returntype", Promise)
 ], EntityJSONController.prototype, "getEntityJson", null);
-__decorate([
-    (0, common_1.Post)('/update-json/:entityId'),
-    (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
-    __param(0, (0, common_1.Param)('entityId')),
-    __param(1, (0, common_1.Query)('entityType')),
-    __param(2, (0, common_1.Req)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String, Object]),
-    __metadata("design:returntype", Promise)
-], EntityJSONController.prototype, "updateEntityJson", null);
 exports.EntityJSONController = EntityJSONController = __decorate([
     (0, common_1.Controller)('entity-json'),
     __metadata("design:paramtypes", [entity_json_service_1.EntityJSONService])

package/dist/module/entity_json/controller/entity_json.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity_json.controller.js","sourceRoot":"","sources":["../../../../src/module/entity_json/controller/entity_json.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AACxB,wEAAmE;AACnE,2DAAgE;AAGzD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAI/D,AAAN,KAAK,CAAC,aAAa,CACI,UAAkB,EAChC,GAA4B;QAEnC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QACxC,OAAO,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CACnD,UAAU,EACV,YAAY,CACb,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,gBAAgB,CACD,QAAgB,EACd,UAAkB,EAChC,GAA4B;QAEnC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QAExC,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAC5C,UAAU,EACV,MAAM,CAAC,QAAQ,CAAC,EAChB,YAAY,CACb,CAAC;IACJ,CAAC;CACF,CAAA;AA/BY,oDAAoB;AAKzB;IAFL,IAAA,YAAG,EAAC,cAAc,CAAC;IACnB,IAAA,kBAAS,EAAC,wBAAY,CAAC;IAErB,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;yDAOP;AAIK;IAFL,IAAA,aAAI,EAAC,wBAAwB,CAAC;IAC9B,IAAA,kBAAS,EAAC,wBAAY,CAAC;IAErB,WAAA,IAAA,cAAK,EAAC,UAAU,CAAC,CAAA;IACjB,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;4DASP;+BA9BU,oBAAoB;IADhC,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAEwB,uCAAiB;GADtD,oBAAoB,CA+BhC"}
+{"version":3,"file":"entity_json.controller.js","sourceRoot":"","sources":["../../../../src/module/entity_json/controller/entity_json.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AACxB,wEAAmE;AACnE,2DAAgE;AAGzD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAI/D,AAAN,KAAK,CAAC,aAAa,CACI,UAAkB,EAChC,GAA4B,EACpB,IAA+B;QAE9C,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QACxC,OAAO,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CACnD,UAAU,EACV,YAAY,EACZ,IAAI,CACL,CAAC;IACJ,CAAC;CAiBF,CAAA;AAjCY,oDAAoB;AAKzB;IAFL,IAAA,YAAG,EAAC,cAAc,CAAC;IACnB,IAAA,kBAAS,EAAC,wBAAY,CAAC;IAErB,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;;;;yDAQf;+BAhBU,oBAAoB;IADhC,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAEwB,uCAAiB;GADtD,oBAAoB,CAiChC"}

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

@@ -3,6 +3,5 @@ import { DataSource } from 'typeorm';
 export declare class EntityJSONService extends EntityServiceImpl {
     private readonly dataSource;
     constructor(dataSource: DataSource);
-    getAttributeForFlatJSON(entityType: string, loggedInUser: any): Promise<any[]>;
-    updateEntityJSON(entityType: string, entityId: number, loggedInUser: any): Promise<any[]>;
+    getAttributeForFlatJSON(entityType: string, loggedInUser: any, flag?: 'flat_json' | 'dropdown'): Promise<any[] | Record<string, null>>;
 }

package/dist/module/entity_json/service/entity_json.service.js

@@ -20,76 +20,92 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
         super();
         this.dataSource = dataSource;
     }
-    async getAttributeForFlatJSON(entityType, loggedInUser) {
-        const result = [];
+    async getAttributeForFlatJSON(entityType, loggedInUser, flag) {
         const orgId = loggedInUser.organization_id;
-        const mainEntityAttributes = await this.dataSource
+        const mainAttributes = await this.dataSource
             .getRepository(attribute_master_entity_1.AttributeMaster)
-            .find({
-            where: {
-                mapped_entity_type: entityType,
-                organization_id: orgId,
-            },
-        });
-        result.push({
-            entity_type: entityType,
-            attributes: mainEntityAttributes,
-        });
-        const relatedEntities = await this.dataSource
+            .createQueryBuilder('attr')
+            .select(['attr.id', 'attr.name', 'attr.attribute_key'])
+            .where('attr.mapped_entity_type = :entityType', { entityType })
+            .andWhere('attr.organization_id = :orgId', { orgId })
+            .getMany();
+        const relatedEntityTypes = await this.dataSource
             .getRepository(entity_relation_entity_1.EntityRelation)
-            .find({
-            where: {
-                source_entity_type: entityType,
-                organization_id: orgId,
-                relation_type: 'ONE_TO_ONE',
-            },
-        });
-        const relatedEntityTypes = relatedEntities.map((rel) => rel.target_entity_type);
-        for (const relatedType of relatedEntityTypes) {
-            const attributes = await this.dataSource
+            .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);
+        const relatedAttributes = relatedTypesList.length
+            ? await this.dataSource
                 .getRepository(attribute_master_entity_1.AttributeMaster)
-                .find({
-                where: {
-                    mapped_entity_type: relatedType,
-                    organization_id: orgId,
-                },
-            });
-            result.push({
-                entity_type: relatedType,
-                attributes,
-            });
-        }
+                .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()
+            : [];
         const linkedAttributes = await this.dataSource
-            .createQueryBuilder()
-            .select(['fla.applicable_entity_type', 'fea.*'])
-            .from('frm_linked_attribute', 'fla')
-            .innerJoin('frm_entity_attribute', 'fea', 'fla.applicable_entity_type = fea.mapped_entity_type AND fla.applicable_attribute_key = fea.attribute_key')
-            .where('fea.organization_id = :orgId', { orgId })
+            .getRepository('frm_linked_attribute')
+            .createQueryBuilder('fla')
+            .innerJoin(attribute_master_entity_1.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();
-        result.push({
-            linked_attributes: linkedAttributes,
-        });
-        return result;
-    }
-    async updateEntityJSON(entityType, entityId, loggedInUser) {
-        const newEntityJSON = [];
-        const entityData = await this.getResolvedEntityData(entityType, entityId, loggedInUser);
-        newEntityJSON.push({
-            entity_type: entityType,
-            data: entityData,
-        });
-        const relations = await this.dataSource.query(`SELECT target_entity_id, target_entity_type
-                 FROM frm_entity_relation_data
-                 WHERE source_entity_type = ?
-                   AND source_entity_id = ?`, [entityType, entityId]);
-        for (const rel of relations) {
-            const relatedEntityData = await this.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
-            newEntityJSON.push({
-                entity_type: rel.target_entity_type,
-                data: relatedEntityData,
+        if (flag === 'flat_json') {
+            const result = {};
+            mainAttributes.forEach((attr) => {
+                if (attr.attribute_key) {
+                    result[attr.attribute_key] = null;
+                }
+            });
+            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;
+                    }
+                });
+            }
+            linkedAttributes.forEach((link) => {
+                if (link.applicable_attribute_key) {
+                    result[link.applicable_attribute_key] = null;
+                }
             });
+            return result;
         }
-        return newEntityJSON;
+        const dropdown = [];
+        dropdown.push(...mainAttributes.map((a) => ({
+            label: a.name,
+            value: a.attribute_key,
+        })));
+        dropdown.push(...relatedAttributes.map((a) => ({
+            label: a.name,
+            value: a.attribute_key,
+        })));
+        dropdown.push({
+            linked_attributes: linkedAttributes.map((a) => ({
+                label: a.attr_name,
+                value: a.attr_attribute_key,
+            })),
+        });
+        return dropdown;
     }
 };
 exports.EntityJSONService = EntityJSONService;

package/dist/module/entity_json/service/entity_json.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity_json.service.js","sourceRoot":"","sources":["../../../../src/module/entity_json/service/entity_json.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity_json.service.js","sourceRoot":"","sources":["../../../../src/module/entity_json/service/entity_json.service.ts"],"names":[],"mappings":"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"}

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 = ? AND organization_id = ? 
-     LIMIT 1
+        const [filterMaster] = await this.dataSource.query(`SELECT id, name, code 
+     FROM frm_saved_filter_master 
+     WHERE code = $1 AND organization_id = $2 
+     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 = ?`, [savedFilterCode]);
+        const triggerFilters = await this.dataSource.query(`SELECT * 
+       FROM frm_saved_filter_detail 
+       WHERE mapped_filter_code = $1`, [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;;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"}
+{"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"}

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

@@ -6,6 +6,7 @@ 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;
@@ -14,7 +15,8 @@ export declare class FilterService {
     private readonly entityRelationService;
     private readonly resolverService;
     protected readonly loggingService: LoggingService;
-    constructor(dataSource: DataSource, attributeMasterService: AttributeMasterService, entityMasterService: EntityMasterService, savedFilterService: SavedFilterService, entityRelationService: EntityRelationService, resolverService: ResolverService, loggingService: LoggingService);
+    private readonly configService;
+    constructor(dataSource: DataSource, attributeMasterService: AttributeMasterService, entityMasterService: EntityMasterService, savedFilterService: SavedFilterService, entityRelationService: EntityRelationService, resolverService: ResolverService, loggingService: LoggingService, configService: ConfigService);
     private readonly skipAppCodeFilterEntities;
     private readonly skipOrgFilterEntities;
     private gettab_value_counts;
@@ -67,4 +69,5 @@ 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,8 +22,9 @@ 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) {
+    constructor(dataSource, attributeMasterService, entityMasterService, savedFilterService, entityRelationService, resolverService, loggingService, configService) {
         this.dataSource = dataSource;
         this.attributeMasterService = attributeMasterService;
         this.entityMasterService = entityMasterService;
@@ -31,6 +32,7 @@ let FilterService = class FilterService {
         this.entityRelationService = entityRelationService;
         this.resolverService = resolverService;
         this.loggingService = loggingService;
+        this.configService = configService;
         this.skipAppCodeFilterEntities = ['ORGP'];
         this.skipOrgFilterEntities = ['ORGP'];
     }
@@ -39,31 +41,35 @@ 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(() => '?').join(', ');
+                        const placeholders = val
+                            .map(() => `$${paramIndex++}`)
+                            .join(', ');
                         parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
-                        values.push(...val);
+                        values.push(...val.map((v) => String(v)));
                     }
                     else {
-                        parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
-                        values.push(val);
+                        const placeholder = `$${paramIndex++}`;
+                        parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), placeholder);
+                        values.push(String(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.dataSource.query(rawSQL, values);
+        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 total = rows.reduce((sum, r) => sum + parseInt(r.tab_value_count, 10), 0);
         return [
             { tab_value: 'All', tab_value_count: total },
@@ -170,27 +176,27 @@ let FilterService = class FilterService {
             const templateTable = entityMeta?.data_source || 'frm_wf_comm_template';
             if (level_type === 'ORG') {
                 baseWhere.push({
-                    query: `  ((e.level_type = 'ORG' AND e.level_id = ${loggedInUser.organization_id} AND e.organization_id = ${loggedInUser.organization_id}))`,
+                    query: `  ((e.level_type = 'ORG' AND e.level_id = '${loggedInUser.organization_id}' AND e.organization_id = '${loggedInUser.organization_id}'))`,
                     params: {},
                 });
             }
             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: {},
                 });
@@ -206,7 +212,7 @@ let FilterService = class FilterService {
             !customLevelId) {
             baseWhere.push({
                 query: 'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
-                params: { organization_id, level_type, level_id },
+                params: { organization_id: String(organization_id), level_type, level_id },
             });
         }
         if (entity_type == 'USR' || entity_type == 'UPR') {
@@ -219,9 +225,9 @@ let FilterService = class FilterService {
             baseWhere.push({
                 query: 'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId AND e.appcode = :customAppCode',
                 params: {
-                    organization_id,
+                    organization_id: String(organization_id),
                     customLevelType,
-                    customLevelId,
+                    customLevelId: String(customLevelId),
                     customAppCode,
                 },
             });
@@ -230,9 +236,10 @@ let FilterService = class FilterService {
             Object.entries(queryParams).forEach(([key, value]) => {
                 if (!value)
                     return;
+                const strValue = String(value);
                 if (key === 'attributeName' && queryParams['attributeValue']) {
-                    const attrName = value;
-                    const attrValue = queryParams['attributeValue'];
+                    const attrName = strValue;
+                    const attrValue = String(queryParams['attributeValue']);
                     baseWhere.push({
                         query: `e.${attrName} = :${attrName}`,
                         params: { [attrName]: attrValue },
@@ -241,15 +248,15 @@ let FilterService = class FilterService {
                 else if (key !== 'attributeValue') {
                     baseWhere.push({
                         query: `e.${key} = :${key}`,
-                        params: { [key]: value },
+                        params: { [key]: strValue },
                     });
                 }
             });
         }
         console.log('🟠 [FilterService] Constructed baseWhere clauses:', baseWhere);
-        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 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 layout = layoutPreference?.[0]?.mapped_json?.quick_tab || {};
         const showList = layout?.show_list?.map((val) => {
             if (typeof val === 'string') {
@@ -308,6 +315,10 @@ 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)
@@ -480,7 +491,17 @@ let FilterService = class FilterService {
     }
     buildWhereClauses(filters, attributeMeta) {
         return filters
-            .map((f) => this.buildCondition(f, attributeMeta[f.filter_attribute]))
+            .map((f) => {
+            const clause = this.buildCondition(f, attributeMeta[f.filter_attribute]);
+            if (!clause)
+                return null;
+            if (clause.params) {
+                Object.keys(clause.params).forEach((k) => {
+                    clause.params[k] = String(clause.params[k]);
+                });
+            }
+            return clause;
+        })
             .filter((clause) => clause !== null);
     }
     buildCondition(filter, meta) {
@@ -692,6 +713,14 @@ 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([
@@ -705,6 +734,7 @@ exports.FilterService = FilterService = __decorate([
         saved_filter_service_1.SavedFilterService,
         entity_relation_service_1.EntityRelationService,
         resolver_service_1.ResolverService,
-        loggingUtil_service_1.LoggingService])
+        loggingUtil_service_1.LoggingService,
+        config_1.ConfigService])
 ], FilterService);
 //# sourceMappingURL=filter.service.js.map