rez_core 6.5.28 → 6.5.29

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

@@ -1,75 +1,5 @@
-// import { Injectable } from '@nestjs/common';
-// import { InjectRepository } from '@nestjs/typeorm';
-//
-// @Injectable()
-// export class BrandService {
-//   constructor(
-//     @InjectRepository(Brand)
-//   ) {
-//
-//   }
-//
-//   async getEntityData(
-//     entityType: string,
-//     id: number,
-//     loggedInUser,
-//   ): Promise<any> {
-//     const brandResponse = await super.getEntityData(
-//       entityType,
-//       id,
-//       loggedInUser,
-//     );
-//
-//     return brandResponse;
-//   }
-//
-//   async createEntity(body: any, userData): Promise<any> {
-//     const { entity_type, ...data } = body;
-//
-//     const brandData = await super.createEntity(
-//       {
-//         ...data,
-//
-//         entity_type: 'ORG',
-//         type: 'BRN',
-//         parent_id: userData.organization_id,
-//       },
-//       userData,
-//     );
-//
-//     // save brand profile
-//
-//     const brandProfile = await super.createEntity(
-//       {
-//         ...body,
-//         parent_id: brandData.id,
-//         organization_id: brandData.organization_id,
-//         entity_type: 'BRNP',
-//       },
-//       userData,
-//     );
-//
-//     return brandProfile;
-//   }
-//
-//   async updateEntity(body: any, userData): Promise<any> {
-//     // update brand table
-//     const { id, entity_type, organization_id, ...newBody } = body;
-//
-//     const brandProfile = await super.updateEntity(body, userData);
-//
-//     // update brand
-//     await super.updateEntity(
-//       {
-//         ...newBody,
-//         id: brandProfile.parent_id,
-//         parent_id: userData.organization_id,
-//         entity_type: 'ORG',
-//         type: 'BRN',
-//       },
-//       userData,
-//     );
-//
-//     return brandProfile;
-//   }
-// }
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+
+@Injectable()
+export class BrandService extends EntityServiceImpl {}

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

@@ -6,17 +6,11 @@ import { EnterpriseData } from '../entity/enterprise.entity';
 export class EnterpriseService {
   constructor(private readonly enterpriseRepository: EnterpriseRepository) {}
 
-  async create(
-    enterpriseData: EnterpriseData,
-    loggedInUser: any,
-  ): Promise<EnterpriseData> {
-    return await this.enterpriseRepository.save(enterpriseData, loggedInUser);
+  async create(enterpriseData: EnterpriseData): Promise<EnterpriseData> {
+    return await this.enterpriseRepository.save(enterpriseData);
   }
 
-  async update(
-    enterpriseData: EnterpriseData,
-    loggedInUser: any,
-  ): Promise<EnterpriseData | null> {
-    return await this.enterpriseRepository.update(enterpriseData, loggedInUser);
+  async update(enterpriseData: EnterpriseData): Promise<EnterpriseData | null> {
+    return await this.enterpriseRepository.update(enterpriseData);
   }
 }

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

@@ -12,24 +12,29 @@ export class OrganizationService {
   constructor(
     @InjectRepository(OrganizationData)
     private readonly organizationRepository: Repository<OrganizationData>,
-    private readonly schoolRepository: SchoolRepository,
     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;
+    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.');
+      }
 
-    if (parentOrgId) {
-      // Sub-org case: parent_id is present
       const parentOrg = await repo.findOne({
         where: { id: parentOrgId },
       });
@@ -38,55 +43,37 @@ export class OrganizationService {
         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({
+      const existingBrands = await repo.find({
         where: {
+          type: 'BRN',
           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;
-        })
+      const brandCodes = existingBrands
+        .map((b) => b.wbs_code?.split('.')[1])
         .filter(Boolean)
         .map(Number);
 
-      // Generate next sequential code
-      const nextSubOrgCode = subOrgCodes.length
-        ? Math.max(...subOrgCodes) + 1
-        : 1;
+      const nextBrnCode = brandCodes.length ? Math.max(...brandCodes) + 1 : 1;
 
-      const subOrgWbsCode = this.wbcCodeGenService.padCode(nextSubOrgCode);
-      organizationDto.wbs_code = `${parentOrg.wbs_code}.${subOrgWbsCode}`;
+      const brnWbsCode = this.wbcCodeGenService.padCode(nextBrnCode);
+      organizationDto.wbs_code = `${parentOrg.wbs_code}.${brnWbsCode}`;
     } else {
-      // Main org case: no parent_id
+      // ORG case
       const existingOrgs = await repo.find({
         where: {
-          parent_id: IsNull(),
+          type: 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);
+        .map((org) => org.wbs_code)
+        .filter(Boolean)
+        .map(Number);
 
-      // Generate next sequential code
       const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
 
       organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
@@ -94,11 +81,7 @@ export class OrganizationService {
 
     organizationDto.code = this.idGen.idGenerator('ORG');
     // organizationDto.status = 'ACTIVE';
-
-    if (loggedInUser) {
-      organizationDto.modified_by = loggedInUser.id;
-      organizationDto.created_by = loggedInUser.id;
-    }
+    organizationDto.created_date = new Date();
 
     const organization = repo.create(organizationDto);
     return await repo.save(organization);
@@ -130,112 +113,12 @@ export class OrganizationService {
   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 } });
   }

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

@@ -44,4 +44,17 @@ export class EntityJSONController {
       loggedInUser,
     );
   }
+
+  // @Get('/get_attributes/:entityType')
+  // @UseGuards(JwtAuthGuard)
+  // async getAttributesByMappedEntityType(
+  //   @Param('entityType') entityType: string,
+  //   @Req() req: Request & { user: any },
+  // ) {
+  //   const loggedInUser = req.user?.userData;
+  //   return this.entityJSONService.getAttributesByMappedEntityType(
+  //     entityType,
+  //     loggedInUser,
+  //   );
+  // }
 }