rez_core 6.5.71 → 6.5.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "6.5.71",
+  "version": "6.5.73",
   "description": "",
   "author": "",
   "private": false,

package/src/module/app_master/service/app-master.service.ts

@@ -1,17 +1,18 @@
 import { Injectable } from '@nestjs/common';
 import { UserRoleMappingRepository } from 'src/module/user/repository/user-role-mapping.repository';
 import { AppMasterRespository } from '../repository/app-master.repository';
+import { UserRoleMappingService } from 'src/module/user/service/user-role-mapping.service';
 
 @Injectable()
 export class AppMasterService {
   constructor(
     private readonly appMasterRepository: AppMasterRespository,
-    private readonly userRoleMappingRepository: UserRoleMappingRepository,
+    private readonly userRoleMappingService:UserRoleMappingService
   ) {}
 
   async getAppMasterDataByAppCode(userId: number) {
     const app_code =
-      await this.userRoleMappingRepository.findDistinctAppcodeByUserId(userId);
+      await this.userRoleMappingService.findDistinctAppcodeByUserId(userId);
 
     const finalResult: any[] = [];
 

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

@@ -12,6 +12,7 @@ import {
   HttpCode,
   HttpStatus,
   ParseIntPipe,
+  BadRequestException,
 } from '@nestjs/common';
 import { Request } from 'express';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
@@ -79,9 +80,15 @@ export class OrganizationController {
     @Param('id', ParseIntPipe) id: number,
     @Body() organizationDto: Partial<OrganizationData>,
     @Req() req: Request & { user: any },
-  ): Promise<OrganizationData | null> {
+  ): Promise<OrganizationData> {
     const loggedInUser = req.user.userData;
-    return await this.orgService.update(id, organizationDto, loggedInUser);
+    const result = await this.orgService.update(id, organizationDto, loggedInUser);
+    
+    if (!result.success) {
+      throw new BadRequestException(result.error);
+    }
+    
+    return result.data;
   }
 
   @Delete(':id')

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

@@ -10,6 +10,11 @@ import { SchoolRepository } from '../repository/school.repository';
 import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
 import { StatusConstant } from '../../../constant/status.constant';
 
+// Type for update operation result
+export type UpdateResult<T> = 
+  | { success: true; data: T }
+  | { success: false; error: string };
+
 @Injectable()
 export class OrganizationService {
   constructor(
@@ -138,7 +143,7 @@ export class OrganizationService {
     organizationDto: Partial<OrganizationData>,
     loggedInUser?: any,
     manager?: EntityManager,
-  ): Promise<OrganizationData | null> {
+  ): Promise<UpdateResult<OrganizationData>> {
     const repo = manager
       ? manager.getRepository(OrganizationData)
       : this.organizationRepository;
@@ -146,12 +151,18 @@ export class OrganizationService {
     // Get existing organization
     const existingOrg = await repo.findOne({ where: { id } });
     if (!existingOrg) {
-      throw new Error(`Organization with id ${id} not found.`);
+      return {
+        success: false,
+        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.');
+      return {
+        success: false,
+        error: 'Organization cannot be its own parent.',
+      };
     }
 
     // Check if parent_id is being changed
@@ -161,7 +172,19 @@ export class OrganizationService {
 
     // If parent_id is being set or changed, recalculate WBS code
     if (parentIdChanged) {
+      // VALIDATION: Cannot change parent of organizations with WBS code length 5 or 11
+      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) {
         // Sub-org case: parent_id is being set
@@ -170,18 +193,39 @@ export class OrganizationService {
         });
 
         if (!parentOrg) {
-          throw new Error('Parent organization not found.');
+          return {
+            success: false,
+            error: 'Parent organization not found.',
+          };
         }
 
         if (!parentOrg.wbs_code) {
-          throw new Error('Parent organization must have a WBS code.');
+          return {
+            success: false,
+            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).',
-          );
+        // CIRCULAR DEPENDENCY CHECK: Prevent setting a descendant as parent
+        // This checks if the proposed parent is actually a child/descendant of the current org
+        if (existingOrg.wbs_code && parentOrg.wbs_code) {
+          // Check if parent's WBS starts with current org's WBS (parent is a descendant)
+          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).`,
+            };
+          }
+          
+          // Also check if they're the same (redundant with earlier check, but explicit)
+          if (parentOrg.wbs_code === existingOrg.wbs_code) {
+            return {
+              success: false,
+              error: 'Organization cannot be its own parent (circular reference).',
+            };
+          }
         }
 
         // Find existing sub-orgs with the same parent_id (excluding current org)
@@ -235,6 +279,17 @@ export class OrganizationService {
 
         organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
       }
+
+      // CASCADE UPDATE: Update all descendant organizations' WBS codes
+      const newWbsCode = organizationDto.wbs_code;
+      if (oldWbsCode && newWbsCode && oldWbsCode !== newWbsCode) {
+        await this.updateDescendantWbsCodes(
+          repo,
+          oldWbsCode,
+          newWbsCode,
+          loggedInUser,
+        );
+      }
     }
 
     // Set modified_by
@@ -243,7 +298,19 @@ export class OrganizationService {
     }
 
     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: number, manager?: EntityManager): Promise<void> {
@@ -254,6 +321,45 @@ export class OrganizationService {
     await repo.delete(id);
   }
 
+  /**
+   * Recursively updates WBS codes for all descendant organizations
+   * when a parent organization's WBS code changes
+   */
+  private async updateDescendantWbsCodes(
+    repo: Repository<OrganizationData>,
+    oldWbsCode: string,
+    newWbsCode: string,
+    loggedInUser?: any,
+  ): Promise<void> {
+    // Find all organizations whose WBS code starts with the old WBS code
+    // This will get all direct and indirect descendants
+    const descendants = await repo
+      .createQueryBuilder('org')
+      .where('org.wbs_code LIKE :pattern', { pattern: `${oldWbsCode}.%` })
+      .getMany();
+
+    // Update each descendant's WBS code
+    for (const descendant of descendants) {
+      if (descendant.wbs_code) {
+        // Replace the old WBS prefix with the new one
+        const updatedWbsCode = descendant.wbs_code.replace(
+          oldWbsCode,
+          newWbsCode,
+        );
+
+        const updateData: Partial<OrganizationData> = {
+          wbs_code: updatedWbsCode,
+        };
+
+        if (loggedInUser) {
+          updateData.modified_by = loggedInUser.id;
+        }
+
+        await repo.update(descendant.id, updateData);
+      }
+    }
+  }
+
   async getOrganizationHierarchy(
     userId: number,
     appCode: string,

package/src/module/enterprise/service/populate-meta.service.ts

@@ -109,7 +109,7 @@ export class PopulateMetaService {
         transformRepo = relationRepo;
         const factoryData = await transformRepo?.find({
           where: {
-            organization_id: -1,
+            enterprise_id: -1,
             level_type: 'ORG',
             level_id: -1,
           },
@@ -130,7 +130,7 @@ export class PopulateMetaService {
         transformRepo = viewMasterRepo;
         const factoryData = await transformRepo?.find({
           where: {
-            organization_id: -1,
+            enterprise_id: -1,
             level_type: 'ORG',
             level_id: -1,
           },
@@ -138,7 +138,7 @@ export class PopulateMetaService {
         transformedData = factoryData.map(
           ({ id, created_date, modified_date, ...rest }) => ({
             ...rest,
-            organization_id,
+            enterprise_id,
             level_type: 'ORG',
             level_id: organization_id,
             status: status,
@@ -159,7 +159,7 @@ export class PopulateMetaService {
 
     const entityTables = await entityTableRepo.find({
       where: {
-        organization_id: -1,
+        enterprise_id: -1,
         level_type: 'ORG',
         level_id: -1,
       },
@@ -181,7 +181,7 @@ export class PopulateMetaService {
 
       const entityTableColumns = await entityTableColumnRepo.find({
         where: {
-          organization_id: -1,
+          enterprise_id: -1,
           level_type: 'ORG',
           level_id: -1,
           mapped_entity_type: mapped_entity_type,

package/src/module/user/service/user-role-mapping.service.ts

@@ -117,4 +117,12 @@ export class UserRoleMappingService {
     // Let's assume it's a UserRoleMapping compatible object.
     return await this.assignUserRole(data);
   }
+
+  async findDistinctAppcodeByUserId(
+    userId: number,
+  ): Promise<{ appcode: string[] }> {
+    return await this.userRoleMappingRepository.findDistinctAppcodeByUserId(
+      userId,
+    );
+  }
 }

package/.claude/settings.local.json

@@ -1,26 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npm run build:*)",
-      "Bash(npm install)",
-      "Bash(npm run lint)",
-      "Bash(npm install:*)",
-      "Bash(curl:*)",
-      "Bash(npm run start:dev:*)",
-      "Bash(mkdir:*)",
-      "Bash(lsof:*)",
-      "Bash(kill:*)",
-      "Bash(npx eslint:*)",
-      "Read(/Users/admin/yash/**)",
-      "Bash(timeout 15 npm run start:dev)",
-      "Read(/Users/admin/yash/**)",
-      "Bash(find:*)",
-      "Bash(sed:*)",
-      "Bash(git checkout:*)",
-      "Read(//Users/admin/yash/**)",
-      "Bash(npx tsc:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

package/.idea/250218_nodejs_core.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/Project.xml

@@ -1,59 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/copilot.data.migration.agent.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AgentMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

package/.idea/copilot.data.migration.ask.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AskMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

package/.idea/copilot.data.migration.ask2agent.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Ask2AgentMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

package/.idea/copilot.data.migration.edit.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EditMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/250218_nodejs_core.iml" filepath="$PROJECT_DIR$/.idea/250218_nodejs_core.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="DISABLED" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>