rez_core 5.0.182 → 6.5.1

package/src/module/enterprise/service/organization.service.ts

@@ -1,145 +1,262 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
-import { EntityManager, IsNull, Repository } from 'typeorm';
-import { OrganizationData } from '../entity/organization.entity';
-// import { BrandRepository } from '../repository/brand.repository';
-import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
-import { SchoolRepository } from '../repository/school.repository';
-
-@Injectable()
-export class OrganizationService {
-  constructor(
-    @InjectRepository(OrganizationData)
-    private readonly organizationRepository: Repository<OrganizationData>,
-    private readonly idGen: ClockIDGenService,
-    private readonly wbcCodeGenService: WBSCodeGenService,
-    private readonly schoolRepository: SchoolRepository,
-  ) {}
-
-  async create(
-    organizationDto: Partial<OrganizationData>,
-    manager?: EntityManager,
-  ): Promise<OrganizationData> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    const isBrand = organizationDto.type === 'BRN';
-
-    if (isBrand) {
-      // BRN case
-      const parentOrgId = organizationDto.parent_id;
-
-      if (!parentOrgId) {
-        throw new Error('Parent Org ID is required to create a brand.');
-      }
-
-      const parentOrg = await repo.findOne({
-        where: { id: parentOrgId },
-      });
-
-      if (!parentOrg) {
-        throw new Error('Parent organization not found.');
-      }
-
-      const existingBrands = await repo.find({
-        where: {
-          type: 'BRN',
-          parent_id: parentOrgId,
-        },
-        select: ['wbs_code'],
-      });
-
-      const brandCodes = existingBrands
-        .map((b) => b.wbs_code?.split('.')[1])
-        .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}`;
-    } else {
-      // ORG case
-      const existingOrgs = await repo.find({
-        where: {
-          type: IsNull(),
-        },
-        select: ['wbs_code'],
-      });
-
-      const orgCodes = existingOrgs
-        .map((org) => org.wbs_code)
-        .filter(Boolean)
-        .map(Number);
-
-      const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
-
-      organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
-    }
-
-    organizationDto.code = this.idGen.idGenerator('ORG');
-    // organizationDto.status = 'ACTIVE';
-    organizationDto.created_date = new Date();
-
-    const organization = repo.create(organizationDto);
-    return await repo.save(organization);
-  }
-
-  async findAll(manager?: EntityManager): Promise<OrganizationData[]> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    return await repo.find();
-  }
-
-  async findOne(
-    id: number,
-    manager?: EntityManager,
-  ): Promise<OrganizationData | null> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    return await repo.findOne({ where: { id } });
-  }
-
-  async findById(id: number | undefined) {
-    return await this.organizationRepository.find({ where: { id } });
-  }
-
-  async update(
-    id: number,
-    organizationDto: Partial<OrganizationData>,
-    manager?: EntityManager,
-  ): Promise<OrganizationData | null> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    await repo.update(id, organizationDto);
-    return await repo.findOne({ where: { id } });
-  }
-
-  async remove(id: number, manager?: EntityManager): Promise<void> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    await repo.delete(id);
-  }
-
-  async getOrganizationHierarchy(
-    userId: number,
-    appCode: string,
-    orgId: number,
-  ) {
-    return await this.schoolRepository.getUserContextDropdown(
-      userId,
-      appCode,
-      orgId,
-    );
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
+import { EntityManager, IsNull, Repository } from 'typeorm';
+import { OrganizationData } from '../entity/organization.entity';
+// import { BrandRepository } from '../repository/brand.repository';
+import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
+import { SchoolRepository } from '../repository/school.repository';
+
+@Injectable()
+export class OrganizationService {
+  constructor(
+    @InjectRepository(OrganizationData)
+    private readonly organizationRepository: Repository<OrganizationData>,
+    private readonly idGen: ClockIDGenService,
+    private readonly wbcCodeGenService: WBSCodeGenService,
+    private readonly schoolRepository: SchoolRepository,
+  ) {}
+
+  async create(
+    organizationDto: Partial<OrganizationData>,
+    loggedInUser?: any,
+    manager?: EntityManager,
+  ): Promise<OrganizationData> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    const parentOrgId = organizationDto.parent_id;
+
+    if (parentOrgId) {
+      // Sub-org case: parent_id is present
+      const parentOrg = await repo.findOne({
+        where: { id: parentOrgId },
+      });
+
+      if (!parentOrg) {
+        throw new Error('Parent organization not found.');
+      }
+
+      if (!parentOrg.wbs_code) {
+        throw new Error('Parent organization must have a WBS code.');
+      }
+
+      // Find existing sub-orgs with the same parent_id
+      const existingSubOrgs = await repo.find({
+        where: {
+          parent_id: parentOrgId,
+        },
+        select: ['wbs_code'],
+      });
+
+      // Extract the last part of WBS codes (after the dot)
+      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);
+
+      // Generate next sequential code
+      const nextSubOrgCode = subOrgCodes.length
+        ? Math.max(...subOrgCodes) + 1
+        : 1;
+
+      const subOrgWbsCode = this.wbcCodeGenService.padCode(nextSubOrgCode);
+      organizationDto.wbs_code = `${parentOrg.wbs_code}.${subOrgWbsCode}`;
+    } else {
+      // Main org case: no parent_id
+      const existingOrgs = await repo.find({
+        where: {
+          parent_id: IsNull(),
+        },
+        select: ['wbs_code'],
+      });
+
+      // Extract WBS codes (should be simple numbers like 00001, 00002)
+      const orgCodes = existingOrgs
+        .map((org) => {
+          // If WBS code contains a dot, it's not a main org, skip it
+          if (org.wbs_code?.includes('.')) {
+            return null;
+          }
+          return org.wbs_code ? Number(org.wbs_code) : null;
+        })
+        .filter((code): code is number => code !== null);
+
+      // Generate next sequential code
+      const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
+
+      organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
+    }
+
+    organizationDto.code = this.idGen.idGenerator('ORG');
+    // organizationDto.status = 'ACTIVE';
+
+    if (loggedInUser) {
+      organizationDto.modified_by = loggedInUser.id;
+      organizationDto.created_by = loggedInUser.id;
+    }
+
+    const organization = repo.create(organizationDto);
+    return await repo.save(organization);
+  }
+
+  async findAll(manager?: EntityManager): Promise<OrganizationData[]> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    return await repo.find();
+  }
+
+  async findOne(
+    id: number,
+    manager?: EntityManager,
+  ): Promise<OrganizationData | null> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    return await repo.findOne({ where: { id } });
+  }
+
+  async findById(id: number | undefined) {
+    return await this.organizationRepository.find({ where: { id } });
+  }
+
+  async update(
+    id: number,
+    organizationDto: Partial<OrganizationData>,
+    loggedInUser?: any,
+    manager?: EntityManager,
+  ): Promise<OrganizationData | null> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    // Get existing organization
+    const existingOrg = await repo.findOne({ where: { id } });
+    if (!existingOrg) {
+      throw new Error(`Organization with id ${id} not found.`);
+    }
+
+    // Prevent circular reference - check if trying to set itself as parent
+    if (organizationDto.parent_id === id) {
+      throw new Error('Organization cannot be its own parent.');
+    }
+
+    // Check if parent_id is being changed
+    const parentIdChanged =
+      organizationDto.parent_id !== undefined &&
+      organizationDto.parent_id !== existingOrg.parent_id;
+
+    // If parent_id is being set or changed, recalculate WBS code
+    if (parentIdChanged) {
+      const newParentId = organizationDto.parent_id;
+
+      if (newParentId) {
+        // Sub-org case: parent_id is being set
+        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.');
+        }
+
+        // Prevent setting a descendant as parent (circular reference check)
+        if (parentOrg.wbs_code?.startsWith(existingOrg.wbs_code || '')) {
+          throw new Error(
+            'Cannot set a descendant organization as parent (circular reference).',
+          );
+        }
+
+        // Find existing sub-orgs with the same parent_id (excluding current org)
+        const existingSubOrgs = await repo.find({
+          where: {
+            parent_id: newParentId,
+          },
+          select: ['wbs_code', 'id'],
+        });
+
+        // Extract the last part of WBS codes (after the dot)
+        const subOrgCodes = existingSubOrgs
+          .filter((subOrg) => subOrg.id !== id) // Exclude current org
+          .map((subOrg) => {
+            const parts = subOrg.wbs_code?.split('.');
+            return parts && parts.length > 1 ? parts[parts.length - 1] : null;
+          })
+          .filter(Boolean)
+          .map(Number);
+
+        // Generate next sequential code
+        const nextSubOrgCode = subOrgCodes.length
+          ? Math.max(...subOrgCodes) + 1
+          : 1;
+
+        const subOrgWbsCode = this.wbcCodeGenService.padCode(nextSubOrgCode);
+        organizationDto.wbs_code = `${parentOrg.wbs_code}.${subOrgWbsCode}`;
+      } else {
+        // Main org case: parent_id is being removed
+        const existingOrgs = await repo.find({
+          where: {
+            parent_id: IsNull(),
+          },
+          select: ['wbs_code', 'id'],
+        });
+
+        // Extract WBS codes (should be simple numbers like 00001, 00002)
+        const orgCodes = existingOrgs
+          .filter((org) => org.id !== id) // Exclude current org
+          .map((org) => {
+            // If WBS code contains a dot, it's not a main org, skip it
+            if (org.wbs_code?.includes('.')) {
+              return null;
+            }
+            return org.wbs_code ? Number(org.wbs_code) : null;
+          })
+          .filter((code): code is number => code !== null);
+
+        // Generate next sequential code
+        const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
+
+        organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
+      }
+    }
+
+    // Set modified_by
+    if (loggedInUser) {
+      organizationDto.modified_by = loggedInUser.id;
+    }
+
+    await repo.update(id, organizationDto);
+    return await repo.findOne({ where: { id } });
+  }
+
+  async remove(id: number, manager?: EntityManager): Promise<void> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    await repo.delete(id);
+  }
+
+  async getOrganizationHierarchy(
+    userId: number,
+    appCode: string,
+    orgId: number,
+  ) {
+    return await this.schoolRepository.getUserContextDropdown(
+      userId,
+      appCode,
+      orgId,
+    );
+  }
+}

package/src/module/entity_json/controller/entity_json.controller.ts

@@ -1,47 +1,47 @@
-import {
-  Controller,
-  Get,
-  Param,
-  Post,
-  Query,
-  Req,
-  UseGuards,
-} from '@nestjs/common';
-import { EntityJSONService } from '../service/entity_json.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-
-@Controller('entity-json')
-export class EntityJSONController {
-  constructor(private readonly entityJSONService: EntityJSONService) {}
-
-  @Get('/:entityType')
-  @UseGuards(JwtAuthGuard)
-  async getEntityJson(
-    @Param('entityType') entityType: string,
-    @Req() req: Request & { user: any },
-    @Query('mode') mode?: 'flat_json' | 'dropdown',
-  ) {
-    const loggedInUser = req.user?.userData;
-    return this.entityJSONService.getAttributeForFlatJSON(
-      entityType,
-      loggedInUser,
-      mode,
-    );
-  }
-
-  @Post('/update-json/:entityId')
-  @UseGuards(JwtAuthGuard)
-  async updateEntityJson(
-    @Param('entityId') entityId: string,
-    @Query('entityType') entityType: string,
-    @Req() req: Request & { user: any },
-  ) {
-    const loggedInUser = req.user?.userData;
-
-    return this.entityJSONService.updateEntityJSON(
-      entityType,
-      Number(entityId),
-      loggedInUser,
-    );
-  }
-}
+import {
+  Controller,
+  Get,
+  Param,
+  Post,
+  Query,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { EntityJSONService } from '../service/entity_json.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('entity-json')
+export class EntityJSONController {
+  constructor(private readonly entityJSONService: EntityJSONService) {}
+
+  @Get('/:entityType')
+  @UseGuards(JwtAuthGuard)
+  async getEntityJson(
+    @Param('entityType') entityType: string,
+    @Req() req: Request & { user: any },
+    @Query('mode') mode?: 'flat_json' | 'dropdown',
+  ) {
+    const loggedInUser = req.user?.userData;
+    return this.entityJSONService.getAttributeForFlatJSON(
+      entityType,
+      loggedInUser,
+      mode,
+    );
+  }
+
+  @Post('/update-json/:entityId')
+  @UseGuards(JwtAuthGuard)
+  async updateEntityJson(
+    @Param('entityId') entityId: string,
+    @Query('entityType') entityType: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user?.userData;
+
+    return this.entityJSONService.updateEntityJSON(
+      entityType,
+      Number(entityId),
+      loggedInUser,
+    );
+  }
+}

package/src/module/entity_json/entity/entityJson.entity.ts

@@ -1,39 +1,39 @@
-import {
-  Entity,
-  PrimaryGeneratedColumn,
-  Column,
-  CreateDateColumn,
-  UpdateDateColumn,
-  Unique,
-  Index,
-} from 'typeorm';
-
-@Entity('frm_entity_json')
-@Unique(['entity_type', 'entity_id'])
-export class EntityJson {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Index()
-  @Column({ type: 'varchar', length: 100 })
-  entity_type: string;
-
-  @Index()
-  @Column({ type: 'int' })
-  entity_id: number;
-
-  @Column({ type: 'json', nullable: false })
-  json_data: Record<string, any>;
-
-  @Column({ type: 'int', nullable: true })
-  created_by: number;
-
-  @Column({ type: 'int', nullable: true })
-  updated_by: number;
-
-  @CreateDateColumn({ type: 'timestamp', nullable: true })
-  created_at: Date;
-
-  @UpdateDateColumn({ type: 'timestamp', nullable: true })
-  updated_at: Date;
-}
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  UpdateDateColumn,
+  Unique,
+  Index,
+} from 'typeorm';
+
+@Entity('frm_entity_json')
+@Unique(['entity_type', 'entity_id'])
+export class EntityJson {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Index()
+  @Column({ type: 'varchar', length: 100 })
+  entity_type: string;
+
+  @Index()
+  @Column({ type: 'int' })
+  entity_id: number;
+
+  @Column({ type: 'json', nullable: false })
+  json_data: Record<string, any>;
+
+  @Column({ type: 'int', nullable: true })
+  created_by: number;
+
+  @Column({ type: 'int', nullable: true })
+  updated_by: number;
+
+  @CreateDateColumn({ type: 'timestamp', nullable: true })
+  created_at: Date;
+
+  @UpdateDateColumn({ type: 'timestamp', nullable: true })
+  updated_at: Date;
+}

package/src/module/entity_json/entity_json.module.ts

@@ -1,18 +1,18 @@
-import { Module } from '@nestjs/common';
-import { EntityModule } from '../meta/entity.module';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { EntityJSONService } from './service/entity_json.service';
-import { EntityJSONController } from './controller/entity_json.controller';
-import { FilterModule } from '../filter/filter.module';
-import { UtilsModule } from 'src/utils/utils.module';
-import { EntityJson } from './entity/entityJson.entity';
-import { EntityJSONRepository } from './service/entityJson.repository';
-
-
-@Module({
-  imports: [EntityModule, TypeOrmModule.forFeature([EntityJson]),FilterModule,UtilsModule],
-  controllers: [EntityJSONController],
-  providers: [EntityJSONService,EntityJSONRepository],
-  exports: [],
-})
-export class EntityJSONModule {}
+import { Module } from '@nestjs/common';
+import { EntityModule } from '../meta/entity.module';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { EntityJSONService } from './service/entity_json.service';
+import { EntityJSONController } from './controller/entity_json.controller';
+import { FilterModule } from '../filter/filter.module';
+import { UtilsModule } from 'src/utils/utils.module';
+import { EntityJson } from './entity/entityJson.entity';
+import { EntityJSONRepository } from './service/entityJson.repository';
+
+
+@Module({
+  imports: [EntityModule, TypeOrmModule.forFeature([EntityJson]),FilterModule,UtilsModule],
+  controllers: [EntityJSONController],
+  providers: [EntityJSONService,EntityJSONRepository],
+  exports: [],
+})
+export class EntityJSONModule {}