rez_core 5.0.28 → 5.0.29

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

@@ -12,17 +12,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityJSONService = void 0;
 const common_1 = require("@nestjs/common");
 const filter_service_1 = require("../../filter/service/filter.service");
+const linked_attribute_entity_1 = require("../../linked_attributes/entity/linked_attribute.entity");
 const attribute_master_entity_1 = require("../../meta/entity/attribute-master.entity");
 const entity_relation_entity_1 = require("../../meta/entity/entity-relation.entity");
 const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
 const loggingUtil_service_1 = require("../../../utils/service/loggingUtil.service");
 const typeorm_1 = require("typeorm");
+const entityJson_repository_1 = require("./entityJson.repository");
 let EntityJSONService = class EntityJSONService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(dataSource, filterService, loggerService) {
+    constructor(dataSource, filterService, loggerService, EntityJSONRepository) {
         super();
         this.dataSource = dataSource;
         this.filterService = filterService;
         this.loggerService = loggerService;
+        this.EntityJSONRepository = EntityJSONRepository;
     }
     async getAttributeForFlatJSON(entityType, loggedInUser, flag) {
         const orgId = loggedInUser.organization_id;
@@ -30,7 +33,7 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
         const mainAttributes = await this.dataSource
             .getRepository(attribute_master_entity_1.AttributeMaster)
             .createQueryBuilder('attr')
-            .select(['attr.id', 'attr.name', 'attr.attribute_key'])
+            .select(['attr.id', 'attr.name', 'attr.flat_json_key', 'attr.attribute_key'])
             .where('attr.mapped_entity_type = :entityType', { entityType })
             .andWhere('attr.organization_id = :orgId', { orgId })
             .getMany();
@@ -49,53 +52,69 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
             ? await this.dataSource
                 .getRepository(attribute_master_entity_1.AttributeMaster)
                 .createQueryBuilder('attr')
-                .select(['attr.id', 'attr.name', 'attr.attribute_key', 'attr.mapped_entity_type'])
+                .select(['attr.id', 'attr.name', 'attr.flat_json_key', 'attr.mapped_entity_type', 'attr.attribute_key'])
                 .where('attr.mapped_entity_type IN (:...types)', { types: relatedTypesList })
                 .andWhere('attr.organization_id = :orgId', { orgId })
                 .getMany()
             : [];
         await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Loaded ${relatedAttributes.length} related attributes`);
         const linkedAttributes = await this.dataSource
-            .getRepository('frm_linked_attribute')
+            .getRepository(linked_attribute_entity_1.LinkedAttributes)
             .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',
+            'fla.applicable_entity_type AS applicable_entity_type',
+            'fla.applicable_attribute_key AS applicable_attribute_key',
+            'fla.attribute_key AS target_attribute_key',
+            'fla.saved_filter_code AS saved_filter_code',
+            'attr.name AS name',
+            'attr.id AS id',
         ])
             .where('attr.organization_id = :orgId', { orgId })
             .getRawMany();
         await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Loaded ${linkedAttributes.length} linked attributes`);
-        if (flag === 'flat_json') {
+        if (flag === 'flat_json' || flag === 'all') {
             const result = {};
-            mainAttributes.forEach(attr => { if (attr.attribute_key)
-                result[attr.attribute_key] = null; });
-            relatedAttributes.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; });
+            mainAttributes.forEach(attr => { if (attr.flat_json_key)
+                result[attr.flat_json_key] = null; });
+            relatedAttributes.forEach(attr => { if (attr.flat_json_key)
+                result[attr.flat_json_key] = null; });
+            linkedAttributes.forEach(link => { if (link.target_attribute_key)
+                result[link.target_attribute_key] = null; });
+            if (flag === 'all') {
+                return { flat_json: result, attributes: { mainAttributes, relatedAttributes, linkedAttributes } };
+            }
             return result;
         }
         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 })),
