rez_core 6.5.32 → 6.5.34

package/dist/module/enterprise/service/organization.service.d.ts

@@ -5,15 +5,15 @@ import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
 import { SchoolRepository } from '../repository/school.repository';
 export declare class OrganizationService {
     private readonly organizationRepository;
+    private readonly schoolRepository;
     private readonly idGen;
     private readonly wbcCodeGenService;
-    private readonly schoolRepository;
-    constructor(organizationRepository: Repository<OrganizationData>, idGen: ClockIDGenService, wbcCodeGenService: WBSCodeGenService, schoolRepository: SchoolRepository);
-    create(organizationDto: Partial<OrganizationData>, manager?: EntityManager): Promise<OrganizationData>;
+    constructor(organizationRepository: Repository<OrganizationData>, schoolRepository: SchoolRepository, idGen: ClockIDGenService, wbcCodeGenService: WBSCodeGenService);
+    create(organizationDto: Partial<OrganizationData>, loggedInUser?: any, manager?: EntityManager): Promise<OrganizationData>;
     findAll(manager?: EntityManager): Promise<OrganizationData[]>;
     findOne(id: number, manager?: EntityManager): Promise<OrganizationData | null>;
     findById(id: number | undefined): Promise<OrganizationData[]>;
-    update(id: number, organizationDto: Partial<OrganizationData>, manager?: EntityManager): Promise<OrganizationData | null>;
+    update(id: number, organizationDto: Partial<OrganizationData>, loggedInUser?: any, manager?: EntityManager): Promise<OrganizationData | null>;
     remove(id: number, manager?: EntityManager): Promise<void>;
     getOrganizationHierarchy(userId: number, appCode: string, orgId: number): Promise<any[]>;
 }

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

