Merge branch 'dev' into SP-197-be-retrieve-devices-in-the-gateway

src/device/services/device.service.ts

@@ -8,10 +8,7 @@ import {
 } from '@nestjs/common';
 import { TuyaContext } from '@tuya/tuya-connector-nodejs';
 import { ConfigService } from '@nestjs/config';
-import {
-  AddDeviceInGroupDto,
-  AddDeviceInRoomDto,
-} from '../dtos/add.device.dto';
+import { AddDeviceDto, UpdateDeviceInRoomDto } from '../dtos/add.device.dto';
 import {
   DeviceInstructionResponse,
   GetDeviceDetailsFunctionsInterface,
@@ -20,14 +17,10 @@ import {
   controlDeviceInterface,
   updateDeviceFirmwareInterface,
 } from '../interfaces/get.device.interface';
-import {
-  GetDeviceByGroupIdDto,
-  GetDeviceByRoomUuidDto,
-} from '../dtos/get.device.dto';
+import { GetDeviceByRoomUuidDto } from '../dtos/get.device.dto';
 import { ControlDeviceDto } from '../dtos/control.device.dto';
 import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
 import { DeviceRepository } from '@app/common/modules/device/repositories';
-import { GroupDeviceRepository } from '@app/common/modules/group-device/repositories';
 import { PermissionType } from '@app/common/constants/permission-type.enum';
 import { In } from 'typeorm';
 import { ProductType } from '@app/common/constants/product-type.enum';
@@ -38,7 +31,6 @@ export class DeviceService {
   constructor(
     private readonly configService: ConfigService,
     private readonly deviceRepository: DeviceRepository,
-    private readonly groupDeviceRepository: GroupDeviceRepository,
     private readonly productRepository: ProductRepository,
   ) {
     const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY');
@@ -60,6 +52,82 @@ export class DeviceService {
       ...(withProductDevice && { relations: ['productDevice'] }),
     });
   }
+  async addDeviceUser(addDeviceDto: AddDeviceDto) {
+    try {
+      const device = await this.getDeviceDetailsByDeviceIdTuya(
+        addDeviceDto.deviceTuyaUuid,
+      );
+
+      if (!device.productUuid) {
+        throw new Error('Product UUID is missing for the device.');
+      }
+
+      return await this.deviceRepository.save({
+        deviceTuyaUuid: addDeviceDto.deviceTuyaUuid,
+        productDevice: { uuid: device.productUuid },
+        user: {
+          uuid: addDeviceDto.userUuid,
+        },
+      });
+    } catch (error) {
+      if (error.code === '23505') {
+        throw new HttpException(
+          'Device already exists',
+          HttpStatus.BAD_REQUEST,
+        );
+      } else {
+        throw new HttpException(
+          error.message || 'Failed to add device in room',
+          error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
+  }
+  async getDevicesByUser(
+    userUuid: string,
+  ): Promise<GetDeviceDetailsInterface[]> {
+    try {
+      const devices = await this.deviceRepository.find({
+        where: {
+          user: { uuid: userUuid },
+          permission: {
+            userUuid,
+            permissionType: {
+              type: In([PermissionType.READ, PermissionType.CONTROLLABLE]),
+            },
+          },
+        },
+        relations: [
+          'spaceDevice',
+          'productDevice',
+          'permission',
+          'permission.permissionType',
+        ],
+      });
+      const devicesData = await Promise.all(
+        devices.map(async (device) => {
+          return {
+            haveRoom: device.spaceDevice ? true : false,
+            productUuid: device.productDevice.uuid,
+            productType: device.productDevice.prodType,
+            permissionType: device.permission[0].permissionType.type,
+            ...(await this.getDeviceDetailsByDeviceIdTuya(
+              device.deviceTuyaUuid,
+            )),
+            uuid: device.uuid,
+          } as GetDeviceDetailsInterface;
+        }),
+      );
+
+      return devicesData;
+    } catch (error) {
+      // Handle the error here
+      throw new HttpException(
+        'User does not have any devices',
+        HttpStatus.NOT_FOUND,
+      );
+    }
+  }
   async getDevicesByRoomId(
     getDeviceByRoomUuidDto: GetDeviceByRoomUuidDto,
     userUuid: string,
@@ -85,13 +153,14 @@ export class DeviceService {
       const devicesData = await Promise.all(
         devices.map(async (device) => {
           return {
+            haveRoom: device.spaceDevice ? true : false,
+            productUuid: device.productDevice.uuid,
+            productType: device.productDevice.prodType,
+            permissionType: device.permission[0].permissionType.type,
             ...(await this.getDeviceDetailsByDeviceIdTuya(
               device.deviceTuyaUuid,
             )),
             uuid: device.uuid,
-            productUuid: device.productDevice.uuid,
-            productType: device.productDevice.prodType,
-            permissionType: device.permission[0].permissionType.type,
           } as GetDeviceDetailsInterface;
         }),
       );
@@ -105,104 +174,31 @@ export class DeviceService {
       );
     }
   }
-
-  async getDevicesByGroupId(
-    getDeviceByGroupIdDto: GetDeviceByGroupIdDto,
-    userUuid: string,
-  ) {
+  async updateDeviceInRoom(updateDeviceInRoomDto: UpdateDeviceInRoomDto) {
     try {
-      const groupDevices = await this.groupDeviceRepository.find({
-        where: {
-          group: { uuid: getDeviceByGroupIdDto.groupUuid },
-          device: {
-            permission: {
-              userUuid,
-              permissionType: {
-                type: PermissionType.READ || PermissionType.CONTROLLABLE,
-              },
-            },
-          },
+      await this.deviceRepository.update(
+        { uuid: updateDeviceInRoomDto.deviceUuid },
+        {
+          spaceDevice: { uuid: updateDeviceInRoomDto.roomUuid },
         },
-        relations: [
-          'device',
-          'device.productDevice',
-          'device.permission',
-          'device.permission.permissionType',
-        ],
-      });
-      const devicesData = await Promise.all(
-        groupDevices.map(async (device) => {
-          return {
-            ...(await this.getDeviceDetailsByDeviceIdTuya(
-              device.device.deviceTuyaUuid,
-            )),
-            uuid: device.device.uuid,
-            productUuid: device.device.productDevice.uuid,
-            productType: device.device.productDevice.prodType,
-            permissionType: device.device.permission[0].permissionType.type,
-          } as GetDeviceDetailsInterface;
-        }),
       );
-
-      return devicesData;
+      const device = await this.deviceRepository.findOne({
+        where: {
+          uuid: updateDeviceInRoomDto.deviceUuid,
+        },
+        relations: ['spaceDevice'],
+      });
+      return {
+        uuid: device.uuid,
+        roomUuid: device.spaceDevice.uuid,
+      };
     } catch (error) {
       throw new HttpException(
-        'Error fetching devices by group',
+        'Failed to add device in room',
         HttpStatus.INTERNAL_SERVER_ERROR,
       );
     }
   }
-  async addDeviceInRoom(addDeviceInRoomDto: AddDeviceInRoomDto) {
-    try {
-      const device = await this.getDeviceDetailsByDeviceIdTuya(
-        addDeviceInRoomDto.deviceTuyaUuid,
-      );
-
-      if (!device.productUuid) {
-        throw new Error('Product UUID is missing for the device.');
-      }
-
-      return await this.deviceRepository.save({
-        deviceTuyaUuid: addDeviceInRoomDto.deviceTuyaUuid,
-        spaceDevice: { uuid: addDeviceInRoomDto.roomUuid },
-        productDevice: { uuid: device.productUuid },
-      });
-    } catch (error) {
-      if (error.code === '23505') {
-        throw new HttpException(
-          'Device already exists in the room',
-          HttpStatus.BAD_REQUEST,
-        );
-      } else {
-        throw new HttpException(
-          'Failed to add device in room',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
-
-  async addDeviceInGroup(addDeviceInGroupDto: AddDeviceInGroupDto) {
-    try {
-      await this.groupDeviceRepository.save({
-        device: { uuid: addDeviceInGroupDto.deviceUuid },
-        group: { uuid: addDeviceInGroupDto.groupUuid },
-      });
-      return { message: 'device added in group successfully' };
-    } catch (error) {
-      if (error.code === '23505') {
-        throw new HttpException(
-          'Device already exists in the group',
-          HttpStatus.BAD_REQUEST,
-        );
-      } else {
-        throw new HttpException(
-          'Failed to add device in group',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
 
   async controlDevice(controlDeviceDto: ControlDeviceDto, deviceUuid: string) {
     try {