-        });
+        dropdown.push(...mainAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
+        dropdown.push(...relatedAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
+        if (linkedAttributes.length > 0) {
+            dropdown.push(...linkedAttributes.map(a => ({ label: a.name, value: a.attribute_key })));
+        }
         return dropdown;
     }
     async updateEntityJSON(entityType, entityId, loggedInUser) {
         await this.loggerService.log('info', 'EntityJSONService', 'updateEntityJSON', `Building flat JSON for entity: ${entityType}#${entityId}`);
-        const flatJson = await this.getAttributeForFlatJSON(entityType, loggedInUser, 'flat_json');
-        if (!flatJson) {
-            await this.loggerService.log('error', 'EntityJSONService', 'updateEntityJSON', `Flat JSON template not found for entity: ${entityType}`);
-            throw new Error(`Flat JSON template not found for ${entityType}`);
+        const response = await this.getAttributeForFlatJSON(entityType, loggedInUser, 'all');
+        if (!response || !('flat_json' in response) || !('attributes' in response) || !response.attributes) {
+            await this.loggerService.log('error', 'EntityJSONService', 'updateEntityJSON', `getAttributeForFlatJSON() did not return expected structure`);
+            return null;
         }
+        const { flat_json: flatJson, attributes } = response;
+        if (!flatJson)
+            return null;
+        const safeAttributes = {
+            mainAttributes: attributes.mainAttributes || [],
+            relatedAttributes: attributes.relatedAttributes || [],
+            linkedAttributes: attributes.linkedAttributes || [],
+        };
+        const attrMap = {};
+        const allAttrs = [...safeAttributes.mainAttributes, ...safeAttributes.relatedAttributes];
+        allAttrs.forEach(attr => { if (attr.attribute_key)
+            attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key; });
         const mainData = await this.getResolvedEntityData(entityType, entityId, loggedInUser);
-        this.mergeIntoFlatJson(flatJson, mainData);
-        await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', 'Merged main entity data into flat JSON');
+        this.mergeEntityDataIntoFlatJson(flatJson, mainData, attrMap);
         const relations = await this.dataSource
             .getRepository('frm_entity_relation_data')
             .createQueryBuilder('erd')
@@ -104,38 +123,46 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
             .andWhere('erd.source_entity_id = :entityId', { entityId })
             .andWhere('erd.relation_type = :rt', { rt: 'ONE_TO_ONE' })
             .getRawMany();
-        await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', `Found ${relations.length} ONE-TO-ONE relations`);
         for (const rel of relations) {
-            const related = await this.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
-            this.mergeIntoFlatJson(flatJson, related);
-            await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', `Merged related entity ${rel.target_entity_type}#${rel.target_entity_id}`);
+            const relatedData = await this.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
+            this.mergeEntityDataIntoFlatJson(flatJson, relatedData, attrMap);
         }
-        const linkedAttrs = await this.dataSource
-            .getRepository('frm_linked_attributes_table')
-            .createQueryBuilder('la')
-            .where('la.entity_type = :entityType', { entityType })
-            .getMany();
-        await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', `Found ${linkedAttrs.length} linked attributes`);
-        for (const la of linkedAttrs) {
-            const mappingValue = flatJson[la.mapping_attribute];
-            const result = await this.applyLinkedFilterUsingSavedFilter(la.child_entity_type, la.saved_filter_code, la.filter_attribute, mappingValue, la.target_attribute, loggedInUser);
-            flatJson[la.target_attribute] = result;
-            await this.loggerService.log('debug', 'EntityJSONService', 'updateEntityJSON', `Linked attribute ${la.target_attribute} set from child entity ${la.child_entity_type}`);
+        for (const linkAttr of safeAttributes.linkedAttributes) {
+            const childEntityType = linkAttr.applicable_entity_type;
+            const sourceKey = linkAttr.applicable_attribute_key;
+            const targetKey = linkAttr.target_attribute_key;
+            if (!childEntityType || !sourceKey || !targetKey)
+                continue;
+            const mappingValue = mainData?.[sourceKey] ?? null;
+            const value = await this.applyLinkedFilterUsingSavedFilter(childEntityType, linkAttr.saved_filter_code, sourceKey, mappingValue, targetKey, loggedInUser, entityId);
+            if (value !== null && value !== undefined) {
+                flatJson[targetKey] = value;
+            }
         }
-        await this.dataSource.query(`INSERT INTO frm_entity_json (entity_type, entity_id, json_data, created_by)
-       VALUES (?, ?, ?, ?)
-       ON DUPLICATE KEY UPDATE json_data = VALUES(json_data), updated_by = VALUES(created_by)`, [entityType, entityId, JSON.stringify(flatJson), loggedInUser.id]);
-        await this.loggerService.log('info', 'EntityJSONService', 'updateEntityJSON', `Flat JSON saved for entity: ${entityType}#${entityId}`);
+        await this.loggerService.log('info', 'EntityJSONService', 'updateEntityJSON', `Saving flat JSON for entity: ${entityType}#${entityId}`);
+        let JsonData = {
+            entity_type: entityType,
+            entity_id: entityId,
+            json_data: flatJson,
+            created_by: loggedInUser.id,
+        };
+        await this.EntityJSONRepository.create(JsonData);
         return flatJson;
     }
-    mergeIntoFlatJson(flatJson, entityData) {
-        for (const key of Object.keys(entityData)) {
-            if (flatJson.hasOwnProperty(key)) {
-                flatJson[key] = entityData[key];
+    mergeEntityDataIntoFlatJson(flatJson, entityData, attrMap) {
+        const records = Array.isArray(entityData) ? entityData : [entityData];
+        for (const record of records) {
+            if (!record || typeof record !== 'object')
+                continue;
+            for (const key of Object.keys(record)) {
+                const flatKey = attrMap[key] || key;
+                if (flatJson.hasOwnProperty(flatKey)) {
+                    flatJson[flatKey] = record[key];
+                }
             }
         }
     }
-    async applyLinkedFilterUsingSavedFilter(childEntityType, savedFilterCode, childFilterAttribute, mappingValue, targetAttribute, loggedInUser) {
+    async applyLinkedFilterUsingSavedFilter(childEntityType, savedFilterCode, childFilterAttribute, mappingValue, targetAttribute, loggedInUser, entity_id) {
         if (!savedFilterCode && (mappingValue === null || mappingValue === undefined))
             return null;
         const dto = {
@@ -147,16 +174,15 @@ let EntityJSONService = class EntityJSONService extends entity_service_impl_serv
         };
         if (mappingValue !== null && mappingValue !== undefined && mappingValue !== '') {
             dto.quickFilter = [
-                {
-                    filter_attribute: childFilterAttribute,
-                    filter_operator: 'equal',
-                    filter_value: mappingValue,
-                }
+                { filter_attribute: childFilterAttribute, filter_operator: 'equal', filter_value: mappingValue },
             ];
         }
+        dto.quickFilter = [
+            { filter_attribute: 'parent_id', filter_operator: 'equal', filter_value: [entity_id] },
+        ];
         const result = await this.filterService.applyFilter(dto);
         const rows = result?.data?.entity_list || [];
-        return rows.length ? rows[0][targetAttribute] ?? null : null;
+        return rows.length ? (rows[0][childFilterAttribute] ?? null) : null;
     }
 };
 exports.EntityJSONService = EntityJSONService;
@@ -164,6 +190,7 @@ exports.EntityJSONService = EntityJSONService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [typeorm_1.DataSource,
         filter_service_1.FilterService,
-        loggingUtil_service_1.LoggingService])
+        loggingUtil_service_1.LoggingService,
+        entityJson_repository_1.EntityJSONRepository])
 ], EntityJSONService);
 //# sourceMappingURL=entity_json.service.js.map

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":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,wEAAyE;AACzE,oGAA+F;AAC/F,uFAAiF;AACjF,qFAA+E;AAC/E,gGAAwF;AACxF,oFAAuE;AACvE,qCAAqC;AACrC,mEAA+D;AAGxD,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+CAAiB;IACtD,YACmB,UAAsB,EACtB,aAA4B,EAC5B,aAA6B,EAC7B,oBAAyC;QAE1D,KAAK,EAAE,CAAC;QALS,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAgB;QAC7B,yBAAoB,GAApB,oBAAoB,CAAqB;IAG5D,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,UAAkB,EAClB,YAAiB,EACjB,IAAuC;QAEvC,MAAM,KAAK,GAAG,YAAY,CAAC,eAAe,CAAC;QAE3C,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,kCAAkC,UAAU,UAAU,KAAK,EAAE,CAAC,CAAC;QAEpJ,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU;aACzC,aAAa,CAAC,yCAAe,CAAC;aAC9B,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;aAC5E,KAAK,CAAC,uCAAuC,EAAE,EAAE,UAAU,EAAE,CAAC;aAC9D,QAAQ,CAAC,+BAA+B,EAAE,EAAE,KAAK,EAAE,CAAC;aACpD,OAAO,EAAE,CAAC;QAEb,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,UAAU,cAAc,CAAC,MAAM,kBAAkB,CAAC,CAAC;QAEzI,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7C,aAAa,CAAC,uCAAc,CAAC;aAC7B,kBAAkB,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,CAAC,wBAAwB,CAAC,CAAC;aAClC,KAAK,CAAC,sCAAsC,EAAE,EAAE,UAAU,EAAE,CAAC;aAC7D,QAAQ,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,CAAC;aACnD,QAAQ,CAAC,mCAAmC,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;aAC7E,UAAU,EAAE,CAAC;QAEhB,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC;QAE/E,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,SAAS,gBAAgB,CAAC,MAAM,kCAAkC,CAAC,CAAC;QAE1J,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,MAAM;YAC/C,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU;iBAClB,aAAa,CAAC,yCAAe,CAAC;iBAC9B,kBAAkB,CAAC,MAAM,CAAC;iBAC1B,MAAM,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,oBAAoB,CAAC,CAAC;iBACvG,KAAK,CAAC,wCAAwC,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;iBAC5E,QAAQ,CAAC,+BAA+B,EAAE,EAAE,KAAK,EAAE,CAAC;iBACpD,OAAO,EAAE;YACd,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,UAAU,iBAAiB,CAAC,MAAM,qBAAqB,CAAC,CAAC;QAE/I,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU;aAC3C,aAAa,CAAC,0CAAgB,CAAC;aAC/B,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CACR,yCAAe,EACf,MAAM,EACN,4GAA4G,CAC7G;aACA,MAAM,CAAC;YACN,sDAAsD;YACtD,0DAA0D;YAC1D,2CAA2C;YAC3C,4CAA4C;YAC5C,mBAAmB;YACnB,eAAe;SAChB,CAAC;aACD,KAAK,CAAC,+BAA+B,EAAE,EAAE,KAAK,EAAE,CAAC;aACjD,UAAU,EAAE,CAAC;QAEhB,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,UAAU,gBAAgB,CAAC,MAAM,oBAAoB,CAAC,CAAC;QAE7I,IAAI,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAyB,EAAE,CAAC;YACxC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,aAAa;gBAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/F,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,aAAa;gBAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAClG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,oBAAoB;gBAAE,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAE/G,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBACnB,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,cAAc,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,EAAE,CAAC;YACpG,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAU,EAAE,CAAC;QAC3B,QAAQ,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;QACvF,QAAQ,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1F,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3F,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB,EAAE,QAAgB,EAAE,YAAY;QACvE,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,kCAAkC,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC;QAE1I,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,UAAU,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;QAErF,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;YACnG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,6DAA6D,CAAC,CAAC;YAC9I,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;QACrD,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,MAAM,cAAc,GAAG;YACrB,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,EAAE;YAC/C,iBAAiB,EAAE,UAAU,CAAC,iBAAiB,IAAI,EAAE;YACrD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,IAAI,EAAE;SACpD,CAAC;QAEF,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,CAAC,GAAG,cAAc,CAAC,cAAc,EAAE,GAAG,cAAc,CAAC,iBAAiB,CAAC,CAAC;QACzF,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,aAAa;YAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9H,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QACtF,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAE9D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;aACpC,aAAa,CAAC,0BAA0B,CAAC;aACzC,kBAAkB,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,CAAC,0CAA0C,EAAE,8CAA8C,CAAC,CAAC;aACpG,KAAK,CAAC,sCAAsC,EAAE,EAAE,UAAU,EAAE,CAAC;aAC7D,QAAQ,CAAC,kCAAkC,EAAE,EAAE,QAAQ,EAAE,CAAC;aAC1D,QAAQ,CAAC,yBAAyB,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;aACzD,UAAU,EAAE,CAAC;QAEhB,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;YACjH,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACnE,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,cAAc,CAAC,gBAAgB,EAAE,CAAC;YACvD,MAAM,eAAe,GAAG,QAAQ,CAAC,sBAAsB,CAAC;YACxD,MAAM,SAAS,GAAG,QAAQ,CAAC,wBAAwB,CAAC;YACpD,MAAM,SAAS,GAAG,QAAQ,CAAC,oBAAoB,CAAC;YAEhD,IAAI,CAAC,eAAe,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS;gBAAE,SAAS;YAE3D,MAAM,YAAY,GAAG,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC;YAEnD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iCAAiC,CACxD,eAAe,EACf,QAAQ,CAAC,iBAAiB,EAC1B,SAAS,EACT,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,QAAQ,CACT,CAAC;YAEF,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1C,QAAQ,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,gCAAgC,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC;QACxI,IAAI,QAAQ,GAAG;YACb,WAAW,EAAE,UAAU;YACvB,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,YAAY,CAAC,EAAE;SAC5B,CAAA;QAED,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEjD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,2BAA2B,CAAC,QAA6B,EAAE,UAAuB,EAAE,OAA+B;QACzH,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAEtE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;gBAAE,SAAS;YACpD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;gBACpC,IAAI,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;oBACrC,QAAQ,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iCAAiC,CAC7C,eAAuB,EACvB,eAAuB,EACvB,oBAA4B,EAC5B,YAAiB,EACjB,eAAuB,EACvB,YAAY,EACZ,SAAS;QAET,IAAI,CAAC,eAAe,IAAI,CAAC,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,CAAC;YAAE,OAAO,IAAI,CAAC;QAE3F,MAAM,GAAG,GAAQ;YACf,WAAW,EAAE,eAAe;YAC5B,YAAY;YACZ,eAAe;YACf,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,CAAC;SACR,CAAC;QAEF,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;YAC/E,GAAG,CAAC,WAAW,GAAG;gBAChB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE;aACjG,CAAC;QACJ,CAAC;QAED,GAAG,CAAC,WAAW,GAAG;YAChB,EAAE,gBAAgB,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,SAAS,CAAC,EAAE;SACvF,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,EAAE,IAAI,EAAE,WAAW,IAAI,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtE,CAAC;CACF,CAAA;AA9NY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAGoB,oBAAU;QACP,8BAAa;QACb,oCAAc;QACR,4CAAoB;GALjD,iBAAiB,CA8N7B"}

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 = $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,8 +20,8 @@ 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 
+        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.service.js

