rez_core 3.1.199 → 3.1.200

package/dist/module/mapper/service/field-mapper.service.js

@@ -100,10 +100,10 @@ let FieldMapperService = class FieldMapperService extends entity_service_impl_se
                             await super.getResolvedEntityDataByDataSource(entityType, parent_id, userData);
                     }
                     else {
-                        const relations = await this.datasource.query(`SELECT target_entity_id
-             FROM cr_entity_relation_data
-             WHERE source_entity_type = ?
-               AND source_entity_id = ?
+                        const relations = await this.datasource.query(`SELECT target_entity_id
+             FROM cr_entity_relation_data
+             WHERE source_entity_type = ?
+               AND source_entity_id = ?
                AND target_entity_type = ?`, [parent_type, parent_id, field.mapped_entity_type]);
                         const targetEntityIds = relations.map((r) => r.target_entity_id);
                         this.loggingService.log('package', 'fieldMapperService', 'targetEntityIds', targetEntityIds);

package/dist/module/mapper/service/mapper.service.js

@@ -27,8 +27,8 @@ let MapperService = class MapperService extends entity_service_impl_service_1.En
     async getByMappedEntityType(mappedEntityType, filter, status) {
         if (!mappedEntityType)
             return [];
-        const mappers = await this.dataSource.query(`SELECT id, name, code, status
-       FROM cr_mapper_master
+        const mappers = await this.dataSource.query(`SELECT id, name, code, status
+       FROM cr_mapper_master
        WHERE mapped_entity_type = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?)`, [mappedEntityType, filter || -1, `%${filter}%`, `%${filter}%`]);
         const distinctStatuses = [
             ...new Set(mappers.map((m) => m.status).filter((s) => s !== null)),

package/dist/module/meta/controller/media.controller.d.ts

@@ -14,4 +14,7 @@ export declare class MediaController {
     getDownloadUrl(id: number, res: Response, req: Request & {
         user: any;
     }, expiresIn?: number): Promise<void>;
+    generateUploadPath(req: Request & {
+        user: any;
+    }, mapped_entity_type: string, mapped_entity_id?: number, parent_id?: number, parent_type?: string): Promise<string | null>;
 }

package/dist/module/meta/controller/media.controller.js

@@ -51,6 +51,10 @@ let MediaController = class MediaController {
             });
         }
     }
+    async generateUploadPath(req, mapped_entity_type, mapped_entity_id, parent_id, parent_type) {
+        const loggedInUser = req.user.userData;
+        return this.mediaDataService.buildUploadPathGeneric(mapped_entity_type, loggedInUser, mapped_entity_id, parent_id, parent_type);
+    }
 };
 exports.MediaController = MediaController;
 __decorate([
@@ -72,6 +76,17 @@ __decorate([
     __metadata("design:paramtypes", [Number, Object, Object, Number]),
     __metadata("design:returntype", Promise)
 ], MediaController.prototype, "getDownloadUrl", null);
+__decorate([
+    (0, common_1.Post)('generateUploadPath'),
+    __param(0, (0, common_1.Req)()),
+    __param(1, (0, common_1.Query)('mapped_entity_type')),
+    __param(2, (0, common_1.Query)('mapped_entity_id')),
+    __param(3, (0, common_1.Query)('parent_id')),
+    __param(4, (0, common_1.Query)('parent_type')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, String, Number, Number, String]),
+    __metadata("design:returntype", Promise)
+], MediaController.prototype, "generateUploadPath", null);
 exports.MediaController = MediaController = __decorate([
     (0, common_1.Controller)('media'),
     (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),

package/dist/module/meta/controller/media.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"media.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/media.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AAExB,2DAA2D;AAC3D,sEAAiE;AAI1D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAI7D,AAAN,KAAK,CAAC,cAAc,CAElB,IAKC,EACM,GAA4B,EAC5B,GAAa;QAEpB,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAEvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CACnE,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,aAAa,EAClB,YAAY,EACZ,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,gBAAgB,CACtB,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC7B,OAAO,EAAE,+BAA+B;gBACxC,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM;aACb,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACL,EAAU,EAChB,GAAa,EACb,GAA4B,EACf,SAAkB;QAEtC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CACjE,EAAE,EACF,YAAY,EACZ,SAAS,CACV,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC7B,OAAO,EAAE,mCAAmC;gBAC5C,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC;gBAChD,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,6BAA6B;gBACvD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAA;AA/DY,0CAAe;AAKpB;IADL,IAAA,aAAI,EAAC,iBAAiB,CAAC;IAErB,WAAA,IAAA,aAAI,GAAE,CAAA;IAON,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;qDAoBP;AAIK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC;IAEjB,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IACX,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;;;;qDAoBpB;0BA9DU,eAAe;IAF3B,IAAA,mBAAU,EAAC,OAAO,CAAC;IACnB,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAEyB,qCAAgB;GADpD,eAAe,CA+D3B"}
+{"version":3,"file":"media.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/media.controller.ts"],"names":[],"mappings":"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"}

package/dist/module/meta/entity/entity-master.entity.d.ts

@@ -15,4 +15,6 @@ export declare class EntityMaster extends BaseEntity {
     applicable_level: string;
     data_source: string;
     is_workflow: boolean;
+    doc_upload_path: string;
+    overwrite_path: number;
 }

package/dist/module/meta/entity/entity-master.entity.js

@@ -101,6 +101,14 @@ __decorate([
     (0, typeorm_1.Column)({ name: 'is_workflow', nullable: true }),
     __metadata("design:type", Boolean)
 ], EntityMaster.prototype, "is_workflow", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'doc_upload_path', nullable: true, length: 50 }),
