From 4ddc379bf7b3a9cd92d6418ca5b5a4ab8fc212c5 Mon Sep 17 00:00:00 2001
From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com>
Date: Sun, 19 May 2024 14:25:29 +0300
Subject: [PATCH] Add support for multiple permission types in DeviceService

---
 src/device/services/device.service.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts
index 29bddca..5f59d59 100644
--- a/src/device/services/device.service.ts
+++ b/src/device/services/device.service.ts
@@ -27,6 +27,7 @@ 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';
 
 @Injectable()
 export class DeviceService {
@@ -57,7 +58,7 @@ export class DeviceService {
           permission: {
             userUuid,
             permissionType: {
-              type: PermissionType.READ || PermissionType.CONTROLLABLE,
+              type: In([PermissionType.READ, PermissionType.CONTROLLABLE]),
             },
           },
         },
@@ -81,6 +82,7 @@ export class DeviceService {
           } as GetDeviceDetailsInterface;
         }),
       );
+
       return devicesData;
     } catch (error) {
       // Handle the error here
@@ -147,12 +149,11 @@ export class DeviceService {
         throw new Error('Product UUID is missing for the device.');
       }
 
-      await this.deviceRepository.save({
+      return await this.deviceRepository.save({
         deviceTuyaUuid: addDeviceInRoomDto.deviceTuyaUuid,
         spaceDevice: { uuid: addDeviceInRoomDto.roomUuid },
         productDevice: { uuid: device.productUuid },
       });
-      return { message: 'device added in room successfully' };
     } catch (error) {
       if (error.code === '23505') {
         throw new HttpException(