List enhancements

backend/src/base/location/location-db.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { LocationEntity } from './location.entity';
-import { TreeRepository } from 'typeorm';
+import { SelectQueryBuilder, TreeRepository } from 'typeorm';
 import { DeepPartial } from 'typeorm/common/DeepPartial';
 
 @Injectable()
@@ -11,22 +11,40 @@ export class LocationDbService {
     private readonly repo: TreeRepository<LocationEntity>,
   ) {}
 
-  public async getCount() {
-    return this.repo.count();
+  private searchQueryBuilder(
+    query: SelectQueryBuilder<LocationEntity>,
+    searchTerm: string,
+  ): SelectQueryBuilder<LocationEntity> {
+    return query.where('l.name ilike :searchTerm', {
+      searchTerm: `%${searchTerm}%`,
+    });
+  }
+
+  public async getCount(searchTerm?: string) {
+    let query = this.repo.createQueryBuilder('l');
+    if (searchTerm) {
+      query = this.searchQueryBuilder(query, searchTerm);
+    }
+    return query.getCount();
   }
 
   public async findAll(
     offset?: number,
     limit?: number,
     sortCol?: string,
     sortDir?: 'ASC' | 'DESC',
+    searchTerm?: string,
   ) {
     let query = this.repo
       .createQueryBuilder('l')
       .leftJoinAndSelect('l.parent', 'p')
       .limit(limit ?? 100)
       .offset(offset ?? 0);
 
+    if (searchTerm) {
+      query = this.searchQueryBuilder(query, searchTerm);
+    }
+
     if (sortCol) {
       if (sortCol.startsWith('parent.')) {
         query = query.orderBy(

backend/src/base/location/location.controller.ts

@@ -12,6 +12,7 @@ import { LocationGetQueryDto } from './dto/location-get-query.dto';
 import { LocationCreateDto } from './dto/location-create.dto';
 import { LocationUpdateDto } from './dto/location-update.dto';
 import { PaginationDto } from '../../shared/dto/pagination.dto';
+import { SearchDto } from '../../shared/dto/search.dto';
 
 @Controller('location')
 export class LocationController {
@@ -23,8 +24,8 @@ export class LocationController {
     responseType: CountDto,
     roles: [Role.LocationView],
   })
-  public getCount(): Promise<CountDto> {
-    return this.service.getCount();
+  public getCount(@Query() search: SearchDto): Promise<CountDto> {
+    return this.service.getCount(search.searchTerm);
   }
 
   @Endpoint(EndpointType.GET, {
@@ -36,12 +37,14 @@ export class LocationController {
   public async getAll(
     @Query() pagination: PaginationDto,
     @Query() querys: LocationGetQueryDto,
+    @Query() search: SearchDto,
   ): Promise<LocationDto[]> {
     return this.service.findAll(
       pagination.offset,
       pagination.limit,
       querys.sortCol,
       querys.sortDir,
+      search.searchTerm,
     );
   }
 

backend/src/base/location/location.service.ts

@@ -20,12 +20,14 @@ export class LocationService {
     limit?: number,
     sortCol?: string,
     sortDir?: 'ASC' | 'DESC',
+    searchTerm?: string,
   ) {
     const locations = await this.dbService.findAll(
       offset,
       limit,
       sortCol,
       sortDir,
+      searchTerm,
     );
     return plainToInstance(LocationDto, locations);
   }
@@ -44,8 +46,8 @@ export class LocationService {
     }
   }
 
-  public async getCount() {
-    const count = await this.dbService.getCount();
+  public async getCount(searchTerm?: string) {
+    const count = await this.dbService.getCount(searchTerm);
     return plainToInstance(CountDto, { count });
   }
 

backend/src/inventory/device-group/device-group-db.service.spec.ts

@@ -85,7 +85,10 @@ describe('DeviceGroupDbService', () => {
       expect(repoMock.createQueryBuilder).toHaveBeenCalled();
       expect(repoMock.createQueryBuilder().limit).toHaveBeenCalledWith(10);
       expect(repoMock.createQueryBuilder().offset).toHaveBeenCalledWith(10);
-      expect(repoMock.createQueryBuilder().orderBy).toHaveBeenCalledWith('dg.name', 'ASC');
+      expect(repoMock.createQueryBuilder().orderBy).toHaveBeenCalledWith(
+        'dg.name',
+        'ASC',
+      );
       expect(repoMock.createQueryBuilder().getMany).toHaveBeenCalled();
     });
   });

backend/src/inventory/device-group/device-group-db.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { Repository, SelectQueryBuilder } from 'typeorm';
 import { DeepPartial } from 'typeorm/common/DeepPartial';
 import { DeviceGroupEntity } from './device-group.entity';
 
@@ -11,21 +11,39 @@ export class DeviceGroupDbService {
     private readonly repo: Repository<DeviceGroupEntity>,
   ) {}
 
-  public async getCount() {
-    return this.repo.count();
+  private searchQueryBuilder(
+    query: SelectQueryBuilder<DeviceGroupEntity>,
+    searchTerm: string,
+  ): SelectQueryBuilder<DeviceGroupEntity> {
+    return query.where('dg.name ilike :searchTerm', {
+      searchTerm: `%${searchTerm}%`,
+    });
+  }
+
+  public async getCount(searchTerm?: string) {
+    let query = this.repo.createQueryBuilder('dg');
+    if (searchTerm) {
+      query = this.searchQueryBuilder(query, searchTerm);
+    }
+    return query.getCount();
   }
 
   public async findAll(
     offset?: number,
     limit?: number,
     sortCol?: string,
     sortDir?: 'ASC' | 'DESC',
+    searchTerm?: string,
   ) {
     let query = this.repo
       .createQueryBuilder('dg')
       .limit(limit ?? 100)
       .offset(offset ?? 0);
 
+    if (searchTerm) {
+      query = this.searchQueryBuilder(query, searchTerm);
+    }
+
     if (sortCol) {
       query = query.orderBy(`dg.${sortCol}`, sortDir ?? 'ASC');
     } else {

backend/src/inventory/device-group/device-group.controller.ts

@@ -12,6 +12,7 @@ import { DeviceGroupUpdateDto } from './dto/device-group-update.dto';
 import { DeviceGroupCreateDto } from './dto/device-group-create.dto';
 import { DeviceGroupGetQueryDto } from './dto/device-group-get-query.dto';
 import { PaginationDto } from '../../shared/dto/pagination.dto';
+import { SearchDto } from '../../shared/dto/search.dto';
 
 @Controller('device-group')
 export class DeviceGroupController {
@@ -23,8 +24,8 @@ export class DeviceGroupController {
     responseType: CountDto,
     roles: [Role.DeviceTypeView],
   })
-  public getCount(): Promise<CountDto> {
-    return this.service.getCount();
+  public getCount(@Query() search: SearchDto): Promise<CountDto> {
+    return this.service.getCount(search.searchTerm);
   }
 
   @Endpoint(EndpointType.GET, {
@@ -36,12 +37,14 @@ export class DeviceGroupController {
   public async getAll(
     @Query() pagination: PaginationDto,
     @Query() querys: DeviceGroupGetQueryDto,
+    @Query() search: SearchDto,
   ): Promise<DeviceGroupDto[]> {
     return this.service.findAll(
       pagination.offset,
       pagination.limit,
       querys.sortCol,
       querys.sortDir,
+      search.searchTerm,
     );
   }
 

backend/src/inventory/device-group/device-group.service.ts

@@ -19,12 +19,14 @@ export class DeviceGroupService {
     limit?: number,
     sortCol?: string,
     sortDir?: 'ASC' | 'DESC',
+    searchTerm?: string,
   ) {
     const entities = await this.dbService.findAll(
       offset,
       limit,
       sortCol,
       sortDir,
+      searchTerm,
     );
     return plainToInstance(DeviceGroupDto, entities);
   }
@@ -43,8 +45,8 @@ export class DeviceGroupService {
     }
   }
 
-  public async getCount() {
-    const count = await this.dbService.getCount();
+  public async getCount(searchTerm?: string) {
+    const count = await this.dbService.getCount(searchTerm);
     return plainToInstance(CountDto, { count });
   }
 

backend/src/inventory/device-type/device-type-db.service.spec.ts

@@ -102,7 +102,10 @@ describe('DeviceTypeDbService', () => {
       expect(repoMock.createQueryBuilder).toHaveBeenCalled();
       expect(repoMock.createQueryBuilder().limit).toHaveBeenCalledWith(10);
       expect(repoMock.createQueryBuilder().offset).toHaveBeenCalledWith(10);
-      expect(repoMock.createQueryBuilder().orderBy).toHaveBeenCalledWith('dt.name', 'ASC');
+      expect(repoMock.createQueryBuilder().orderBy).toHaveBeenCalledWith(
+        'dt.name',
+        'ASC',
+      );
       expect(repoMock.createQueryBuilder().getMany).toHaveBeenCalled();
     });
   });

backend/src/inventory/device-type/device-type-db.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { Repository, SelectQueryBuilder } from 'typeorm';
 import { DeviceTypeEntity } from './device-type.entity';
 import { DeepPartial } from 'typeorm/common/DeepPartial';
 
@@ -11,21 +11,39 @@ export class DeviceTypeDbService {
     private readonly repo: Repository<DeviceTypeEntity>,
   ) {}
 
-  public async getCount() {
-    return this.repo.count();
+  private searchQueryBuilder(
+    query: SelectQueryBuilder<DeviceTypeEntity>,
+    searchTerm: string,
+  ): SelectQueryBuilder<DeviceTypeEntity> {
+    return query.where('dt.name ilike :searchTerm', {
+      searchTerm: `%${searchTerm}%`,
+    });
+  }
+
+  public async getCount(searchTerm?: string) {
+    let query = this.repo.createQueryBuilder('dt');
+    if (searchTerm) {
+      query = this.searchQueryBuilder(query, searchTerm);
+    }
+    return query.getCount();
   }
 
   public async findAll(
     offset?: number,
     limit?: number,
     sortCol?: string,
     sortDir?: 'ASC' | 'DESC',
+    searchTerm?: string,
   ) {
     let query = this.repo
       .createQueryBuilder('dt')
       .limit(limit ?? 100)
       .offset(offset ?? 0);
 
+    if (searchTerm) {
+      query = this.searchQueryBuilder(query, searchTerm);
+    }
+
     if (sortCol) {
       query = query.orderBy(`dt.${sortCol}`, sortDir ?? 'ASC');
     } else {

backend/src/inventory/device-type/device-type.controller.ts

@@ -12,6 +12,7 @@ import { DeviceTypeUpdateDto } from './dto/device-type-update.dto';
 import { DeviceTypeGetQueryDto } from './dto/device-type-get-query.dto';
 import { CountDto } from '../../shared/dto/count.dto';
 import { PaginationDto } from '../../shared/dto/pagination.dto';
+import { SearchDto } from '../../shared/dto/search.dto';
 
 @Controller('device-type')
 export class DeviceTypeController {
@@ -23,8 +24,8 @@ export class DeviceTypeController {
     responseType: CountDto,
     roles: [Role.DeviceTypeView],
   })
-  public getCount(): Promise<CountDto> {
-    return this.service.getCount();
+  public getCount(@Query() search: SearchDto): Promise<CountDto> {
+    return this.service.getCount(search.searchTerm);
   }
 
   @Endpoint(EndpointType.GET, {
@@ -36,12 +37,14 @@ export class DeviceTypeController {
   public async getAll(
     @Query() pagination: PaginationDto,
     @Query() querys: DeviceTypeGetQueryDto,
+    @Query() search: SearchDto,
   ): Promise<DeviceTypeDto[]> {
     return this.service.findAll(
       pagination.offset,
       pagination.limit,
       querys.sortCol,
       querys.sortDir,
+      search.searchTerm,
     );
   }
 

backend/src/inventory/device-type/device-type.service.ts

@@ -19,12 +19,14 @@ export class DeviceTypeService {
     limit?: number,
     sortCol?: string,
     sortDir?: 'ASC' | 'DESC',
+    searchTerm?: string,
   ) {
     const entities = await this.dbService.findAll(
       offset,
       limit,
       sortCol,
       sortDir,
+      searchTerm,
     );
     return plainToInstance(DeviceTypeDto, entities);
   }
@@ -43,8 +45,8 @@ export class DeviceTypeService {
     }
   }
 
-  public async getCount() {
-    const count = await this.dbService.getCount();
+  public async getCount(searchTerm?: string) {
+    const count = await this.dbService.getCount(searchTerm);
     return plainToInstance(CountDto, { count });
   }