+    __metadata("design:type", String)
+], EntityMaster.prototype, "doc_upload_path", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'overwrite_path', type: 'tinyint', nullable: true }),
+    __metadata("design:type", Number)
+], EntityMaster.prototype, "overwrite_path", void 0);
 exports.EntityMaster = EntityMaster = __decorate([
     (0, typeorm_1.Entity)({ name: 'cr_entity_master' }),
     __metadata("design:paramtypes", [])

package/dist/module/meta/entity/entity-master.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAkD;AAClD,uEAA4E;AAC5E,qCAAyC;AAGlC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,+BAAU;IAC1C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,yCAAuB,CAAC;IAC7C,CAAC;CAoEF,CAAA;AAxEY,oCAAY;AAYvB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,KAAK;KAChB,CAAC;;wDACyB;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACzD;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACzD;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC1D;AAQf;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;KACf,CAAC;;uDACwB;AAQ1B;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;KACf,CAAC;;oDACqB;AAQvB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;KACf,CAAC;;mDACoB;AAQtB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;KACf,CAAC;;iDACkB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;kDACxC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;yDACxC;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;gDACxC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;sDACxC;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC3B;uBAvEV,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;;GACxB,YAAY,CAwExB"}
+{"version":3,"file":"entity-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-master.entity.ts"],"names":[],"mappings":"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"}

package/dist/module/meta/service/entity-dynamic.service.js

@@ -43,8 +43,8 @@ let EntityDynamicService = class EntityDynamicService {
                 entityData.entity_type = entityType;
         }
         if (!entityData.code && loggedInUser) {
-            const result = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
-     FROM ${tableName}
+            const result = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
+     FROM ${tableName}
      WHERE entity_type = ?`, [entityData.entity_type]);
             let maxSeqNo = result?.[0]?.max_seq_no ? Number(result[0].max_seq_no) : 0;
             maxSeqNo += 1;
@@ -149,7 +149,7 @@ let EntityDynamicService = class EntityDynamicService {
     }
     async getEntityWithRelation(entityType, id, loggedInUser) {
         const mainEntity = await this.getEntity(entityType, id, loggedInUser);
-        const relatedEntities = await this.dataSource.query(`SELECT * FROM cr_entity_relation_data WHERE  source_entity_id = ? AND target_entity_type IN (
+        const relatedEntities = await this.dataSource.query(`SELECT * FROM cr_entity_relation_data WHERE  source_entity_id = ? AND target_entity_type IN (
       SELECT target_entity_type FROM cr_entity_relation WHERE source_entity_type = ?)`, [id, entityType]);
         const response = {
             entity_type: entityType,
@@ -207,8 +207,8 @@ let EntityDynamicService = class EntityDynamicService {
                         targetEntityId = createdEntity.insertId || createdEntity.id;
                         entityData = await this.getEntity(targetEntityType, targetEntityId, loggedInUser);
                     }
-                    await this.dataSource.query(`INSERT INTO cr_entity_relation_data 
-          (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) 
+                    await this.dataSource.query(`INSERT INTO cr_entity_relation_data 
+          (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) 
           VALUES (?, ?, ?, ?, ?,?)`, [
                         organizationId,
                         id,
@@ -253,8 +253,8 @@ let EntityDynamicService = class EntityDynamicService {
                 entityData.enterprise_id = loggedInUser.enterprise_id;
         }
         if (!entityData.code && loggedInUser) {
-            const result = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
-     FROM ${tableName}
+            const result = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
+     FROM ${tableName}
      WHERE entity_type = ?`, [entityData.entity_type]);
             let maxSeqNo = result?.[0]?.max_seq_no ? Number(result[0].max_seq_no) : 0;
             maxSeqNo += 1;
@@ -365,13 +365,13 @@ let EntityDynamicService = class EntityDynamicService {
         return result[0].db_table_name;
     }
     async getAttributeCodes(entityType, organizationId) {
-        const result = await this.dataSource.query(`SELECT attribute_key,  
-    MAX(db_datatype) AS db_datatype,
-    MAX(element_type) AS element_type,
-    MAX(is_hidden) AS is_hidden
-     FROM cr_entity_attribute
-     WHERE mapped_entity_type = ? AND organization_id = ? 
-     and (is_hidden IS NULL OR is_hidden = 0)  -- Exclude hidden attributes
+        const result = await this.dataSource.query(`SELECT attribute_key,  
+    MAX(db_datatype) AS db_datatype,
+    MAX(element_type) AS element_type,
+    MAX(is_hidden) AS is_hidden
+     FROM cr_entity_attribute
+     WHERE mapped_entity_type = ? AND organization_id = ? 
+     and (is_hidden IS NULL OR is_hidden = 0)  -- Exclude hidden attributes
      GROUP BY attribute_key`, [entityType, organizationId]);
         if (!result.length) {
             console.log(`No attributes found for entity '${entityType}' and org '${organizationId}'`);
@@ -403,15 +403,15 @@ let EntityDynamicService = class EntityDynamicService {
     }
     async getCode(entityType, loggedInUser) {
         const organizationId = loggedInUser.organization_id;
-        const result = await this.dataSource.query(`SELECT db_table_name 
-     FROM cr_entity_master 
+        const result = await this.dataSource.query(`SELECT db_table_name 
+     FROM cr_entity_master 
      WHERE mapped_entity_type = ? AND organization_id = ?`, [entityType, organizationId]);
         if (!result.length) {
             throw new Error(`Entity type '${entityType}' not found in cr_entity_master for org '${organizationId}'`);
         }
         const tableName = result[0].db_table_name;
-        const seqResult = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
-     FROM \`${tableName}\`
+        const seqResult = await this.dataSource.query(`SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
+     FROM \`${tableName}\`
      WHERE entity_type = ?`, [entityType]);
         let maxSeqNo = seqResult?.[0]?.max_seq_no
             ? Number(seqResult[0].max_seq_no)

package/dist/module/meta/service/entity-list.service.js

@@ -75,11 +75,11 @@ let EntityListService = class EntityListService {
     }
     getQuery(source, groupByColumn) {
         if (groupByColumn) {
-            return `SELECT ${groupByColumn} as tab_value, COUNT(1) AS tab_value_count
+            return `SELECT ${groupByColumn} as tab_value, COUNT(1) AS tab_value_count
               FROM ${source}`;
         }
         else {
-            return `SELECT *
+            return `SELECT *
               FROM ${source}`;
         }
     }
@@ -123,7 +123,7 @@ let EntityListService = class EntityListService {
         return { query, argumentList: argsObjectList };
     }
     async getMaxSequenceNumber(tableName, parentType, parentId) {
-        const query = `SELECT COUNT(1) seq_no
+        const query = `SELECT COUNT(1) seq_no
                  FROM ${tableName} WHERE 1=1 `;
         const argsObjectList = [];
         const result = await this.entityManager.query(query, argsObjectList);

package/dist/module/meta/service/entity-master.service.js

@@ -70,9 +70,9 @@ let EntityMasterService = class EntityMasterService {
         if (!entityMasterData) {
             throw new Error(`Entity master with mapped_entity_type "${entityType}" not found.`);
         }
-        const attributes = await this.dataSource.query(`SELECT * 
-     FROM cr_entity_attribute 
-     WHERE mapped_entity_type = ? 
+        const attributes = await this.dataSource.query(`SELECT * 
+     FROM cr_entity_attribute 
+     WHERE mapped_entity_type = ? 
        AND organization_id = ? `, [entityMasterData.mapped_entity_type, loggedInUser.organization_id]);
         entityMasterData['attribute_list'] = attributes;
         entityMasterData['operation_list'] = {

package/dist/module/meta/service/entity-relation.service.js

@@ -19,12 +19,12 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
         this.dataSource = dataSource;
     }
     async getEntityRelations(entityType, loggedInUser, includeSelf = false) {
-        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
-       FROM cr_entity_relation 
+        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
+       FROM cr_entity_relation 
        WHERE source_entity_type = ? AND organization_id = ?`, [entityType, loggedInUser.organization_id]);
         if (includeSelf) {
-            const [entity] = await this.dataSource.query(`SELECT name as label 
-         FROM cr_entity_master 
+            const [entity] = await this.dataSource.query(`SELECT name as label 
+         FROM cr_entity_master 
          WHERE mapped_entity_type = ? AND organization_id = ?`, [entityType, loggedInUser.organization_id]);
             if (entity) {
                 relations.unshift({
@@ -39,13 +39,13 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
     async getRelatedEntityIds(sourceEntity, targetEntity, targetIds, orgId) {
         if (!targetIds.length)
             return [];
-        const result = await this.dataSource.query(`
-      SELECT DISTINCT source_entity_id
-      FROM cr_entity_relation_data
-      WHERE source_entity_type = ?
-        AND target_entity_type = ?
-        AND target_entity_id IN (?)
-        AND organization_id = ?
+        const result = await this.dataSource.query(`
+      SELECT DISTINCT source_entity_id
+      FROM cr_entity_relation_data
+      WHERE source_entity_type = ?
+        AND target_entity_type = ?
+        AND target_entity_id IN (?)
+        AND organization_id = ?
       `, [sourceEntity, targetEntity, targetIds, orgId]);
         return result.map((r) => r.source_entity_id);
     }

package/dist/module/meta/service/entity-service-impl.service.js

@@ -50,9 +50,9 @@ let EntityServiceImpl = class EntityServiceImpl {
             maxSeqNo = Number(maxSeqNo) + 1;
             entityData.code = entityData.entity_type + maxSeqNo;
         }
-        const statusList = await repo.query(`SELECT id
-       FROM cr_list_master_items
-       WHERE code = ?
+        const statusList = await repo.query(`SELECT id
+       FROM cr_list_master_items
+       WHERE code = ?
          AND organization_id = ?`, [global_constant_1.STATUS_ACTIVE, loggedInUser?.organization_id || -1]);
         console.log('Status List:', statusList);
         console.log(`status_code,${global_constant_1.STATUS_ACTIVE},statusList, ${loggedInUser?.organization_id}`);

package/dist/module/meta/service/media-data.service.d.ts

@@ -3,10 +3,12 @@ import { MediaDataRepository } from '../repository/media-data.repository';
 import { ConfigService } from '@nestjs/config';
 import { S3 } from 'aws-sdk';
 import { MediaData } from '../entity/media-data.entity';
+import { DataSource } from 'typeorm';
 export declare class MediaDataService extends EntityServiceImpl {
     private readonly configService;
     private readonly mediaRepository;
-    constructor(configService: ConfigService, mediaRepository: MediaDataRepository);
+    private dataSource;
+    constructor(configService: ConfigService, mediaRepository: MediaDataRepository, dataSource: DataSource);
     s3AccessKeyID: any;
     s3AccessKeySecret: any;
     s3Region: any;
@@ -27,4 +29,6 @@ export declare class MediaDataService extends EntityServiceImpl {
         id: number;
         size: number | undefined;
     }>;
+    buildUploadPathGeneric(mappedEntityType: string, loggedInUser: any, mappedEntityId?: number, parentId?: number, parentType?: string): Promise<string | null>;
+    private resolveUploadPath;
 }

package/dist/module/meta/service/media-data.service.js

@@ -18,11 +18,13 @@ const aws_sdk_1 = require("aws-sdk");
 const media_data_entity_1 = require("../entity/media-data.entity");
 const global_constant_1 = require("../../../constant/global.constant");
 const uuid_1 = require("uuid");
+const typeorm_1 = require("typeorm");
 let MediaDataService = class MediaDataService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(configService, mediaRepository) {
+    constructor(configService, mediaRepository, dataSource) {
         super();
         this.configService = configService;
         this.mediaRepository = mediaRepository;
+        this.dataSource = dataSource;
         this.s3AccessKeyID = this.configService.get('AWS.S3.AWS_ACCESS_KEY_ID');
         this.s3AccessKeySecret = this.configService.get('AWS.S3.AWS_SECRET_KEY');
         this.s3Region = this.configService.get('AWS.S3.AWS_REGION');
@@ -106,11 +108,66 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
             throw new Error('Failed to generate signed URL');
         }
     }
+    async buildUploadPathGeneric(mappedEntityType, loggedInUser, mappedEntityId, parentId, parentType) {
+        const entityMaster = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
+        if (!entityMaster) {
+            throw new Error(`Entity master not found for ${mappedEntityType}`);
+        }
+        let pathTemplate = entityMaster.doc_upload_path ?? '';
+        const entityOverwrite = entityMaster.overwrite_path ?? 0;
+        if (!pathTemplate) {
+            throw new Error(`doc_upload_path not defined for ${mappedEntityType}`);
+        }
+        const replacements = {};
+        let organizationData = await this.dataSource.query('SELECT * FROM sso_organization WHERE id = ?', [loggedInUser.organization_id]);
+        replacements['org_code'] = organizationData[0].code;
+        const levelEntityId = entityOverwrite ? mappedEntityId : loggedInUser.level_id;
+        const levelEntityData = await super.getEntityData(loggedInUser.level_type, levelEntityId, loggedInUser);
+        if (levelEntityData?.code) {
+            replacements['level_code'] = levelEntityData.code;
+        }
+        const matches = pathTemplate.match(/\$\{(\w+)\}/g) || [];
+        for (const variable of matches) {
+            const key = variable.replace(/\$\{|\}/g, '');
+            if (replacements[key])
+                continue;
+            if (key === 'org_code')
+                continue;
+            if (key.endsWith('_code')) {
+                const entityType = key.replace('_code', '').toUpperCase();
+                let entityId;
+                if (parentType?.toUpperCase() === entityType && parentId) {
+                    entityId = parentId;
+                }
+                else {
+                    entityId = mappedEntityId;
+                }
+                if (entityId) {
+                    const entityData = await super.getEntityData(entityType, entityId, loggedInUser);
+                    replacements[key] = entityData?.code ?? null;
+                }
+            }
+        }
+        if (loggedInUser.level_type === 'ORG' && entityOverwrite === 0) {
+            replacements['level_code'] = null;
+        }
+        if (pathTemplate) {
+            const finalPath = this.resolveUploadPath(pathTemplate, replacements);
+            return finalPath;
+        }
+        return null;
+    }
+    resolveUploadPath(template, replacements) {
+        let path = template;
+        path = path.replace(/\$\{(\w+)\}/g, (_, key) => replacements[key] || '');
+        return path.replace(/\/+/g, '/').replace(/\/$/, '');
+    }
 };
 exports.MediaDataService = MediaDataService;
 exports.MediaDataService = MediaDataService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [config_1.ConfigService,
-        media_data_repository_1.MediaDataRepository])
+        media_data_repository_1.MediaDataRepository,
+        typeorm_1.DataSource])
 ], MediaDataService);
 //# sourceMappingURL=media-data.service.js.map

package/dist/module/meta/service/media-data.service.js.map

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

package/dist/module/meta/service/resolver.service.js

@@ -125,12 +125,12 @@ let ResolverService = class ResolverService {
             displayValue === '') {
             return displayValue;
         }
-        const [attr] = await this.dataSource.query(`SELECT * FROM cr_entity_attribute 
+        const [attr] = await this.dataSource.query(`SELECT * FROM cr_entity_attribute 
        WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`, [entityType, loggedInUser.organization_id, attrKey]);
         if (!attr)
             return displayValue;
         if (attr.data_source_type === 'entity') {
-            const [entityDef] = await this.dataSource.query(`SELECT * FROM cr_entity_master 
+            const [entityDef] = await this.dataSource.query(`SELECT * FROM cr_entity_master 
          WHERE mapped_entity_type = ? AND organization_id = ?`, [attr.datasource_list, loggedInUser.organization_id]);
             if (!entityDef)
                 return displayValue;
@@ -145,7 +145,7 @@ let ResolverService = class ResolverService {
             return item?.id ?? displayValue;
         }
         else if (attr.data_source_type === 'master') {
-            const [item] = await this.dataSource.query(`SELECT id FROM cr_list_master_items 
+            const [item] = await this.dataSource.query(`SELECT id FROM cr_list_master_items 
          WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`, [displayValue, loggedInUser.organization_id]);
             return item?.id ?? displayValue;
         }

package/dist/module/module/repository/menu.repository.js

@@ -60,10 +60,10 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async getMenuItems(moduleCodes, appcode, levelType) {
         return await this.menuData
             .createQueryBuilder('menu')
-            .leftJoin('sso_module', 'module', `
-          menu.module_code = module.module_code
-          AND LOWER(menu.appcode) = LOWER(module.appcode)
-          AND menu.level_type = module.level_type
+            .leftJoin('sso_module', 'module', `
+          menu.module_code = module.module_code
+          AND LOWER(menu.appcode) = LOWER(module.appcode)
+          AND menu.level_type = module.level_type
         `)
             .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
             .andWhere('LOWER(menu.appcode) = LOWER(:appcode)', { appcode })
@@ -82,11 +82,11 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async resolveUserRoles(userId, appcode, levelType, levelId) {
         const repo = this.dataSource.getRepository(user_role_mapping_entity_1.UserRoleMapping);
         if (userId) {
-            const getUserDetails = await this.dataSource.query(`
-        SELECT * from sso_user where id = ?
+            const getUserDetails = await this.dataSource.query(`
+        SELECT * from sso_user where id = ?
       `, [userId]);
-            const getUserUrm = await this.dataSource.query(`
-        SELECT * from sso_user_role_mapping where user_id = ? and appcode = ?
+            const getUserUrm = await this.dataSource.query(`
+        SELECT * from sso_user_role_mapping where user_id = ? and appcode = ?
       `, [userId, appcode]);
             if (getUserDetails.length > 0 &&
                 getUserDetails[0].organization_id === 1) {
@@ -105,10 +105,10 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
         if (roles.length)
             return roles.map((r) => r.urm_role_id);
         if (levelType === 'SCH') {
-            const [sch] = await this.dataSource.query(`
-        SELECT s.brand_id, s.organization_id
-        FROM eth_school_profile s
-        WHERE s.id = ?
+            const [sch] = await this.dataSource.query(`
+        SELECT s.brand_id, s.organization_id
+        FROM eth_school_profile s
+        WHERE s.id = ?
       `, [levelId]);
             const brandId = sch?.brand_id;
             const orgId = sch?.organization_id;

package/dist/module/notification/service/notification.service.js

@@ -66,11 +66,11 @@ let NotificationsService = class NotificationsService {
             const isReadBool = String(filterQuery.is_read).toLowerCase() === 'true';
             isReadFilter = isReadBool ? 1 : 0;
         }
-        let query = `
-    SELECT
-      n.*
-    FROM cr_notification n
-    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
+        let query = `
+    SELECT
+      n.*
+    FROM cr_notification n
+    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
   `;
         const params = [id, level_id, level_type];
         if (isReadFilter !== undefined) {
@@ -104,10 +104,10 @@ let NotificationsService = class NotificationsService {
     }
     async markAllAsRead(loggedInUser) {
         const { id, level_id, level_type } = loggedInUser;
-        const query = `
-    UPDATE cr_notification
-    SET is_read = 1
-    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
+        const query = `
+    UPDATE cr_notification
+    SET is_read = 1
+    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
   `;
         const params = [id, level_id, level_type];
         const result = await this.dataSource.query(query, params);

package/dist/module/user/controller/login.controller.js

@@ -57,27 +57,27 @@ let LoginController = class LoginController {
             try {
                 const actualState = state.replace('gmail_config:', '');
                 const result = await this.integrationService.handleGmailTokensCallback(email, googleAccessToken, googleRefreshToken, actualState);
-                return res.send(`<html><body><script>
-    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
-    window.close();
+                return res.send(`<html><body><script>
+    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
+    window.close();
   </script> <p>Configuration successful. You can close this window.</p> </body></html>`);
             }
             catch (error) {
-                return res.send(`
-         <html>
-        <body>
-          <script>
-            if (window.opener) {
-              window.opener.postMessage({ 
-                type: "CONFIG_FAILED", 
-                error: "${error.message || 'Something went wrong'}" 
-              }, "*");
-            }
-            window.close();
-          </script>
-          <p>Configuration failed. Please close this window.</p>
-        </body>
-      </html>
+                return res.send(`
+         <html>
+        <body>
+          <script>
+            if (window.opener) {
+              window.opener.postMessage({ 
+                type: "CONFIG_FAILED", 
+                error: "${error.message || 'Something went wrong'}" 
+              }, "*");
+            }
+            window.close();
+          </script>
+          <p>Configuration failed. Please close this window.</p>
+        </body>
+      </html>
         `);
             }
         }

package/dist/module/user/service/role.service.js

@@ -76,10 +76,10 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
             if (!existingRole) {
                 return { success: false, error: 'Role not found' };
             }
-            const associatedUsers = await this.entityManager.query(`SELECT map.*
-                                                              FROM sso_user_role_mapping map
-                                                                     JOIN sso_user usr ON map.user_id = usr.id
-                                                              WHERE usr.status = ${resolveStatus.id}
+            const associatedUsers = await this.entityManager.query(`SELECT map.*
+                                                              FROM sso_user_role_mapping map
+                                                                     JOIN sso_user usr ON map.user_id = usr.id
+                                                              WHERE usr.status = ${resolveStatus.id}
                                                                 and map.role_id = ${existingRole?.id}`);
             if (associatedUsers.length > 0) {
                 return {

package/dist/module/user/service/user-session.service.js

@@ -71,8 +71,8 @@ let UserSessionService = class UserSessionService {
         };
         let getUserDetails;
         if (currentUser) {
-            getUserDetails = await this.dataSource.query(`
-        SELECT * from sso_user where id = ?
+            getUserDetails = await this.dataSource.query(`
+        SELECT * from sso_user where id = ?
       `, [currentUser.id]);
         }
         if (getUserDetails[0].organization_id == 1 && payload.level_type == 'ORG') {