rez_core 2.1.70 → 2.1.72

package/package.json

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

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

@@ -26,7 +26,12 @@ export class OrganizationController {
   async getOrganizationHierarchy(@Req() req: Request & { user: any }) {
     const userId = req.user.userData?.id;
     const appcode = req.user.userData?.appcode;
+    const org_id = req.user.userData?.organization_id;
 
-    return await this.orgService.getOrganizationHierarchy(userId, appcode);
+    return await this.orgService.getOrganizationHierarchy(
+      userId,
+      appcode,
+      org_id,
+    );
   }
 }

package/src/module/enterprise/repository/school.repository.ts

@@ -24,7 +24,7 @@ export class SchoolRepository {
     });
   }
 
-  async getUserContextDropdown(userId: number, appCode: string) {
+  async getUserContextDropdown(userId: number, appCode: string, org_id) {
     const userRoleRepo = this.dataSource.getRepository(UserRoleMapping);
 
     const hasOrgAccess = await userRoleRepo
@@ -34,6 +34,11 @@ export class SchoolRepository {
       .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
       .getRawMany();
 
+    let currentORGLevel_id = hasOrgAccess[0]?.urm_level_id;
+    if (hasOrgAccess[0].urm_level_id == 1) {
+      currentORGLevel_id = org_id;
+    }
+
     if (hasOrgAccess.length > 0) {
       const schools = await this.dataSource
         .createQueryBuilder()
@@ -53,7 +58,7 @@ export class SchoolRepository {
         .from('cr_school', 'sch')
         .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
         .innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
-        .where('org.id = :orgId', { orgId: hasOrgAccess[0].urm_level_id })
+        .where('org.id = :orgId', { orgId: currentORGLevel_id })
         .getRawMany();
 
       const result = {};

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

@@ -78,7 +78,15 @@ export class OrganizationService {
     await repo.delete(id);
   }
 
-  async getOrganizationHierarchy(userId: number, appCode: string) {
-    return await this.schoolRepository.getUserContextDropdown(userId, appCode);
+  async getOrganizationHierarchy(
+    userId: number,
+    appCode: string,
+    orgId: number,
+  ) {
+    return await this.schoolRepository.getUserContextDropdown(
+      userId,
+      appCode,
+      orgId,
+    );
   }
 }

package/src/module/listmaster/service/list-master-item.service.ts

@@ -61,54 +61,93 @@ export class ListMasterItemService {
   ): Promise<any> {
     const orgId = loggedInUser.organization_id;
 
-    for (const item of items) {
+    const errors: any[] = [];
+
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i];
       const name = item.name?.trim();
       const code = item.code?.trim();
 
-      if (!name) {
-        throw new BadRequestException('Name is required and cannot be empty');
-      }
-
-      let existingItem;
+      try {
+        if (!name) {
+          throw new BadRequestException(`name is missing at index ${i}`);
+        }
 
-      // Priority: lookup by code + name
-      if (code) {
-        existingItem = await this.listItemsRepo.findOneByCondition({
-          code,
+        if (code) {
+          // Check if code exists
+          const existingItem = await this.listItemsRepo.findOneByCondition({
+            code,
+            listtype: listType,
+            organization_id: orgId,
+          });
+
+          if (existingItem) {
+            // It's an update — check if name is changing to a used name
+            if (existingItem.name.toLowerCase() !== name.toLowerCase()) {
+              const nameExists = await this.listItemsRepo.findOneByCondition({
+                name,
+                listtype: listType,
+                organization_id: orgId,
+              });
+
+              if (nameExists && nameExists.id !== existingItem.id) {
+                throw new BadRequestException(
+                  `${name} already used by another item`,
+                );
+              }
+            }
+
+            // Update the existing item
+            await this.updateEntity(
+              {
+                ...existingItem,
+                ...item,
+                name,
+                listtype: listType,
+              },
+              loggedInUser,
+            );
+
+            continue;
+          }
+        }
+
+        // Creation path
+        const nameExists = await this.listItemsRepo.findOneByCondition({
           name,
           listtype: listType,
           organization_id: orgId,
         });
-      }
 
-      // Fallback: lookup by name only if not found above
-      if (!existingItem) {
-        existingItem = await this.listItemsRepo.findOneByCondition({
-          name,
-          listtype: listType,
-          organization_id: orgId,
-        });
-      }
+        if (nameExists) {
+          throw new BadRequestException(
+            `list item with name ${name} already exists`,
+          );
+        }
+
+        const finalCode = code || ''; // Could generate code here if needed
 
-      if (existingItem) {
-        await this.updateEntity(
-          {
-            ...existingItem,
-            ...item,
-            listtype: listType,
-          },
-          loggedInUser,
-        );
-      } else {
         await this.createEntity(
           {
             ...item,
-            listtype: listType,
             name,
+            code: finalCode,
+            listtype: listType,
             value: '',
           },
           loggedInUser,
         );
+      } catch (error) {
+        errors.push({
+          row: i,
+          error: [
+            {
+              field: 'name',
+              message:
+                error.message || 'An error occurred while processing the item',
+            },
+          ],
+        });
       }
     }
 
@@ -119,7 +158,9 @@ export class ListMasterItemService {
     );
 
     return {
+      success: errors.length === 0,
       listType,
+      errors,
       items: updatedItems,
     };
   }