@@ -63,11 +63,11 @@ let FilterService = class FilterService {
             });
             whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
         }
-        const rawSQL = `
-    SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
-    FROM ${tableName}
-    ${whereSQL}
-    GROUP BY ${column}
+        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);
@@ -182,21 +182,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: {},
                 });
@@ -254,8 +254,8 @@ 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
+        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) => {
@@ -586,13 +586,86 @@ let FilterService = class FilterService {
         }
     }
     buildDateCondition(attr, op, val, key) {
+        const dateColumn = `DATE(e.${attr})`;
+        const monthColumn = `DATE_FORMAT(e.${attr}, '%Y-%m-01')`;
+        const numVal = Number(val);
         switch (op) {
             case 'equal':
-                return { query: `e.${attr} = :${key}`, params: { [key]: val } };
+            case 'is':
+                return {
+                    query: `${dateColumn} = :${key}`,
+                    params: { [key]: val },
+                };
             case 'before':
-                return { query: `e.${attr} < :${key}`, params: { [key]: val } };
+            case 'is_before':
+                return {
+                    query: `${dateColumn} < :${key}`,
+                    params: { [key]: val },
+                };
             case 'after':
-                return { query: `e.${attr} > :${key}`, params: { [key]: val } };
+            case 'is_after':
+                return {
+                    query: `${dateColumn} > :${key}`,
+                    params: { [key]: val },
+                };
+            case 'is_on_or_before':
+                return {
+                    query: `${dateColumn} <= :${key}`,
+                    params: { [key]: val },
+                };
+            case 'is_on_or_after':
+                return {
+                    query: `${dateColumn} >= :${key}`,
+                    params: { [key]: val },
+                };
+            case 'is_month_before':
+                if (!isNaN(numVal)) {
+                    const target = moment()
+                        .subtract(numVal, 'months')
+                        .startOf('month')
+                        .format('YYYY-MM-DD');
+                    return {
+                        query: `${monthColumn} < DATE_FORMAT(:${key}, '%Y-%m-01')`,
+                        params: { [key]: target },
+                    };
+                }
+                return {
+                    query: `${monthColumn} < DATE_FORMAT(:${key}, '%Y-%m-01')`,
+                    params: { [key]: val },
+                };
+            case 'is_month_after':
+                if (!isNaN(numVal)) {
+                    const target = moment()
+                        .add(numVal, 'months')
+                        .startOf('month')
+                        .format('YYYY-MM-DD');
+                    return {
+                        query: `${monthColumn} > DATE_FORMAT(:${key}, '%Y-%m-01')`,
+                        params: { [key]: target },
+                    };
+                }
+                return {
+                    query: `${monthColumn} > DATE_FORMAT(:${key}, '%Y-%m-01')`,
+                    params: { [key]: val },
+                };
+            case 'is_day_before':
+                if (isNaN(numVal))
+                    throw new common_1.BadRequestException('Value must be a number for is_day_before');
+                const beforeDate = moment()
+                    .subtract(numVal, 'days')
+                    .format('YYYY-MM-DD');
+                return {
+                    query: `${dateColumn} < :${key}`,
+                    params: { [key]: beforeDate },
+                };
+            case 'is_day_after':
+                if (isNaN(numVal))
+                    throw new common_1.BadRequestException('Value must be a number for is_day_after');
+                const afterDate = moment().add(numVal, 'days').format('YYYY-MM-DD');
+                return {
+                    query: `${dateColumn} > :${key}`,
+                    params: { [key]: afterDate },
+                };
             case 'between': {
                 if (typeof val === 'string') {
                     val = val.split(',').map((v) => v.trim());
@@ -601,11 +674,11 @@ let FilterService = class FilterService {
                     val.length !== 2 ||
                     val[0] === '' ||
                     val[1] === '') {
-                    console.log(`Invalid value for in_between: ${val}`);
+                    console.log(`Invalid value for between: ${val}`);
                     return null;
                 }
                 return {
-                    query: `e.${attr} BETWEEN :${key}_start AND :${key}_end`,
+                    query: `${dateColumn} BETWEEN :${key}_start AND :${key}_end`,
                     params: {
                         [`${key}_start`]: val[0],
                         [`${key}_end`]: val[1],
@@ -613,26 +686,23 @@ let FilterService = class FilterService {
                 };
             }
             case 'today': {
-                const today = new Date().toISOString().split('T')[0];
+                const today = moment().format('YYYY-MM-DD');
                 return {
-                    query: `DATE(e.${attr}) = :today`,
-                    params: {
-                        today,
-                    },
+                    query: `${dateColumn} = :today`,
+                    params: { today },
                 };
             }
-            case 'empty': {
+            case 'empty':
+            case 'is_empty':
                 return {
                     query: `e.${attr} IS NULL`,
                     params: {},
                 };
-            }
-            case 'not_empty': {
+            case 'not_empty':
                 return {
                     query: `e.${attr} IS NOT NULL`,
                     params: {},
                 };
-            }
             default:
                 throw new common_1.BadRequestException(`Unsupported operator for date: ${op}`);
         }