added controller

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

@@ -2,7 +2,6 @@ import { IsDate, IsOptional } from 'class-validator';
 import { IsPageRequestParam } from '../validators/is-page-request-param.validator';
 import { ApiProperty } from '@nestjs/swagger';
 import { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
-import { IsSortParam } from '../validators/is-sort-param.validator';
 import { Transform } from 'class-transformer';
 import { parseToDate } from '../util/parseToDate';
 
@@ -29,18 +28,6 @@ export class PaginationRequestGetListDto {
   })
   size?: number;
 
-  @IsOptional()
-  @IsSortParam({
-    message:
-      'Incorrect sorting condition format. Should be like this format propertyId:asc,createdDate:desc',
-  })
-  @ApiProperty({
-    name: 'sort',
-    required: false,
-    description: 'Sort condition',
-  })
-  sort?: string;
-
   @IsOptional()
   @ApiProperty({
     name: 'name',
@@ -49,14 +36,6 @@ export class PaginationRequestGetListDto {
   })
   name?: string;
 
-  @IsOptional()
-  @ApiProperty({
-    name: 'include',
-    required: false,
-    description: 'Fields to include',
-  })
-  include?: string;
-
   @ApiProperty({
     name: 'from',
     required: false,

libs/common/src/util/buildTypeORMWhereClause.ts

@@ -6,7 +6,6 @@ export function buildTypeORMWhereClause({ where }) {
   // Remove extra nesting if `where` is wrapped within an additional `where` property
   const condition = where.where ? where.where : where;
 
-  console.log(condition);
   const convertToNestedObject = (condition: any): any => {
     const result = {};
     for (const [key, value] of Object.entries(condition)) {

src/device/controllers/device.controller.ts

@@ -138,6 +138,7 @@ export class DeviceController {
   async getAllDevices() {
     return await this.deviceService.getAllDevices();
   }
+
   @ApiBearerAuth()
   @UseGuards(JwtAuthGuard)
   @Get('report-logs/:deviceUuid')

src/device/interfaces/get.device.interface.ts

@@ -1,6 +1,6 @@
 export interface GetDeviceDetailsInterface {
   activeTime: number;
-  assetId: string;
+  assetId?: string;
   category: string;
   categoryName: string;
   createTime: number;
@@ -13,6 +13,7 @@ export interface GetDeviceDetailsInterface {
   lon: string;
   model: string;
   name: string;
+  battery?: number;
   nodeId: string;
   online: boolean;
   productId?: string;
@@ -23,6 +24,18 @@ export interface GetDeviceDetailsInterface {
   uuid: string;
   productType: string;
   productUuid: string;
+  spaces?: SpaceInterface[];
+  community?: CommunityInterface;
+}
+
+export interface SpaceInterface {
+  uuid: string;
+  spaceName: string;
+}
+
+export interface CommunityInterface {
+  uuid: string;
+  name: string;
 }
 
 export interface addDeviceInRoomInterface {

src/device/services/device.service.ts

@@ -614,12 +614,12 @@ export class DeviceService {
     }
   }
   async getDevicesInstructionStatus(deviceUuid: string) {
-    const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
-
-    if (!deviceDetails) {
-      throw new NotFoundException('Device Not Found');
-    }
     try {
+      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
+
+      if (!deviceDetails) {
+        throw new NotFoundException('Device Not Found');
+      }
       const deviceStatus = await this.getDevicesInstructionStatusTuya(
         deviceDetails.deviceTuyaUuid,
       );
@@ -902,12 +902,12 @@ export class DeviceService {
               name: device.spaceDevice.community.name,
             },
             //   permissionType: device.permission[0].permissionType.type,
-            /*  ...(await this.getDeviceDetailsByDeviceIdTuya(
+            ...(await this.getDeviceDetailsByDeviceIdTuya(
               device.deviceTuyaUuid,
-            )),*/
+            )),
             uuid: device.uuid,
             ...(battery && { battery }),
-          };
+          } as GetDeviceDetailsInterface;
         }),
       );