@@ -21,59 +21,69 @@ const organization_entity_1 = require("../entity/organization.entity");
 const wbsCodeGen_service_1 = require("../../../utils/service/wbsCodeGen.service");
 const school_repository_1 = require("../repository/school.repository");
 let OrganizationService = class OrganizationService {
-    constructor(organizationRepository, idGen, wbcCodeGenService, schoolRepository) {
+    constructor(organizationRepository, schoolRepository, idGen, wbcCodeGenService) {
         this.organizationRepository = organizationRepository;
+        this.schoolRepository = schoolRepository;
         this.idGen = idGen;
         this.wbcCodeGenService = wbcCodeGenService;
-        this.schoolRepository = schoolRepository;
     }
-    async create(organizationDto, manager) {
+    async create(organizationDto, loggedInUser, manager) {
         const repo = manager
             ? manager.getRepository(organization_entity_1.OrganizationData)
             : this.organizationRepository;
-        const isBrand = organizationDto.type === 'BRN';
-        if (isBrand) {
-            const parentOrgId = organizationDto.parent_id;
-            if (!parentOrgId) {
-                throw new Error('Parent Org ID is required to create a brand.');
-            }
+        const parentOrgId = organizationDto.parent_id;
+        if (parentOrgId) {
             const parentOrg = await repo.findOne({
                 where: { id: parentOrgId },
             });
             if (!parentOrg) {
                 throw new Error('Parent organization not found.');
             }
-            const existingBrands = await repo.find({
+            if (!parentOrg.wbs_code) {
+                throw new Error('Parent organization must have a WBS code.');
+            }
+            const existingSubOrgs = await repo.find({
                 where: {
-                    type: 'BRN',
                     parent_id: parentOrgId,
                 },
                 select: ['wbs_code'],
             });
-            const brandCodes = existingBrands
-                .map((b) => b.wbs_code?.split('.')[1])
+            const subOrgCodes = existingSubOrgs
+                .map((subOrg) => {
+                const parts = subOrg.wbs_code?.split('.');
+                return parts && parts.length > 1 ? parts[parts.length - 1] : null;
+            })
                 .filter(Boolean)
                 .map(Number);
-            const nextBrnCode = brandCodes.length ? Math.max(...brandCodes) + 1 : 1;
-            const brnWbsCode = this.wbcCodeGenService.padCode(nextBrnCode);
-            organizationDto.wbs_code = `${parentOrg.wbs_code}.${brnWbsCode}`;
+            const nextSubOrgCode = subOrgCodes.length
+                ? Math.max(...subOrgCodes) + 1
+                : 1;
+            const subOrgWbsCode = this.wbcCodeGenService.padCode(nextSubOrgCode);
+            organizationDto.wbs_code = `${parentOrg.wbs_code}.${subOrgWbsCode}`;
         }
         else {
             const existingOrgs = await repo.find({
                 where: {
-                    type: (0, typeorm_2.IsNull)(),
+                    parent_id: (0, typeorm_2.IsNull)(),
                 },
                 select: ['wbs_code'],
             });
             const orgCodes = existingOrgs
-                .map((org) => org.wbs_code)
-                .filter(Boolean)
-                .map(Number);
+                .map((org) => {
+                if (org.wbs_code?.includes('.')) {
+                    return null;
+                }
+                return org.wbs_code ? Number(org.wbs_code) : null;
+            })
+                .filter((code) => code !== null);
             const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
             organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
         }
         organizationDto.code = this.idGen.idGenerator('ORG');
-        organizationDto.created_date = new Date();
+        if (loggedInUser) {
+            organizationDto.modified_by = loggedInUser.id;
+            organizationDto.created_by = loggedInUser.id;
+        }
         const organization = repo.create(organizationDto);
         return await repo.save(organization);
     }
@@ -92,10 +102,77 @@ let OrganizationService = class OrganizationService {
     async findById(id) {
         return await this.organizationRepository.find({ where: { id } });
     }
-    async update(id, organizationDto, manager) {
+    async update(id, organizationDto, loggedInUser, manager) {
         const repo = manager
             ? manager.getRepository(organization_entity_1.OrganizationData)
             : this.organizationRepository;
+        const existingOrg = await repo.findOne({ where: { id } });
+        if (!existingOrg) {
+            throw new Error(`Organization with id ${id} not found.`);
+        }
+        if (organizationDto.parent_id === id) {
+            throw new Error('Organization cannot be its own parent.');
+        }
+        const parentIdChanged = organizationDto.parent_id !== undefined &&
+            organizationDto.parent_id !== existingOrg.parent_id;
+        if (parentIdChanged) {
+            const newParentId = organizationDto.parent_id;
+            if (newParentId) {
+                const parentOrg = await repo.findOne({
+                    where: { id: newParentId },
+                });
+                if (!parentOrg) {
+                    throw new Error('Parent organization not found.');
+                }
+                if (!parentOrg.wbs_code) {
+                    throw new Error('Parent organization must have a WBS code.');
+                }
+                if (parentOrg.wbs_code?.startsWith(existingOrg.wbs_code || '')) {
+                    throw new Error('Cannot set a descendant organization as parent (circular reference).');
+                }
+                const existingSubOrgs = await repo.find({
+                    where: {
+                        parent_id: newParentId,
+                    },
+                    select: ['wbs_code', 'id'],
+                });
+                const subOrgCodes = existingSubOrgs
+                    .filter((subOrg) => subOrg.id !== id)
+                    .map((subOrg) => {
+                    const parts = subOrg.wbs_code?.split('.');
+                    return parts && parts.length > 1 ? parts[parts.length - 1] : null;
+                })
+                    .filter(Boolean)
+                    .map(Number);
+                const nextSubOrgCode = subOrgCodes.length
+                    ? Math.max(...subOrgCodes) + 1
+                    : 1;
+                const subOrgWbsCode = this.wbcCodeGenService.padCode(nextSubOrgCode);
+                organizationDto.wbs_code = `${parentOrg.wbs_code}.${subOrgWbsCode}`;
+            }
+            else {
+                const existingOrgs = await repo.find({
+                    where: {
+                        parent_id: (0, typeorm_2.IsNull)(),
+                    },
+                    select: ['wbs_code', 'id'],
+                });
+                const orgCodes = existingOrgs
+                    .filter((org) => org.id !== id)
+                    .map((org) => {
+                    if (org.wbs_code?.includes('.')) {
+                        return null;
+                    }
+                    return org.wbs_code ? Number(org.wbs_code) : null;
+                })
+                    .filter((code) => code !== null);
+                const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
+                organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
+            }
+        }
+        if (loggedInUser) {
+            organizationDto.modified_by = loggedInUser.id;
+        }
         await repo.update(id, organizationDto);
         return await repo.findOne({ where: { id } });
     }
@@ -114,8 +191,8 @@ exports.OrganizationService = OrganizationService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(organization_entity_1.OrganizationData)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
+        school_repository_1.SchoolRepository,
         clockIDGenUtil_service_1.ClockIDGenService,
-        wbsCodeGen_service_1.WBSCodeGenService,
-        school_repository_1.SchoolRepository])
+        wbsCodeGen_service_1.WBSCodeGenService])
 ], OrganizationService);
 //# sourceMappingURL=organization.service.js.map

package/dist/module/enterprise/service/organization.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,0FAA6E;AAC7E,qCAA4D;AAC5D,uEAAiE;AAEjE,kFAAyE;AACzE,uEAAmE;AAG5D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAEmB,sBAAoD,EACpD,gBAAkC,EAClC,KAAwB,EACxB,iBAAoC;QAHpC,2BAAsB,GAAtB,sBAAsB,CAA8B;QACpD,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,UAAK,GAAL,KAAK,CAAmB;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;IACpD,CAAC;IAEJ,KAAK,CAAC,MAAM,CACV,eAA0C,EAC1C,YAAkB,EAClB,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,MAAM,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC;QAE9C,IAAI,WAAW,EAAE,CAAC;YAEhB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;gBACnC,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;aAC3B,CAAC,CAAC;YAEH,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC/D,CAAC;YAGD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;gBACtC,KAAK,EAAE;oBACL,SAAS,EAAE,WAAW;iBACvB;gBACD,MAAM,EAAE,CAAC,UAAU,CAAC;aACrB,CAAC,CAAC;YAGH,MAAM,WAAW,GAAG,eAAe;iBAChC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBACd,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1C,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACpE,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC;iBACf,GAAG,CAAC,MAAM,CAAC,CAAC;YAGf,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM;gBACvC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC;gBAC9B,CAAC,CAAC,CAAC,CAAC;YAEN,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACrE,eAAe,CAAC,QAAQ,GAAG,GAAG,SAAS,CAAC,QAAQ,IAAI,aAAa,EAAE,CAAC;QACtE,CAAC;aAAM,CAAC;YAEN,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;gBACnC,KAAK,EAAE;oBACL,SAAS,EAAE,IAAA,gBAAM,GAAE;iBACpB;gBACD,MAAM,EAAE,CAAC,UAAU,CAAC;aACrB,CAAC,CAAC;YAGH,MAAM,QAAQ,GAAG,YAAY;iBAC1B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAEX,IAAI,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACpD,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAGnD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEpE,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACzE,CAAC;QAED,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAGrD,IAAI,YAAY,EAAE,CAAC;YACjB,eAAe,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;YAC9C,eAAe,CAAC,UAAU,GAAG,YAAY,CAAC,EAAE,CAAC;QAC/C,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAuB;QACnC,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,OAAO,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,OAAO,CACX,EAAU,EACV,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAsB;QACnC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,MAAM,CACV,EAAU,EACV,eAA0C,EAC1C,YAAkB,EAClB,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAGhC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;QAC3D,CAAC;QAGD,IAAI,eAAe,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC;QAGD,MAAM,eAAe,GACnB,eAAe,CAAC,SAAS,KAAK,SAAS;YACvC,eAAe,CAAC,SAAS,KAAK,WAAW,CAAC,SAAS,CAAC;QAGtD,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC;YAE9C,IAAI,WAAW,EAAE,CAAC;gBAEhB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;oBACnC,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;iBAC3B,CAAC,CAAC;gBAEH,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBACpD,CAAC;gBAED,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC/D,CAAC;gBAGD,IAAI,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;oBAC/D,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;gBACJ,CAAC;gBAGD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;oBACtC,KAAK,EAAE;wBACL,SAAS,EAAE,WAAW;qBACvB;oBACD,MAAM,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC;iBAC3B,CAAC,CAAC;gBAGH,MAAM,WAAW,GAAG,eAAe;qBAChC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;qBACpC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACd,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC1C,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACpE,CAAC,CAAC;qBACD,MAAM,CAAC,OAAO,CAAC;qBACf,GAAG,CAAC,MAAM,CAAC,CAAC;gBAGf,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM;oBACvC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC;oBAC9B,CAAC,CAAC,CAAC,CAAC;gBAEN,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBACrE,eAAe,CAAC,QAAQ,GAAG,GAAG,SAAS,CAAC,QAAQ,IAAI,aAAa,EAAE,CAAC;YACtE,CAAC;iBAAM,CAAC;gBAEN,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;oBACnC,KAAK,EAAE;wBACL,SAAS,EAAE,IAAA,gBAAM,GAAE;qBACpB;oBACD,MAAM,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC;iBAC3B,CAAC,CAAC;gBAGH,MAAM,QAAQ,GAAG,YAAY;qBAC1B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;qBAC9B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAEX,IAAI,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wBAChC,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACpD,CAAC,CAAC;qBACD,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;gBAGnD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEpE,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QAGD,IAAI,YAAY,EAAE,CAAC;YACjB,eAAe,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;QAChD,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QACvC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,OAAuB;QAC9C,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,MAAc,EACd,OAAe,EACf,KAAa;QAEb,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CACvD,MAAM,EACN,OAAO,EACP,KAAK,CACN,CAAC;IACJ,CAAC;CACF,CAAA;AA3PY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sCAAgB,CAAC,CAAA;qCACM,oBAAU;QAChB,oCAAgB;QAC3B,0CAAiB;QACL,sCAAiB;GAN5C,mBAAmB,CA2P/B"}

package/dist/module/enterprise/service/populate-meta.service.d.ts

@@ -0,0 +1,9 @@
+import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
+export declare class PopulateMetaService {
+    private readonly reflectionHelper;
+    constructor(reflectionHelper: ReflectionHelper);
+    populateMetaData(organization_id: number): Promise<{
+        message: string;
+        status: string;
+    } | undefined>;
+}

package/dist/module/{meta → enterprise}/service/populate-meta.service.js

@@ -11,13 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PopulateMetaService = void 0;
 const common_1 = require("@nestjs/common");
-const typeorm_1 = require("typeorm");
-const entity_service_impl_service_1 = require("./entity-service-impl.service");
 const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let PopulateMetaService = class PopulateMetaService {
-    constructor(dataSource, entityServiceImpl, reflectionHelper) {
-        this.dataSource = dataSource;
-        this.entityServiceImpl = entityServiceImpl;
+    constructor(reflectionHelper) {
         this.reflectionHelper = reflectionHelper;
     }
     async populateMetaData(organization_id) {
@@ -193,8 +189,6 @@ let PopulateMetaService = class PopulateMetaService {
 exports.PopulateMetaService = PopulateMetaService;
 exports.PopulateMetaService = PopulateMetaService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource,
-        entity_service_impl_service_1.EntityServiceImpl,
-        reflection_helper_service_1.ReflectionHelper])
+    __metadata("design:paramtypes", [reflection_helper_service_1.ReflectionHelper])
 ], PopulateMetaService);
 //# sourceMappingURL=populate-meta.service.js.map

package/dist/module/enterprise/service/populate-meta.service.js.map

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

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

@@ -0,0 +1 @@
+//# sourceMappingURL=school.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"school.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/school.service.ts"],"names":[],"mappings":""}

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

@@ -4,8 +4,15 @@ export declare class EntityJSONController {
     constructor(entityJSONService: EntityJSONService);
     getEntityJson(entityType: string, req: Request & {
         user: any;
-    }, mode?: 'flat_json' | 'dropdown'): Promise<any>;
+    }, mode?: 'flat_json' | 'dropdown'): Promise<any[] | Record<string, null> | {
+        flat_json: Record<string, null>;
+        attributes: {
+            mainAttributes: import("../../meta/entity/attribute-master.entity").AttributeMaster[];
+            relatedAttributes: import("../../meta/entity/attribute-master.entity").AttributeMaster[];
+            linkedAttributes: any[];
+        };
+    }>;
     updateEntityJson(entityId: string, entityType: string, req: Request & {
         user: any;
-    }): Promise<any>;
+    }): Promise<Record<string, null> | null>;
 }

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,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;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;AA9CY,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;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;+BAhCU,oBAAoB;IADhC,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAEwB,uCAAiB;GADtD,oBAAoB,CA8ChC"}
+{"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;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;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;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;+BAhCU,oBAAoB;IADhC,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAEwB,uCAAiB;GADtD,oBAAoB,CAiChC"}

