rez_core 2.1.55 → 2.1.56

package/package.json

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

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

@@ -53,10 +53,25 @@ export class ListMasterController {
   @Get('/getListMasterItems/:type')
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)
-  async getListMasterItems(@Param('type') type: string) {
-    console.log('Fetching list master items for type:', type);
-    return await this.listMasterItemService.getListMasterItemsByType(type);
+  async getListMasterItems(
+    @Param('type') type: string,
+    @Query('search') search?: string,
+  ) {
+    return await this.listMasterItemService.getListMasterItemsByType(
+      type,
+      search,
+    );
   }
+
+  @Get('')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getAllListMasterItems(
+    @Query('search') search?: string,
+  ): Promise<any[]> {
+    return await this.service.getAllListMasterItems(search);
+  }
+
   @Post('/upsertListMasterItem/:type')
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)

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

@@ -28,11 +28,21 @@ export class ListMasterItemsRepository {
     return items.map((i) => ({ label: i.name, value: i.value }));
   }
 
-  async findAllItemsByListType(type: string, sortBy: string) {
-    return this.repo.find({
-      where: { listtype: type },
-      order: { sortindex: sortBy === 'asc' ? 'ASC' : 'DESC' },
-    });
+  async findAllItemsByListType(type: string, sortBy: string, search?: string) {
+    const qb = this.repo
+      .createQueryBuilder('item')
+      .where('item.listtype = :type', { type });
+
+    if (search?.trim()) {
+      qb.andWhere(
+        '(LOWER(item.name) LIKE :search OR LOWER(item.code) LIKE :search)',
+        { search: `%${search.toLowerCase()}%` },
+      );
+    }
+
+    qb.orderBy('item.sortindex', sortBy === 'asc' ? 'ASC' : 'DESC');
+
+    return await qb.getMany();
   }
 
   async findOneByCodeAndType(code: string, type: string) {

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

@@ -17,4 +17,19 @@ export class ListMasterRepository {
   findByName(name: string) {
     return this.repo.findOne({ where: { name } });
   }
+
+  async findAllItems(search?: string) {
+    const qb = this.repo
+      .createQueryBuilder('item')
+      .where('item.source = :source', { source: 'master' });
+
+    if (search?.trim()) {
+      qb.andWhere(
+        '(LOWER(item.name) LIKE :search OR LOWER(item.code) LIKE :search)',
+        { search: `%${search.toLowerCase()}%` },
+      );
+    }
+
+    return await qb.getMany();
+  }
 }

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

@@ -17,8 +17,8 @@ export class ListMasterItemService {
     private readonly entityServiceImpl: EntityServiceImpl,
   ) {}
 
-  async getListMasterItemsByType(listType: string) {
-    return await this.listItemsRepo.findAllItemsByListType(listType, 'asc');
+  async getListMasterItemsByType(listType: string, search?: string) {
+    return this.listItemsRepo.findAllItemsByListType(listType, 'asc', search);
   }
 
   async createEntity(entityData: any, loggedInUser: UserData): Promise<any> {
@@ -34,26 +34,17 @@ export class ListMasterItemService {
     items: any[],
     loggedInUser,
   ): Promise<any> {
-    console.log('Upserting list master items for type:', listType);
-
     for (const item of items) {
-      console.log('Processing item:', item);
-
       let existingItem;
 
       // If code is provided, use it for lookup
       if (item.code) {
-        console.log('Code provided:', item.code);
         existingItem = await this.listItemsRepo.findOneByCodeAndType(
           item.code,
           listType,
         );
-
-        console.log('Existing item found by code:', existingItem);
       }
 
-      console.log('Existing item found:', existingItem);
-
       if (existingItem) {
         await this.updateEntity(
           {
@@ -74,7 +65,6 @@ export class ListMasterItemService {
         );
 
         // now update the value of the item to its code
-        console.log('Created item, updating value to code:', createdItem.code);
 
         await this.listItemsRepo.update(createdItem.id, {
           value: createdItem.code,

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

@@ -13,7 +13,6 @@ import { HttpService } from '@nestjs/axios';
 import { EntityManager } from 'typeorm';
 import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
 import { UserData } from 'src/module/user/entity/user.entity';
-import { log } from 'console';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 
 @Injectable()
@@ -243,6 +242,7 @@ export class ListMasterService {
     entityData.source = entityData.source || 'master';
     entityData.status = entityData.status || 'ACTIVE';
     entityData.type = entityData.type || 'LIST_MASTER';
+    entityData.sort_by = entityData.sort_by || 'asc';
 
     // check if a list master with the same type already exists
     const existingListMaster = await this.listMasterRepo.findByName(
@@ -279,4 +279,8 @@ export class ListMasterService {
   async getEntityData(entity_type: string, id: number): Promise<any> {
     return await this.entityServiceImpl.getEntityData(entity_type, id);
   }
+
+  async getAllListMasterItems(search?: string): Promise<any[]> {
+    return await this.listMasterRepo.findAllItems(search);
+  }
 }