rez_core 2.1.56 → 2.1.57

package/dist/utils/service/codeGenerator.service.d.ts

@@ -0,0 +1,3 @@
+export declare class CodeGeneratorService {
+    static generateCode(input_string: string): string;
+}

package/dist/utils/service/codeGenerator.service.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CodeGeneratorService = void 0;
+class CodeGeneratorService {
+    static generateCode(input_string) {
+        if (!input_string) {
+            throw new Error('Input string cannot be empty');
+        }
+        let code = input_string.trim().toLowerCase();
+        code = code.replace(/\s+/g, '_');
+        const sanitizedCode = code.replace(/[^a-z0-9_]/g, '');
+        if (!sanitizedCode) {
+            throw new Error('Invalid input string, cannot generate code');
+        }
+        return sanitizedCode;
+    }
+}
+exports.CodeGeneratorService = CodeGeneratorService;
+//# sourceMappingURL=codeGenerator.service.js.map

package/dist/utils/service/codeGenerator.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codeGenerator.service.js","sourceRoot":"","sources":["../../../src/utils/service/codeGenerator.service.ts"],"names":[],"mappings":";;;AAAA,MAAa,oBAAoB;IAC/B,MAAM,CAAC,YAAY,CAAC,YAAoB;QACtC,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QAGD,IAAI,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAG7C,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAGjC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAEtD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AArBD,oDAqBC"}

package/package.json

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

package/src/module/listmaster/controller/list-master.controller.ts

