Merge pull request #480 from SyncrowIOT/main

Update dev from main

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

@@ -1,9 +1,24 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsOptional } from 'class-validator';
+import { Transform } from 'class-transformer';
+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,10 +1,13 @@
 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 { ApiProperty, OmitType } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
 import { IsBoolean, IsNotEmpty, IsOptional } from 'class-validator';
 
-export class BookableSpaceRequestDto extends PaginationRequestWithSearchGetListDto {
+export class BookableSpaceRequestDto extends OmitType(
+  PaginationRequestWithSearchGetListDto,
+  ['includeSpaces'],
+) {
   @ApiProperty({
     type: Boolean,
     required: false,

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

@@ -7,8 +7,8 @@ export class BookingRequestDto {
     example: '07-2025',
   })
   @IsNotEmpty()
-  @Matches(/^(0[1-9]|1[0-2])\/\d{4}$/, {
-    message: 'Date must be in MM-YYYY format',
+  @Matches(/^(0[1-9]|1[0-2])\-\d{4}$/, {
+    message: 'Date must be in MM/YYYY format',
   })
   month: string;
 

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: CommunityFilterDto,
+    @Query() query: PaginationRequestWithSearchGetListDto,
   ): Promise<any> {
     return this.communityService.getCommunitiesV2(param, query);
   }
@@ -85,7 +85,7 @@ export class CommunityController {
   @Get()
   async getCommunities(
     @Param() param: ProjectParam,
-    @Query() query: CommunityFilterDto,
+    @Query() query: PaginationRequestWithSearchGetListDto,
   ): Promise<BaseResponseDto> {
     return this.communityService.getCommunities(param, query);
   }

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

@@ -1,20 +0,0 @@
-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,5 +1,4 @@
 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 {
@@ -66,7 +65,7 @@ export class GetDevicesBySpaceOrCommunityDto {
   requireEither?: never; // This ensures at least one of them is provided
 }
 
-export class GetDevicesFilterDto extends PaginationRequestGetListDto {
+export class GetDevicesFilterDto {
   @ApiProperty({
     description: 'Device Type',
     enum: DeviceTypeEnum,

src/device/services/device.service.ts

@@ -7,7 +7,6 @@ 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';
@@ -21,7 +20,6 @@ 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,
@@ -102,7 +100,7 @@ export class DeviceService {
 
   async getAllDevices(
     param: ProjectParam,
-    { deviceType, spaces, communities, page, size }: GetDevicesFilterDto,
+    { deviceType, spaces, communities }: GetDevicesFilterDto,
   ): Promise<BaseResponseDto> {
     try {
       await this.validateProject(param.projectUuid);
@@ -110,12 +108,9 @@ export class DeviceService {
         return await this.getDoorLockDevices(param.projectUuid, {
           spaces,
           communities,
-          deviceType,
-          page,
-          size,
         });
       } else if (!deviceType) {
-        const [devices, count] = await this.deviceRepository.findAndCount({
+        const devices = await this.deviceRepository.find({
           where: {
             isActive: true,
             spaceDevice: {
@@ -138,8 +133,6 @@ export class DeviceService {
             'permission.permissionType',
             'subspace',
           ],
-          take: size ?? 10,
-          skip: (page ? page - 1 : 0) * (size ?? 10),
         });
 
         const devicesData = await Promise.allSettled(
@@ -241,14 +234,11 @@ export class DeviceService {
                 .value,
           );
 
-        return new PageResponse(
-          {
+        return new SuccessResponseDto({
           message: `Devices fetched successfully`,
           data: fulfilledDevices,
           statusCode: HttpStatus.OK,
-          },
-          getPaginationResponseDto(count, page ?? 1, size ?? 10),
-        );
+        });
       }
     } catch (error) {
       if (error instanceof HttpException) {
@@ -1311,11 +1301,11 @@ export class DeviceService {
 
   private async getDoorLockDevices(
     projectUuid: string,
-    { communities, spaces, page, size }: GetDevicesFilterDto,
+    { communities, spaces }: { spaces?: string[]; communities?: string[] },
   ) {
     await this.validateProject(projectUuid);
 
-    const [devices, count] = await this.deviceRepository.findAndCount({
+    const devices = await this.deviceRepository.find({
       where: {
         productDevice: {
           prodType: ProductType.DL,
@@ -1334,8 +1324,6 @@ export class DeviceService {
         isActive: true,
       },
       relations: ['productDevice', 'spaceDevice'],
-      take: size ?? 10,
-      skip: (page ? page - 1 : 0) * (size ?? 10),
     });
 
     const devicesData = await Promise.all(
@@ -1367,14 +1355,11 @@ export class DeviceService {
       (deviceData) => deviceData !== null,
     );
 
-    return new PageResponse(
-      {
+    return new SuccessResponseDto({
       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,3 +1,7 @@
 import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
+import { PickType } from '@nestjs/swagger';
 
-export class ListProjectsDto extends PaginationRequestGetListDto {}
+export class ListProjectsDto extends PickType(PaginationRequestGetListDto, [
+  'page',
+  'size',
+]) {}

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

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

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

@@ -1,20 +0,0 @@
-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,5 +1,4 @@
 import { ControllerRoute } from '@app/common/constants/controller-route';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
 import {
   Body,
   Controller,
@@ -11,12 +10,13 @@ import {
   Query,
   UseGuards,
 } from '@nestjs/common';
-import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-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';
+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';
 
 @ApiTags('Space Module')
 @Controller({
@@ -51,7 +51,7 @@ export class SubSpaceController {
   @Get()
   async list(
     @Param() params: GetSpaceParam,
-    @Query() query: SubspaceFilterDto,
+    @Query() query: PaginationRequestGetListDto,
   ): Promise<BaseResponseDto> {
     return this.subSpaceService.list(params, query);
   }

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

@@ -1,20 +0,0 @@
-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;
-}