package/dist/module/entity_json/entity/entityJson.entity.d.ts

@@ -4,8 +4,7 @@ export declare class EntityJson {
     entity_id: number;
     json_data: Record<string, any>;
     created_by: number;
-    organization_id: number;
+    updated_by: number;
     created_at: Date;
     updated_at: Date;
-    updated_by: string;
 }

package/dist/module/entity_json/entity/entityJson.entity.js

@@ -39,7 +39,7 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], EntityJson.prototype, "organization_id", void 0);
+], EntityJson.prototype, "updated_by", void 0);
 __decorate([
     (0, typeorm_1.CreateDateColumn)({ type: 'timestamp', nullable: true }),
     __metadata("design:type", Date)
@@ -48,10 +48,6 @@ __decorate([
     (0, typeorm_1.UpdateDateColumn)({ type: 'timestamp', nullable: true }),
     __metadata("design:type", Date)
 ], EntityJson.prototype, "updated_at", void 0);
-__decorate([
-    (0, typeorm_1.UpdateDateColumn)({ type: 'varchar', nullable: true }),
-    __metadata("design:type", String)
-], EntityJson.prototype, "updated_by", void 0);
 exports.EntityJson = EntityJson = __decorate([
     (0, typeorm_1.Entity)('frm_entity_json'),
     (0, typeorm_1.Unique)(['entity_type', 'entity_id'])

package/dist/module/entity_json/entity/entityJson.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"entityJson.entity.js","sourceRoot":"","sources":["../../../../src/module/entity_json/entity/entityJson.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAQiB;AAIV,IAAM,UAAU,GAAhB,MAAM,UAAU;CA6BtB,CAAA;AA7BY,gCAAU;AAErB;IADC,IAAA,gCAAsB,GAAE;;sCACd;AAIX;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;+CACrB;AAIpB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;6CACN;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;6CACX;AAG/B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAChB;AAGxB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC5C,IAAI;8CAAC;AAGjB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC5C,IAAI;8CAAC;AAGjB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACnC;qBA5BR,UAAU;IAFtB,IAAA,gBAAM,EAAC,iBAAiB,CAAC;IACzB,IAAA,gBAAM,EAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;GACxB,UAAU,CA6BtB"}
+{"version":3,"file":"entityJson.entity.js","sourceRoot":"","sources":["../../../../src/module/entity_json/entity/entityJson.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAQiB;AAIV,IAAM,UAAU,GAAhB,MAAM,UAAU;CA0BtB,CAAA;AA1BY,gCAAU;AAErB;IADC,IAAA,gCAAsB,GAAE;;sCACd;AAIX;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;+CACrB;AAIpB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;6CACN;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;6CACX;AAG/B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACrB;AAGnB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC5C,IAAI;8CAAC;AAGjB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC5C,IAAI;8CAAC;qBAzBN,UAAU;IAFtB,IAAA,gBAAM,EAAC,iBAAiB,CAAC;IACzB,IAAA,gBAAM,EAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;GACxB,UAAU,CA0BtB"}

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

@@ -21,15 +21,10 @@ let EntityJSONModule = class EntityJSONModule {
 exports.EntityJSONModule = EntityJSONModule;
 exports.EntityJSONModule = EntityJSONModule = __decorate([
     (0, common_1.Module)({
-        imports: [
-            (0, common_1.forwardRef)(() => entity_module_1.EntityModule),
-            typeorm_1.TypeOrmModule.forFeature([entityJson_entity_1.EntityJson]),
-            (0, common_1.forwardRef)(() => filter_module_1.FilterModule),
-            utils_module_1.UtilsModule,
-        ],
+        imports: [entity_module_1.EntityModule, typeorm_1.TypeOrmModule.forFeature([entityJson_entity_1.EntityJson]), filter_module_1.FilterModule, utils_module_1.UtilsModule],
         controllers: [entity_json_controller_1.EntityJSONController],
         providers: [entity_json_service_1.EntityJSONService, entityJson_repository_1.EntityJSONRepository],
-        exports: [entity_json_service_1.EntityJSONService],
+        exports: [],
     })
 ], EntityJSONModule);
 //# sourceMappingURL=entity_json.module.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"entity_json.module.js","sourceRoot":"","sources":["../../../src/module/entity_json/entity_json.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,yDAAqD;AACrD,6CAAgD;AAChD,uEAAkE;AAClE,gFAA2E;AAC3E,2DAAuD;AACvD,2DAAqD;AACrD,kEAAwD;AACxD,2EAAuE;AAahE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAAG,CAAA;AAAnB,4CAAgB;2BAAhB,gBAAgB;IAX5B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;YAC9B,uBAAa,CAAC,UAAU,CAAC,CAAC,8BAAU,CAAC,CAAC;YACtC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;YAC9B,0BAAW;SACZ;QACD,WAAW,EAAE,CAAC,6CAAoB,CAAC;QACnC,SAAS,EAAE,CAAC,uCAAiB,EAAE,4CAAoB,CAAC;QACpD,OAAO,EAAE,CAAC,uCAAiB,CAAC;KAC7B,CAAC;GACW,gBAAgB,CAAG"}
+{"version":3,"file":"entity_json.module.js","sourceRoot":"","sources":["../../../src/module/entity_json/entity_json.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,yDAAqD;AACrD,6CAAgD;AAChD,uEAAkE;AAClE,gFAA2E;AAC3E,2DAAuD;AACvD,2DAAqD;AACrD,kEAAwD;AACxD,2EAAuE;AAShE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAAG,CAAA;AAAnB,4CAAgB;2BAAhB,gBAAgB;IAN5B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,4BAAY,EAAE,uBAAa,CAAC,UAAU,CAAC,CAAC,8BAAU,CAAC,CAAC,EAAC,4BAAY,EAAC,0BAAW,CAAC;QACxF,WAAW,EAAE,CAAC,6CAAoB,CAAC;QACnC,SAAS,EAAE,CAAC,uCAAiB,EAAC,4CAAoB,CAAC;QACnD,OAAO,EAAE,EAAE;KACZ,CAAC;GACW,gBAAgB,CAAG"}

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

@@ -1,3 +1,4 @@
+import { AttributeMaster } from 'src/module/meta/entity/attribute-master.entity';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
 import { DataSource } from 'typeorm';
@@ -10,8 +11,15 @@ export declare class EntityJSONService {
     private readonly filterService;
     private readonly entityServiceImpl;
     constructor(dataSource: DataSource, loggerService: LoggingService, EntityJSONRepository: EntityJSONRepository, filterService: FilterService, entityServiceImpl: EntityServiceImpl);
-    getAttributeForFlatJSON(entityType: string, loggedInUser: any, flag?: 'flat_json' | 'dropdown' | 'all' | 'filter_attribute'): Promise<any>;
-    updateEntityJSON(entityType: string, entityId: number, loggedInUser: any): Promise<any>;
+    getAttributeForFlatJSON(entityType: string, loggedInUser: any, flag?: 'flat_json' | 'dropdown' | 'all'): Promise<any[] | Record<string, null> | {
+        flat_json: Record<string, null>;
+        attributes: {
+            mainAttributes: AttributeMaster[];
+            relatedAttributes: AttributeMaster[];
+            linkedAttributes: any[];
+        };
+    }>;
+    updateEntityJSON(entityType: string, entityId: number, loggedInUser: any): Promise<Record<string, null> | null>;
     private mergeEntityDataIntoFlatJson;
     private applyLinkedFilterUsingSavedFilter;
 }

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

@@ -31,18 +31,12 @@ let EntityJSONService = class EntityJSONService {
         this.entityServiceImpl = entityServiceImpl;
     }
     async getAttributeForFlatJSON(entityType, loggedInUser, flag) {
-        const entId = loggedInUser.enterprise_id;
-        await this.loggerService.log('info', 'EntityJSONService', 'getAttributeForFlatJSON', `Loading attributes for entity: ${entityType}, org: ${entId}`);
+        const entId = loggedInUser.entId;
+        await this.loggerService.log('info', 'EntityJSONService', 'getAttributeForFlatJSON', `Loading attributes for entity: ${entityType}, ent: ${entId}`);
         const mainAttributes = await this.dataSource
             .getRepository(attribute_master_entity_1.AttributeMaster)
             .createQueryBuilder('attr')
-            .select([
-            'attr.id',
-            'attr.name',
-            'attr.flat_json_key',
-            'attr.attribute_key',
-            'attr.data_type',
-        ])
+            .select(['attr.id', 'attr.name', 'attr.flat_json_key', 'attr.attribute_key'])
             .where('attr.mapped_entity_type = :entityType', { entityType })
             .andWhere('attr.enterprise_id = :entId', { entId })
             .getMany();
@@ -55,23 +49,14 @@ let EntityJSONService = class EntityJSONService {
             .andWhere('rel.enterprise_id = :entId', { entId })
             .andWhere('rel.relation_type = :relationType', { relationType: 'ONE_TO_ONE' })
             .getRawMany();
-        const relatedTypesList = relatedEntityTypes.map((x) => x.rel_target_entity_type);
+        const relatedTypesList = relatedEntityTypes.map(x => x.rel_target_entity_type);
         await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Found ${relatedTypesList.length} ONE-TO-ONE related entity types`);
         const relatedAttributes = relatedTypesList.length
             ? await this.dataSource
                 .getRepository(attribute_master_entity_1.AttributeMaster)
                 .createQueryBuilder('attr')
-                .select([
-                'attr.id',
-                'attr.name',
-                'attr.flat_json_key',
-                'attr.mapped_entity_type',
-                'attr.attribute_key',
-                'attr.data_type',
-            ])
-                .where('attr.mapped_entity_type IN (:...types)', {
-                types: relatedTypesList,
-            })
+                .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.enterprise_id = :entId', { entId })
                 .getMany()
             : [];
@@ -87,83 +72,41 @@ let EntityJSONService = class EntityJSONService {
             'fla.saved_filter_code AS saved_filter_code',
             'attr.name AS name',
             'attr.id AS id',
-            'attr.data_type AS data_type',
         ])
             .where('attr.enterprise_id = :entId', { entId })
             .getRawMany();
         await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Loaded ${linkedAttributes.length} linked attributes`);
-        if (flag === 'filter_attribute') {
-            const filterAttributes = [];
-            filterAttributes.push(...mainAttributes.map((a) => ({
-                id: a.id,
-                name: a.name,
-                data_type: a.data_type,
-                attribute_key: a.flat_json_key,
-                source: 'main',
-            })));
-            filterAttributes.push(...relatedAttributes.map((a) => ({
-                id: a.id,
-                name: a.name,
-                data_type: a.data_type,
-                attribute_key: a.flat_json_key,
-                source: 'related',
-            })));
-            filterAttributes.push(...linkedAttributes.map((l) => ({
-                id: l.id,
-                name: l.name,
-                data_type: l.data_type,
-                attribute_key: l.target_attribute_key,
-                source: 'linked',
-            })));
-            return filterAttributes;
-        }
         if (flag === 'flat_json' || flag === 'all') {
             const result = {};
-            mainAttributes.forEach((attr) => {
+            mainAttributes.forEach(attr => {
                 if (attr.flat_json_key)
                     result[attr.flat_json_key] = null;
             });
-            relatedAttributes.forEach((attr) => {
+            relatedAttributes.forEach(attr => {
                 if (attr.flat_json_key)
                     result[attr.flat_json_key] = null;
             });
-            linkedAttributes.forEach((link) => {
+            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 { flat_json: result, attributes: { mainAttributes, relatedAttributes, linkedAttributes } };
             }
             return result;
         }
         const dropdown = [];
-        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,
-        })));
+        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.target_attribute_key,
-            })));
+            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 response = await this.getAttributeForFlatJSON(entityType, loggedInUser, 'all');
-        if (!response ||
-            !('flat_json' in response) ||
-            !('attributes' in response) ||
-            !response.attributes) {
+        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;
         }
@@ -176,29 +119,23 @@ let EntityJSONService = class EntityJSONService {
             linkedAttributes: attributes.linkedAttributes || [],
         };
         const attrMap = {};
-        const allAttrs = [
-            ...safeAttributes.mainAttributes,
-            ...safeAttributes.relatedAttributes,
-        ];
-        allAttrs.forEach((attr) => {
+        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.entityServiceImpl.getResolvedEntityData(entityType, entityId, loggedInUser, true);
+        const mainData = await this.entityServiceImpl.getResolvedEntityData(entityType, entityId, loggedInUser);
         this.mergeEntityDataIntoFlatJson(flatJson, mainData, attrMap);
         const relations = await this.dataSource
             .getRepository('frm_entity_relation_data')
             .createQueryBuilder('erd')
-            .select([
-            'erd.target_entity_id AS target_entity_id',
-            'erd.target_entity_type AS target_entity_type',
-        ])
+            .select(['erd.target_entity_id AS target_entity_id', 'erd.target_entity_type AS target_entity_type'])
             .where('erd.source_entity_type = :entityType', { entityType })
             .andWhere('erd.source_entity_id = :entityId', { entityId })
             .andWhere('erd.relation_type = :rt', { rt: 'ONE_TO_ONE' })
             .getRawMany();
         for (const rel of relations) {
-            const relatedData = await this.entityServiceImpl.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser, true);
+            const relatedData = await this.entityServiceImpl.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
             this.mergeEntityDataIntoFlatJson(flatJson, relatedData, attrMap);
         }
         for (const linkAttr of safeAttributes.linkedAttributes) {
@@ -237,33 +174,21 @@ let EntityJSONService = class EntityJSONService {
         }
     }
     async applyLinkedFilterUsingSavedFilter(childEntityType, savedFilterCode, childFilterAttribute, mappingValue, targetAttribute, loggedInUser, entity_id) {
-        if (!savedFilterCode &&
-            (mappingValue === null || mappingValue === undefined))
+        if (!savedFilterCode && (mappingValue === null || mappingValue === undefined))
             return null;
         const dto = {
             entity_type: childEntityType,
             savedFilterCode,
             page: 1,
             size: 1,
-            loggedInUser
         };
-        if (mappingValue !== null &&
-            mappingValue !== undefined &&
-            mappingValue !== '') {
+        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],
-            },
+            { filter_attribute: 'parent_id', filter_operator: 'equal', filter_value: [entity_id] },
         ];
         const result = await this.filterService.applyFilter(dto);
         const rows = result?.data?.entity_list || [];