@@ -55,10 +55,14 @@ export class ListMasterController {
   @HttpCode(HttpStatus.OK)
   async getListMasterItems(
     @Param('type') type: string,
+    @Req() req: Request & { user: any },
     @Query('search') search?: string,
   ) {
+    const loggedInUser = req.user.userData;
+
     return await this.listMasterItemService.getListMasterItemsByType(
       type,
+      loggedInUser.organization_id,
       search,
     );
   }
@@ -66,10 +70,15 @@ export class ListMasterController {
   @Get('')
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)
-  async getAllListMasterItems(
+  async getAllListMasters(
+    @Req() req: Request & { user: any },
     @Query('search') search?: string,
-  ): Promise<any[]> {
-    return await this.service.getAllListMasterItems(search);
+  ) {
+    const loggedInUser = req.user.userData;
+    return await this.service.getAllListMasterByOrganization(
+      loggedInUser.organization_id,
+      search,
+    );
   }
 
   @Post('/upsertListMasterItem/:type')

package/src/module/listmaster/repository/list-master-items.repository.ts

@@ -28,10 +28,16 @@ export class ListMasterItemsRepository {
     return items.map((i) => ({ label: i.name, value: i.value }));
   }
 
-  async findAllItemsByListType(type: string, sortBy: string, search?: string) {
+  async findAllItemsByListType(
+    type: string,
+    sortBy: string,
+    organizationId: number,
+    search?: string,
+  ) {
     const qb = this.repo
       .createQueryBuilder('item')
-      .where('item.listtype = :type', { type });
+      .where('item.listtype = :type', { type })
+      .andWhere('item.organization_id = :organizationId', { organizationId });
 
     if (search?.trim()) {
       qb.andWhere(
@@ -45,9 +51,12 @@ export class ListMasterItemsRepository {
     return await qb.getMany();
   }
 
-  async findOneByCodeAndType(code: string, type: string) {
+  // more generic find method
+  async findOneByCondition(condition: Partial<ListMasterItems>) {
     return this.repo.findOne({
-      where: { code, listtype: type },
+      where: {
+        ...condition,
+      },
     });
   }
 

package/src/module/listmaster/repository/list-master.repository.ts

@@ -14,14 +14,16 @@ export class ListMasterRepository {
     return this.repo.findOne({ where: { type } });
   }
 
-  findByName(name: string) {
-    return this.repo.findOne({ where: { name } });
+  // much better generic find method
+  async findOneByCondition(condition: Partial<ListMasterData>) {
+    return await this.repo.findOne({ where: condition });
   }
 
-  async findAllItems(search?: string) {
+  async findAllItems(organizationId: number, search?: string) {
     const qb = this.repo
       .createQueryBuilder('item')
-      .where('item.source = :source', { source: 'master' });
+      .where('item.source = :source', { source: 'master' })
+      .andWhere('item.organization_id = :organizationId', { organizationId });
 
     if (search?.trim()) {
       qb.andWhere(

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

@@ -7,6 +7,7 @@ import {
 import { ListMasterItemsRepository } from '../repository/list-master-items.repository';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { UserData } from 'src/module/user/entity/user.entity';
+import { CodeGeneratorService } from 'src/utils/service/codeGenerator.service';
 
 @Injectable()
 export class ListMasterItemService {
@@ -17,12 +18,35 @@ export class ListMasterItemService {
     private readonly entityServiceImpl: EntityServiceImpl,
   ) {}
 
-  async getListMasterItemsByType(listType: string, search?: string) {
-    return this.listItemsRepo.findAllItemsByListType(listType, 'asc', search);
+  async getListMasterItemsByType(
+    listType: string,
+    organization_id: number,
+    search?: string,
+  ) {
+    // this method retrieves all list master items for a specific type and organization
+    return this.listItemsRepo.findAllItemsByListType(
+      listType,
+      'asc',
+      organization_id,
+      search,
+    );
   }
 
   async createEntity(entityData: any, loggedInUser: UserData): Promise<any> {
-    return await this.entityServiceImpl.createEntity(entityData, loggedInUser);
+    try {
+      const generatedCode = CodeGeneratorService.generateCode(entityData.name);
+
+      entityData.code = generatedCode;
+      entityData.organization_id = loggedInUser.organization_id;
+      entityData.value = generatedCode;
+
+      return await this.entityServiceImpl.createEntity(
+        entityData,
+        loggedInUser,
+      );
+    } catch (error) {
+      throw error;
+    }
   }
 
   async updateEntity(entityData: any, loggedInUser: UserData): Promise<any> {
@@ -34,15 +58,33 @@ export class ListMasterItemService {
     items: any[],
     loggedInUser,
   ): Promise<any> {
+    const orgId = loggedInUser.organization_id;
+
     for (const item of items) {
+      const name = item.name?.trim();
+      const code = item.code?.trim();
+
+      if (!name) continue; // Skip invalid item
+
       let existingItem;
 
-      // If code is provided, use it for lookup
-      if (item.code) {
-        existingItem = await this.listItemsRepo.findOneByCodeAndType(
-          item.code,
-          listType,
-        );
+      // Priority: lookup by code + name
+      if (code) {
+        existingItem = await this.listItemsRepo.findOneByCondition({
+          code,
+          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 (existingItem) {
@@ -55,26 +97,22 @@ export class ListMasterItemService {
           loggedInUser,
         );
       } else {
-        const createdItem = await this.createEntity(
+        await this.createEntity(
           {
             ...item,
             listtype: listType,
+            name,
             value: '',
           },
           loggedInUser,
         );
-
-        // now update the value of the item to its code
-
-        await this.listItemsRepo.update(createdItem.id, {
-          value: createdItem.code,
-        });
       }
     }
 
     const updatedItems = await this.listItemsRepo.findAllItemsByListType(
       listType,
       'asc',
+      orgId,
     );
 
     return {
@@ -84,7 +122,10 @@ export class ListMasterItemService {
   }
 
   async deleteListMasterItem(listType: string, code: string): Promise<string> {
-    const item = await this.listItemsRepo.findOneByCodeAndType(code, listType);
+    const item = await this.listItemsRepo.findOneByCondition({
+      code,
+      listtype: listType,
+    });
     if (!item) {
       throw new NotFoundException(
         `Item with name ${code} not found in type ${listType}`,

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

@@ -241,13 +241,16 @@ export class ListMasterService {
     entityData.is_factory = entityData.is_factory || 0;
     entityData.source = entityData.source || 'master';
     entityData.status = entityData.status || 'ACTIVE';
-    entityData.type = entityData.type || 'LIST_MASTER';
+    entityData.type = entityData.code;
     entityData.sort_by = entityData.sort_by || 'asc';
+    entityData.organization_id = loggedInUser.organization_id;
 
     // check if a list master with the same type already exists
-    const existingListMaster = await this.listMasterRepo.findByName(
-      entityData.name,
-    );
+    const existingListMaster = await this.listMasterRepo.findOneByCondition({
+      name: entityData.name,
+      code: entityData.code,
+      organization_id: loggedInUser.organization_id,
+    });
 
     if (existingListMaster) {
       throw new BadRequestException(
@@ -264,11 +267,6 @@ export class ListMasterService {
       throw new BadRequestException('Failed to create entity');
     }
 
-    createdListMaster.type = createdListMaster.code;
-
-    // update the type of the created list master to code
-    await this.entityServiceImpl.updateEntity(createdListMaster, loggedInUser);
-
     return createdListMaster;
   }
 
@@ -280,7 +278,10 @@ export class ListMasterService {
     return await this.entityServiceImpl.getEntityData(entity_type, id);
   }
 
-  async getAllListMasterItems(search?: string): Promise<any[]> {
-    return await this.listMasterRepo.findAllItems(search);
+  async getAllListMasterByOrganization(
+    organizationId: number,
+    search?: string,
+  ): Promise<any[]> {
+    return await this.listMasterRepo.findAllItems(organizationId, search);
   }
 }

package/src/utils/service/codeGenerator.service.ts

@@ -0,0 +1,22 @@
+export class CodeGeneratorService {
+  static generateCode(input_string: string) {
+    if (!input_string) {
+      throw new Error('Input string cannot be empty');
+    }
+
+    // Step 1: Trim, to lowercase
+    let code = input_string.trim().toLowerCase();
+
+    // Step 2: Replace all whitespace with underscores
+    code = code.replace(/\s+/g, '_');
+
+    // Step 3: Remove all non-alphanumeric and non-underscore characters
+    const sanitizedCode = code.replace(/[^a-z0-9_]/g, '');
+
+    if (!sanitizedCode) {
+      throw new Error('Invalid input string, cannot generate code');
+    }
+
+    return sanitizedCode;
+  }
+}