rez_core 6.6.6 → 7.0.0

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

@@ -1,19 +1,27 @@
-import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
 import { EntityManager, Repository } from 'typeorm';
 import { OrganizationData } from '../entity/organization.entity';
-import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
+import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
 import { SchoolRepository } from '../repository/school.repository';
+import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
+export type UpdateResult<T> = {
+    success: true;
+    data: T;
+} | {
+    success: false;
+    error: string;
+};
 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);
+    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<UpdateResult<OrganizationData>>;
     remove(id: number, manager?: EntityManager): Promise<void>;
+    private updateDescendantWbsCodes;
     getOrganizationHierarchy(userId: number, appCode: string, orgId: number): Promise<any[]>;
 }

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

@@ -15,64 +15,80 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrganizationService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
-const clockIDGenUtil_service_1 = require("../../../utils/service/clockIDGenUtil.service");
 const typeorm_2 = require("typeorm");
 const organization_entity_1 = require("../entity/organization.entity");
-const wbsCodeGen_service_1 = require("../../../utils/service/wbsCodeGen.service");
+const clockIDGenUtil_service_1 = require("../../../utils/service/clockIDGenUtil.service");
 const school_repository_1 = require("../repository/school.repository");
+const wbsCodeGen_service_1 = require("../../../utils/service/wbsCodeGen.service");
+const status_constant_1 = require("../../../constant/status.constant");
 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, loggedInUser, manager) {
-        const repo = this.organizationRepository;
-        const isBrand = organizationDto.type === 'BRN';
-        organizationDto.enterprise_id = loggedInUser.enterprise_id;
-        if (isBrand) {
-            const parentOrgId = organizationDto.parent_id;
-            if (!parentOrgId) {
-                throw new Error('Parent Org ID is required to create a brand.');
-            }
+        const repo = manager
+            ? manager.getRepository(organization_entity_1.OrganizationData)
+            : this.organizationRepository;
+        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}`;
+            organizationDto.parent_id = parentOrgId;
         }
         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 (!organizationDto.code) {
+            organizationDto.code = this.idGen.idGenerator('ORG');
+        }
+        organizationDto.status = status_constant_1.StatusConstant.ACTIVE;
+        if (loggedInUser) {
+            organizationDto.modified_by = loggedInUser.id;
+            organizationDto.created_by = loggedInUser.id;
+        }
         const organization = repo.create(organizationDto);
         return await repo.save(organization);
     }
@@ -91,12 +107,126 @@ 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) {
+            return {
+                success: false,
+                error: `Organization with id ${id} not found.`,
+            };
+        }
+        if (organizationDto.parent_id === id) {
+            return {
+                success: false,
+                error: 'Organization cannot be its own parent.',
+            };
+        }
+        const parentIdChanged = organizationDto.parent_id !== undefined &&
+            organizationDto.parent_id !== existingOrg.parent_id;
+        if (parentIdChanged) {
+            const wbsCodeLength = existingOrg.wbs_code?.length || 0;
+            if (wbsCodeLength === 5 || wbsCodeLength === 11) {
+                return {
+                    success: false,
+                    error: `Cannot change parent of organization with WBS code length ${wbsCodeLength}. ` +
+                        `Organizations at this level (${existingOrg.wbs_code}) are locked and cannot be moved.`,
+                };
+            }
+            const newParentId = organizationDto.parent_id;
+            const oldWbsCode = existingOrg.wbs_code;
+            if (newParentId) {
+                const parentOrg = await repo.findOne({
+                    where: { id: newParentId },
+                });
+                if (!parentOrg) {
+                    return {
+                        success: false,
+                        error: 'Parent organization not found.',
+                    };
+                }
+                if (!parentOrg.wbs_code) {
+                    return {
+                        success: false,
+                        error: 'Parent organization must have a WBS code.',
+                    };
+                }
+                if (existingOrg.wbs_code && parentOrg.wbs_code) {
+                    if (parentOrg.wbs_code.startsWith(existingOrg.wbs_code + '.')) {
+                        return {
+                            success: false,
+                            error: `Cannot set organization ${parentOrg.wbs_code} as parent. ` +
+                                `It is a descendant of ${existingOrg.wbs_code} (circular reference).`,
+                        };
+                    }
+                    if (parentOrg.wbs_code === existingOrg.wbs_code) {
+                        return {
+                            success: false,
+                            error: 'Organization cannot be its own 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);
+            }
+            const newWbsCode = organizationDto.wbs_code;
+            if (oldWbsCode && newWbsCode && oldWbsCode !== newWbsCode) {
+                await this.updateDescendantWbsCodes(repo, oldWbsCode, newWbsCode, loggedInUser);
+            }
+        }
+        if (loggedInUser) {
+            organizationDto.modified_by = loggedInUser.id;
+        }
         await repo.update(id, organizationDto);
-        return await repo.findOne({ where: { id } });
+        const updatedOrg = await repo.findOne({ where: { id } });
+        if (!updatedOrg) {
+            return {
+                success: false,
+                error: 'Failed to retrieve updated organization.',
+            };
+        }
+        return {
+            success: true,
+            data: updatedOrg,
+        };
     }
     async remove(id, manager) {
         const repo = manager
@@ -104,6 +234,24 @@ let OrganizationService = class OrganizationService {
             : this.organizationRepository;
         await repo.delete(id);
     }
+    async updateDescendantWbsCodes(repo, oldWbsCode, newWbsCode, loggedInUser) {
+        const descendants = await repo
+            .createQueryBuilder('org')
+            .where('org.wbs_code LIKE :pattern', { pattern: `${oldWbsCode}.%` })
+            .getMany();
+        for (const descendant of descendants) {
+            if (descendant.wbs_code) {
+                const updatedWbsCode = descendant.wbs_code.replace(oldWbsCode, newWbsCode);
+                const updateData = {
+                    wbs_code: updatedWbsCode,
+                };
+                if (loggedInUser) {
+                    updateData.modified_by = loggedInUser.id;
+                }
+                await repo.update(descendant.id, updateData);
+            }
+        }
+    }
     async getOrganizationHierarchy(userId, appCode, orgId) {
         return await this.schoolRepository.getUserContextDropdown(userId, appCode, orgId);
     }
@@ -113,8 +261,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":"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"}

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(enterprise_id: number, organization_id: number): Promise<{
+        message: string;
+        status: string;
+    } | undefined>;
+}

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

@@ -11,38 +11,27 @@ 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) {
+    async populateMetaData(enterprise_id, organization_id) {
         const metadataTables = [
             'frm_entity_master',
             'frm_entity_attribute',
             'frm_entity_view',
             'frm_entity_relation',
         ];
-        const metaData = [
-            'EntityMaster',
-            'AttributeMaster',
-            'ViewMaster',
-            'EntityRelationData',
-        ];
         const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
         const viewMasterRepo = this.reflectionHelper.getRepoService('ViewMaster');
-        const relationDataRepo = this.reflectionHelper.getRepoService('EntityRelationData');
         const relationRepo = this.reflectionHelper.getRepoService('EntityRelation');
         const attributeMasterRepo = this.reflectionHelper.getRepoService('AttributeMaster');
         const entityMasterRepo = this.reflectionHelper.getRepoService('EntityMaster');
         if (!listMasterItemsRepo)
             return;
         const getStatus = (await listMasterItemsRepo.find({
-            where: { organization_id: organization_id, code: 'STATUS_ACTIVE' },
+            where: { enterprise_id: enterprise_id, code: 'STATUS_ACTIVE' },
         }));
         let status;
         if (getStatus && getStatus.length > 0) {
@@ -52,10 +41,10 @@ let PopulateMetaService = class PopulateMetaService {
             status = 'ACTIVE';
         }
         let oneToManyId = await listMasterItemsRepo?.find({
-            where: { value: 'ONE_TO_MANY', organization_id: organization_id, enterprise_id: organization_id },
+            where: { value: 'ONE_TO_MANY', enterprise_id: enterprise_id },
         });
         let oneToOneId = await listMasterItemsRepo?.find({
-            where: { value: 'ONE_TO_ONE', organization_id: organization_id, enterprise_id: organization_id },
+            where: { value: 'ONE_TO_ONE', enterprise_id: enterprise_id },
         });
         for (const table of metadataTables) {
             let transformedData;
@@ -64,15 +53,14 @@ let PopulateMetaService = class PopulateMetaService {
                 transformRepo = entityMasterRepo;
                 const factoryData = await transformRepo?.find({
                     where: {
-                        organization_id: -1,
+                        enterprise_id: 1,
                         level_type: 'ORG',
-                        level_id: -1,
+                        level_id: 1,
                     },
                 });
                 transformedData = factoryData.map(({ id, created_date, modified_date, ...rest }) => ({
                     ...rest,
-                    organization_id,
-                    enterprise_id: organization_id,
+                    enterprise_id,
                     level_type: 'ORG',
                     level_id: organization_id,
                     is_workflow: rest.is_workflow == 1 ? true : false,
@@ -83,17 +71,16 @@ let PopulateMetaService = class PopulateMetaService {
                 transformRepo = attributeMasterRepo;
                 const factoryData = await transformRepo?.find({
                     where: {
-                        organization_id: -1,
+                        enterprise_id: 1,
                         level_type: 'ORG',
-                        level_id: -1,
+                        level_id: 1,
                     },
                 });
                 transformedData = factoryData.map(({ id, created_date, modified_date, ...rest }) => ({
                     ...rest,
-                    organization_id,
-                    enterprise_id: organization_id,
                     level_type: 'ORG',
                     level_id: organization_id,
+                    enterprise_id,
                     status: status,
                 }));
             }
@@ -103,18 +90,17 @@ let PopulateMetaService = class PopulateMetaService {
                 transformRepo = relationRepo;
                 const factoryData = await transformRepo?.find({
                     where: {
-                        organization_id: -1,
+                        enterprise_id: 1,
                         level_type: 'ORG',
-                        level_id: -1,
+                        level_id: 1,
                     },
                 });
                 transformedData = factoryData.map(({ id, created_date, modified_date, ...rest }) => ({
                     ...rest,
-                    organization_id,
-                    enterprise_id: organization_id,
                     level_type: 'ORG',
                     level_id: organization_id,
                     status: status,
+                    enterprise_id,
                     relation_id: rest.relation_type == 'ONE_TO_ONE'
                         ? oneToOneId[0].id
                         : oneToManyId[0].id,
@@ -124,15 +110,14 @@ let PopulateMetaService = class PopulateMetaService {
                 transformRepo = viewMasterRepo;
                 const factoryData = await transformRepo?.find({
                     where: {
-                        organization_id: -1,
+                        enterprise_id: 1,
                         level_type: 'ORG',
-                        level_id: -1,
+                        level_id: 1,
                     },
                 });
                 transformedData = factoryData.map(({ id, created_date, modified_date, ...rest }) => ({
                     ...rest,
-                    organization_id,
-                    enterprise_id: organization_id,
+                    enterprise_id,
                     level_type: 'ORG',
                     level_id: organization_id,
                     status: status,
@@ -146,29 +131,28 @@ let PopulateMetaService = class PopulateMetaService {
             return;
         const entityTables = await entityTableRepo.find({
             where: {
-                organization_id: -1,
+                enterprise_id: 1,
                 level_type: 'ORG',
-                level_id: -1,
+                level_id: 1,
             },
         });
         for (let entityTable of entityTables) {
             const { id, mapped_entity_type, display_type, ...rest } = entityTable;
             entityTable = {
                 ...rest,
-                organization_id,
-                enterprise_id: organization_id,
                 mapped_entity_type: mapped_entity_type,
                 level_type: 'ORG',
                 level_id: organization_id,
+                enterprise_id,
                 display_type: display_type,
             };
             const insertResult = await entityTableRepo.save(entityTable);
             const newId = insertResult.id;
             const entityTableColumns = await entityTableColumnRepo.find({
                 where: {
-                    organization_id: -1,
+                    enterprise_id: 1,
                     level_type: 'ORG',
-                    level_id: -1,
+                    level_id: 1,
                     mapped_entity_type: mapped_entity_type,
                     display_type: display_type,
                 },
@@ -178,11 +162,10 @@ let PopulateMetaService = class PopulateMetaService {
                 const { id, created_date, modified_date, ...columnRest } = column;
                 const newColumn = {
                     ...columnRest,
-                    organization_id,
-                    enterprise_id: organization_id,
                     parent_id: newId,
                     level_type: 'ORG',
                     level_id: organization_id,
+                    enterprise_id,
                     mapped_entity_type: mapped_entity_type,
                     display_type: display_type,
                 };
@@ -199,8 +182,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

@@ -2,10 +2,7 @@ import { EntityJSONService } from '../service/entity_json.service';
 export declare class EntityJSONController {
     private readonly entityJSONService;
     constructor(entityJSONService: EntityJSONService);
-    getEntityJson(entityType: string, req: Request & {
+    computeJson(entityId: number, entityType: string, req: Request & {
         user: any;
-    }, mode?: 'flat_json' | 'dropdown'): Promise<any>;
-    updateEntityJson(entityId: string, entityType: string, req: Request & {
-        user: any;
-    }): Promise<any>;
+    }): Promise<Record<string, any>>;
 }

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"entity_json.controller.js","sourceRoot":"","sources":["../../../../src/module/entity_json/controller/entity_json.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AACxB,wEAAmE;AACnE,2DAAgE;AAGzD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAI/D,AAAN,KAAK,CAAC,aAAa,CACI,UAAkB,EAChC,GAA4B,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;IAgD/D,AAAN,KAAK,CAAC,WAAW,CAAqB,QAAgB,EACd,UAAkB,EACjC,GAA4B;QAEnD,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;QACxC,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAC3C,UAAU,EACV,QAAQ,EACR,YAAY,CACb,CAAC;IACJ,CAAC;CACF,CAAA;AA5DY,oDAAoB;AAiDzB;IAFL,IAAA,YAAG,EAAC,eAAe,CAAC;IACpB,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACL,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IACpB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;uDAQvB;+BA3DU,oBAAoB;IADhC,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAEwB,uCAAiB;GADtD,oBAAoB,CA4DhC"}