From 1e29a59fa341d86ec25d5c7e1a20b93c3240261d Mon Sep 17 00:00:00 2001
From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com>
Date: Thu, 30 May 2024 15:01:49 +0300
Subject: [PATCH] Add SuperAdminRoleGuard to DeviceController and include
 haveRoom property in devicesData

---
 src/device/controllers/device.controller.ts |  3 ++-
 src/device/services/device.service.ts       | 14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/device/controllers/device.controller.ts b/src/device/controllers/device.controller.ts
index f9f9fab..1e9aa5d 100644
--- a/src/device/controllers/device.controller.ts
+++ b/src/device/controllers/device.controller.ts
@@ -29,6 +29,7 @@ import { CheckUserHavePermission } from 'src/guards/user.device.permission.guard
 import { CheckUserHaveControllablePermission } from 'src/guards/user.device.controllable.permission.guard';
 import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
 import { CheckDeviceGuard } from 'src/guards/device.guard';
+import { SuperAdminRoleGuard } from 'src/guards/super.admin.role.guard';
 
 @ApiTags('Device Module')
 @Controller({
@@ -38,7 +39,7 @@ import { CheckDeviceGuard } from 'src/guards/device.guard';
 export class DeviceController {
   constructor(private readonly deviceService: DeviceService) {}
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckDeviceGuard)
+  @UseGuards(SuperAdminRoleGuard, CheckDeviceGuard)
   @Post()
   async addDeviceUser(@Body() addDeviceDto: AddDeviceDto) {
     try {
diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts
index bb90b98..b6e1b6c 100644
--- a/src/device/services/device.service.ts
+++ b/src/device/services/device.service.ts
@@ -103,13 +103,14 @@ export class DeviceService {
       const devicesData = await Promise.all(
         devices.map(async (device) => {
           return {
-            ...(await this.getDeviceDetailsByDeviceIdTuya(
-              device.deviceTuyaUuid,
-            )),
             uuid: device.uuid,
+            haveRoom: device.spaceDevice ? true : false,
             productUuid: device.productDevice.uuid,
             productType: device.productDevice.prodType,
             permissionType: device.permission[0].permissionType.type,
+            ...(await this.getDeviceDetailsByDeviceIdTuya(
+              device.deviceTuyaUuid,
+            )),
           } as GetDeviceDetailsInterface;
         }),
       );
@@ -148,13 +149,14 @@ export class DeviceService {
       const devicesData = await Promise.all(
         devices.map(async (device) => {
           return {
-            ...(await this.getDeviceDetailsByDeviceIdTuya(
-              device.deviceTuyaUuid,
-            )),
             uuid: device.uuid,
+            haveRoom: device.spaceDevice ? true : false,
             productUuid: device.productDevice.uuid,
             productType: device.productDevice.prodType,
             permissionType: device.permission[0].permissionType.type,
+            ...(await this.getDeviceDetailsByDeviceIdTuya(
+              device.deviceTuyaUuid,
+            )),
           } as GetDeviceDetailsInterface;
         }),
       );