add pagination to device API

libs/common/src/dto/pagination.request.dto.ts

@@ -1,24 +1,9 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
+import { IsOptional } from 'class-validator';
-import { IsBoolean, IsOptional } from 'class-validator';
-import { BooleanValues } from '../constants/boolean-values.enum';
 import { IsPageRequestParam } from '../validators/is-page-request-param.validator';
 import { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
 
 export class PaginationRequestGetListDto {
-  @ApiProperty({
-    example: true,
-    description: 'include spaces',
-    required: false,
-    default: false,
-  })
-  @IsOptional()
-  @IsBoolean()
-  @Transform((value) => {
-    return value.obj.includeSpaces === BooleanValues.TRUE;
-  })
-  public includeSpaces?: boolean = false;
-
   @IsOptional()
   @IsPageRequestParam({
     message: 'Page must be bigger than 0',

src/booking/dtos/bookable-space-request.dto.ts

@@ -1,13 +1,10 @@
 import { BooleanValues } from '@app/common/constants/boolean-values.enum';
 import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
-import { ApiProperty, OmitType } from '@nestjs/swagger';
+import { ApiProperty } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
 import { IsBoolean, IsNotEmpty, IsOptional } from 'class-validator';
 
-export class BookableSpaceRequestDto extends OmitType(
+export class BookableSpaceRequestDto extends PaginationRequestWithSearchGetListDto {
-  PaginationRequestWithSearchGetListDto,
-  ['includeSpaces'],
-) {
   @ApiProperty({
     type: Boolean,
     required: false,

src/community/controllers/community.controller.ts

@@ -17,10 +17,10 @@ import { CommunityService } from '../services/community.service';
 // import { CheckUserCommunityGuard } from 'src/guards/user.community.guard';
 import { ControllerRoute } from '@app/common/constants/controller-route';
 import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
 import { Permissions } from 'src/decorators/permissions.decorator';
 import { PermissionsGuard } from 'src/guards/permissions.guard';
 import { ProjectParam } from '../dtos';
+import { CommunityFilterDto } from '../dtos/community-filter.dto';
 
 @ApiTags('Community Module')
 @Controller({
@@ -55,7 +55,7 @@ export class CommunityController {
   @Get('v2')
   async getCommunitiesV2(
     @Param() param: ProjectParam,
-    @Query() query: PaginationRequestWithSearchGetListDto,
+    @Query() query: CommunityFilterDto,
   ): Promise<any> {
     return this.communityService.getCommunitiesV2(param, query);
   }
@@ -85,7 +85,7 @@ export class CommunityController {
   @Get()
   async getCommunities(
     @Param() param: ProjectParam,
-    @Query() query: PaginationRequestWithSearchGetListDto,
+    @Query() query: CommunityFilterDto,
   ): Promise<BaseResponseDto> {
     return this.communityService.getCommunities(param, query);
   }

src/community/dtos/community-filter.dto.ts

@@ -0,0 +1,20 @@
+import { BooleanValues } from '@app/common/constants/boolean-values.enum';
+import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
+import { ApiProperty } from '@nestjs/swagger';
+import { Transform } from 'class-transformer';
+import { IsBoolean, IsOptional } from 'class-validator';
+
+export class CommunityFilterDto extends PaginationRequestWithSearchGetListDto {
+  @ApiProperty({
+    example: true,
+    description: 'include spaces',
+    required: false,
+    default: false,
+  })
+  @IsOptional()
+  @IsBoolean()
+  @Transform((value) => {
+    return value.obj.includeSpaces === BooleanValues.TRUE;
+  })
+  public includeSpaces?: boolean = false;
+}

src/device/dtos/get.device.dto.ts

@@ -1,4 +1,5 @@
 import { DeviceTypeEnum } from '@app/common/constants/device-type.enum';
+import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
 import { ApiProperty } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
 import {
@@ -65,7 +66,7 @@ export class GetDevicesBySpaceOrCommunityDto {
   requireEither?: never; // This ensures at least one of them is provided
 }
 
-export class GetDevicesFilterDto {
+export class GetDevicesFilterDto extends PaginationRequestGetListDto {
   @ApiProperty({
     description: 'Device Type',
     enum: DeviceTypeEnum,

src/device/services/device.service.ts

@@ -7,6 +7,7 @@ import { CommonErrorCodes } from '@app/common/constants/error-codes.enum';
 import { ProductType } from '@app/common/constants/product-type.enum';
 import { SceneSwitchesTypeEnum } from '@app/common/constants/scene-switch-type.enum';
 import { BaseResponseDto } from '@app/common/dto/base.response.dto';
+import { PageResponse } from '@app/common/dto/pagination.response.dto';
 import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
 import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
 import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
@@ -20,6 +21,7 @@ import { SceneDeviceRepository } from '@app/common/modules/scene-device/reposito
 import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
 import { addSpaceUuidToDevices } from '@app/common/util/device-utils';
+import { getPaginationResponseDto } from '@app/common/util/getPaginationResponseDto';
 import {
   BadRequestException,
   forwardRef,
@@ -100,7 +102,7 @@ export class DeviceService {
 
   async getAllDevices(
     param: ProjectParam,
-    { deviceType, spaces, communities }: GetDevicesFilterDto,
+    { deviceType, spaces, communities, page, size }: GetDevicesFilterDto,
   ): Promise<BaseResponseDto> {
     try {
       await this.validateProject(param.projectUuid);
@@ -108,9 +110,12 @@ export class DeviceService {
         return await this.getDoorLockDevices(param.projectUuid, {
           spaces,
           communities,
+          deviceType,
+          page,
+          size,
         });
       } else if (!deviceType) {
-        const devices = await this.deviceRepository.find({
+        const [devices, count] = await this.deviceRepository.findAndCount({
           where: {
             isActive: true,
             spaceDevice: {
@@ -133,6 +138,8 @@ export class DeviceService {
             'permission.permissionType',
             'subspace',
           ],
+          take: size ?? 10,
+          skip: (page ? page - 1 : 0) * (size ?? 10),
         });
 
         const devicesData = await Promise.allSettled(
@@ -234,11 +241,14 @@ export class DeviceService {
                 .value,
           );
 
-        return new SuccessResponseDto({
+        return new PageResponse(
+          {
             message: `Devices fetched successfully`,
             data: fulfilledDevices,
             statusCode: HttpStatus.OK,
-        });
+          },
+          getPaginationResponseDto(count, page ?? 1, size ?? 10),
+        );
       }
     } catch (error) {
       if (error instanceof HttpException) {
@@ -1301,11 +1311,11 @@ export class DeviceService {
 
   private async getDoorLockDevices(
     projectUuid: string,
-    { communities, spaces }: { spaces?: string[]; communities?: string[] },
+    { communities, spaces, page, size }: GetDevicesFilterDto,
   ) {
     await this.validateProject(projectUuid);
 
-    const devices = await this.deviceRepository.find({
+    const [devices, count] = await this.deviceRepository.findAndCount({
       where: {
         productDevice: {
           prodType: ProductType.DL,
@@ -1324,6 +1334,8 @@ export class DeviceService {
         isActive: true,
       },
       relations: ['productDevice', 'spaceDevice'],
+      take: size ?? 10,
+      skip: (page ? page - 1 : 0) * (size ?? 10),
     });
 
     const devicesData = await Promise.all(
@@ -1355,11 +1367,14 @@ export class DeviceService {
       (deviceData) => deviceData !== null,
     );
 
-    return new SuccessResponseDto({
+    return new PageResponse(
+      {
         message: 'Successfully retrieved all pass devices',
         data: filteredDevicesData,
         statusCode: HttpStatus.OK,
-    });
+      },
+      getPaginationResponseDto(count, page ?? 1, size ?? 10),
+    );
   }
 
   private async controlDeviceTuya(

src/project/dto/list-project.dto.ts

@@ -1,7 +1,3 @@
 import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
-import { PickType } from '@nestjs/swagger';
 
-export class ListProjectsDto extends PickType(PaginationRequestGetListDto, [
+export class ListProjectsDto extends PaginationRequestGetListDto {}
-  'page',
-  'size',
-]) {}

src/space-model/controllers/space-model.controller.ts

@@ -1,4 +1,5 @@
 import { ControllerRoute } from '@app/common/constants/controller-route';
+import { BaseResponseDto } from '@app/common/dto/base.response.dto';
 import {
   Body,
   Controller,
@@ -11,18 +12,17 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { SpaceModelService } from '../services';
+import { ProjectParam } from 'src/community/dtos';
+import { Permissions } from 'src/decorators/permissions.decorator';
+import { PermissionsGuard } from 'src/guards/permissions.guard';
 import {
   CreateSpaceModelDto,
   LinkSpacesToModelDto,
   SpaceModelParam,
   UpdateSpaceModelDto,
 } from '../dtos';
-import { ProjectParam } from 'src/community/dtos';
+import { SpaceModelFilterDto } from '../dtos/space-model-filter.dto';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
+import { SpaceModelService } from '../services';
-import { PermissionsGuard } from 'src/guards/permissions.guard';
-import { Permissions } from 'src/decorators/permissions.decorator';
-import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
 
 @ApiTags('Space Model Module')
 @Controller({
@@ -62,7 +62,7 @@ export class SpaceModelController {
   @Get()
   async listSpaceModel(
     @Param() projectParam: ProjectParam,
-    @Query() query: PaginationRequestGetListDto,
+    @Query() query: SpaceModelFilterDto,
   ): Promise<BaseResponseDto> {
     return await this.spaceModelService.list(projectParam, query);
   }

src/space-model/dtos/space-model-filter.dto.ts

@@ -0,0 +1,20 @@
+import { BooleanValues } from '@app/common/constants/boolean-values.enum';
+import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
+import { ApiProperty } from '@nestjs/swagger';
+import { Transform } from 'class-transformer';
+import { IsBoolean, IsOptional } from 'class-validator';
+
+export class SpaceModelFilterDto extends PaginationRequestGetListDto {
+  @ApiProperty({
+    example: true,
+    description: 'include spaces',
+    required: false,
+    default: false,
+  })
+  @IsOptional()
+  @IsBoolean()
+  @Transform((value) => {
+    return value.obj.includeSpaces === BooleanValues.TRUE;
+  })
+  public includeSpaces?: boolean = false;
+}

src/space/controllers/subspace/subspace.controller.ts

@@ -1,4 +1,5 @@
 import { ControllerRoute } from '@app/common/constants/controller-route';
+import { BaseResponseDto } from '@app/common/dto/base.response.dto';
 import {
   Body,
   Controller,
@@ -10,13 +11,12 @@ import {
   Query,
   UseGuards,
 } from '@nestjs/common';
-import { SubSpaceService } from '../../services';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { AddSubspaceDto, GetSpaceParam, GetSubSpaceParam } from '../../dtos';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
-import { PermissionsGuard } from 'src/guards/permissions.guard';
 import { Permissions } from 'src/decorators/permissions.decorator';
+import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { SubspaceFilterDto } from 'src/space/dtos/subspace-filter.dto';
+import { AddSubspaceDto, GetSpaceParam, GetSubSpaceParam } from '../../dtos';
+import { SubSpaceService } from '../../services';
 
 @ApiTags('Space Module')
 @Controller({
@@ -51,7 +51,7 @@ export class SubSpaceController {
   @Get()
   async list(
     @Param() params: GetSpaceParam,
-    @Query() query: PaginationRequestGetListDto,
+    @Query() query: SubspaceFilterDto,
   ): Promise<BaseResponseDto> {
     return this.subSpaceService.list(params, query);
   }

src/space/dtos/subspace-filter.dto.ts

@@ -0,0 +1,20 @@
+import { BooleanValues } from '@app/common/constants/boolean-values.enum';
+import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
+import { ApiProperty } from '@nestjs/swagger';
+import { Transform } from 'class-transformer';
+import { IsBoolean, IsOptional } from 'class-validator';
+
+export class SubspaceFilterDto extends PaginationRequestGetListDto {
+  @ApiProperty({
+    example: true,
+    description: 'include spaces',
+    required: false,
+    default: false,
+  })
+  @IsOptional()
+  @IsBoolean()
+  @Transform((value) => {
+    return value.obj.includeSpaces === BooleanValues.TRUE;
+  })
+  public includeSpaces?: boolean = false;
+}