finished refactor devices module

libs/common/src/constants/batch-device.enum.ts

@@ -0,0 +1,4 @@
+export enum BatchDeviceTypeEnum {
+  RESET = 'RESET',
+  COMMAND = 'COMMAND',
+}

libs/common/src/constants/controller-route.ts

@@ -473,14 +473,9 @@ export class ControllerRoute {
     public static readonly ROUTE = 'device';
 
     static ACTIONS = class {
-      public static readonly ADD_DEVICE_TO_USER_SUMMARY = 'Add device to user';
+      public static readonly ADD_DEVICE_SUMMARY = 'Add new device';
-      public static readonly ADD_DEVICE_TO_USER_DESCRIPTION =
+      public static readonly ADD_DEVICE_DESCRIPTION =
-        'This endpoint adds a device to a user in the system.';
+        'This endpoint adds a new device in the system.';
-
-      public static readonly GET_DEVICES_BY_USER_SUMMARY =
-        'Get devices by user UUID';
-      public static readonly GET_DEVICES_BY_USER_DESCRIPTION =
-        'This endpoint retrieves all devices associated with a specific user.';
 
       public static readonly GET_DEVICES_BY_SPACE_UUID_SUMMARY =
         'Get devices by space UUID';
@@ -552,16 +547,16 @@ export class ControllerRoute {
         'This endpoint retrieves the status of a specific power clamp device.';
 
       public static readonly ADD_SCENE_TO_DEVICE_SUMMARY =
-        'Add scene to device (4 Scene and 6 Scene devices only)';
+        'Add scene to device';
       public static readonly ADD_SCENE_TO_DEVICE_DESCRIPTION =
         'This endpoint adds a scene to a specific switch device.';
 
       public static readonly GET_SCENES_BY_DEVICE_SUMMARY =
-        'Get scenes by device (4 Scene and 6 Scene devices only)';
+        'Get scenes by device';
       public static readonly GET_SCENES_BY_DEVICE_DESCRIPTION =
         'This endpoint retrieves all scenes associated with a specific switch device.';
       public static readonly DELETE_SCENES_BY_SWITCH_NAME_SUMMARY =
-        'Delete scenes by device uuid and switch name (4 Scene and 6 Scene devices only)';
+        'Delete scenes by device uuid and switch name';
       public static readonly DELETE_SCENES_BY_SWITCH_NAME_DESCRIPTION =
         'This endpoint deletes all scenes associated with a specific switch device.';
     };

src/automation/services/automation.service.ts

@@ -123,6 +123,7 @@ export class AutomationService {
       );
       const formattedCondition = await this.prepareConditions(
         params.conditions,
+        projectUuid,
       );
 
       const response = await this.tuyaService.createAutomation(
@@ -585,7 +586,10 @@ export class AutomationService {
       updateAutomationDto;
     try {
       const formattedActions = await this.prepareActions(actions, projectUuid);
-      const formattedCondition = await this.prepareConditions(conditions);
+      const formattedCondition = await this.prepareConditions(
+        conditions,
+        projectUuid,
+      );
       const response = await this.tuyaService.updateAutomation(
         automationUuid,
         spaceTuyaUuid,
@@ -722,6 +726,7 @@ export class AutomationService {
           const device = await this.deviceService.getDeviceByDeviceUuid(
             action.entity_id,
             false,
+            projectUuid,
           );
           if (device) {
             action.entity_id = device.deviceTuyaUuid;
@@ -759,7 +764,10 @@ export class AutomationService {
     return convertedData;
   }
 
-  private async prepareConditions(conditions: Condition[]) {
+  private async prepareConditions(
+    conditions: Condition[],
+    projectUuid: string,
+  ) {
     const convertedData = convertKeysToSnakeCase(conditions);
     await Promise.all(
       convertedData.map(async (condition) => {
@@ -767,6 +775,7 @@ export class AutomationService {
           const device = await this.deviceService.getDeviceByDeviceUuid(
             condition.entity_id,
             false,
+            projectUuid,
           );
           if (device) {
             condition.entity_id = device.deviceTuyaUuid;

src/device/controllers/device.controller.ts

@@ -6,25 +6,23 @@ import {
   Post,
   Query,
   Param,
-  HttpStatus,
   UseGuards,
-  Req,
   Put,
   Delete,
+  Req,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
 import {
   AddDeviceDto,
   AddSceneToFourSceneDeviceDto,
+  AssignDeviceToSpaceDto,
   UpdateDeviceDto,
-  UpdateDeviceInSpaceDto,
 } from '../dtos/add.device.dto';
 import { GetDeviceLogsDto } from '../dtos/get.device.dto';
 import {
   ControlDeviceDto,
   BatchControlDevicesDto,
   BatchStatusDevicesDto,
-  BatchFactoryResetDevicesDto,
   GetSceneFourSceneDeviceDto,
 } from '../dtos/control.device.dto';
 import { CheckRoomGuard } from 'src/guards/room.guard';
@@ -50,65 +48,35 @@ export class DeviceController {
   @Permissions('SPACE_DEVICE_ASSIGN_DEVICE_TO_SPACE')
   @Post()
   @ApiOperation({
-    summary: ControllerRoute.DEVICE.ACTIONS.ADD_DEVICE_TO_USER_SUMMARY,
+    summary: ControllerRoute.DEVICE.ACTIONS.ADD_DEVICE_SUMMARY,
-    description: ControllerRoute.DEVICE.ACTIONS.ADD_DEVICE_TO_USER_DESCRIPTION,
+    description: ControllerRoute.DEVICE.ACTIONS.ADD_DEVICE_DESCRIPTION,
   })
-  async addDeviceUser(@Body() addDeviceDto: AddDeviceDto) {
+  async addNewDevice(
-    const device = await this.deviceService.addDeviceUser(addDeviceDto);
+    @Body() addDeviceDto: AddDeviceDto,
-
+    @Req() req: any,
-    return {
+  ): Promise<BaseResponseDto> {
-      statusCode: HttpStatus.CREATED,
+    const projectUuid = req.user.project.uuid;
-      success: true,
+    return await this.deviceService.addNewDevice(addDeviceDto, projectUuid);
-      message: 'device added successfully',
-      data: device,
-    };
-  }
-  @ApiBearerAuth()
-  @UseGuards(PermissionsGuard)
-  @Permissions('DEVICE_VIEW')
-  @Get('user/:userUuid')
-  @ApiOperation({
-    summary: ControllerRoute.DEVICE.ACTIONS.GET_DEVICES_BY_USER_SUMMARY,
-    description: ControllerRoute.DEVICE.ACTIONS.GET_DEVICES_BY_USER_DESCRIPTION,
-  })
-  async getDevicesByUser(@Param('userUuid') userUuid: string) {
-    return await this.deviceService.getDevicesByUser(userUuid);
   }
 
-  @ApiBearerAuth()
-  @UseGuards(PermissionsGuard)
-  @Permissions('SPACE_DEVICE_VIEW_DEVICE_IN_SPACE')
-  @Get('space/:spaceUuid')
-  @ApiOperation({
-    summary: ControllerRoute.DEVICE.ACTIONS.GET_DEVICES_BY_SPACE_UUID_SUMMARY,
-    description:
-      ControllerRoute.DEVICE.ACTIONS.GET_DEVICES_BY_SPACE_UUID_DESCRIPTION,
-  })
-  async getDevicesByUnitId(@Param('spaceUuid') spaceUuid: string) {
-    return await this.deviceService.getDevicesBySpaceUuid(spaceUuid);
-  }
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard, CheckRoomGuard)
   @Permissions('SUBSPACE_DEVICE_UPDATE_DEVICE_IN_SUBSPACE')
-  @Put('space')
+  @Post(':deviceUuid/space/:spaceUuid')
   @ApiOperation({
     summary: ControllerRoute.DEVICE.ACTIONS.UPDATE_DEVICE_IN_ROOM_SUMMARY,
     description:
       ControllerRoute.DEVICE.ACTIONS.UPDATE_DEVICE_IN_ROOM_DESCRIPTION,
   })
-  async updateDeviceInRoom(
+  async transferDeviceInSpaces(
-    @Body() updateDeviceInSpaceDto: UpdateDeviceInSpaceDto,
+    @Param() updateDeviceInSpaceDto: AssignDeviceToSpaceDto,
-  ) {
+    @Req() req: any,
-    const device = await this.deviceService.updateDeviceInSpace(
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.transferDeviceInSpaces(
       updateDeviceInSpaceDto,
+      projectUuid,
     );
-
-    return {
-      statusCode: HttpStatus.CREATED,
-      success: true,
-      message: 'device updated in room successfully',
-      data: device,
-    };
   }
 
   @ApiBearerAuth()
@@ -122,11 +90,11 @@ export class DeviceController {
   async getDeviceDetailsByDeviceId(
     @Param('deviceUuid') deviceUuid: string,
     @Req() req: any,
-  ) {
+  ): Promise<BaseResponseDto> {
-    const userUuid = req.user.uuid;
+    const projectUuid = req.user.project.uuid;
     return await this.deviceService.getDeviceDetailsByDeviceId(
       deviceUuid,
-      userUuid,
+      projectUuid,
     );
   }
   @ApiBearerAuth()
@@ -140,18 +108,14 @@ export class DeviceController {
   async updateDevice(
     @Param('deviceUuid') deviceUuid: string,
     @Body() updateDeviceDto: UpdateDeviceDto,
-  ) {
+    @Req() req: any,
-    const device = await this.deviceService.updateDevice(
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.updateDevice(
       deviceUuid,
       updateDeviceDto,
+      projectUuid,
     );
-
-    return {
-      statusCode: HttpStatus.CREATED,
-      success: true,
-      message: 'device updated successfully',
-      data: device,
-    };
   }
 
   @ApiBearerAuth()
@@ -165,8 +129,13 @@ export class DeviceController {
   })
   async getDeviceInstructionByDeviceId(
     @Param('deviceUuid') deviceUuid: string,
+    @Req() req: any,
   ) {
-    return await this.deviceService.getDeviceInstructionByDeviceId(deviceUuid);
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.getDeviceInstructionByDeviceId(
+      deviceUuid,
+      projectUuid,
+    );
   }
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
@@ -176,14 +145,18 @@ export class DeviceController {
     summary: ControllerRoute.DEVICE.ACTIONS.GET_DEVICE_STATUS_SUMMARY,
     description: ControllerRoute.DEVICE.ACTIONS.GET_DEVICE_STATUS_DESCRIPTION,
   })
-  async getDevicesInstructionStatus(@Param('deviceUuid') deviceUuid: string) {
+  async getDevicesInstructionStatus(
-    return await this.deviceService.getDevicesInstructionStatus(deviceUuid);
+    @Param('deviceUuid') deviceUuid: string,
+    @Req() req: any,
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.getDevicesStatus(deviceUuid, projectUuid);
   }
 
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('DEVICE_SINGLE_CONTROL')
-  @Post(':deviceUuid/control')
+  @Post(':deviceUuid/command')
   @ApiOperation({
     summary: ControllerRoute.DEVICE.ACTIONS.CONTROL_DEVICE_SUMMARY,
     description: ControllerRoute.DEVICE.ACTIONS.CONTROL_DEVICE_DESCRIPTION,
@@ -191,8 +164,14 @@ export class DeviceController {
   async controlDevice(
     @Body() controlDeviceDto: ControlDeviceDto,
     @Param('deviceUuid') deviceUuid: string,
-  ) {
+    @Req() req: any,
-    return await this.deviceService.controlDevice(controlDeviceDto, deviceUuid);
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.controlDevice(
+      controlDeviceDto,
+      deviceUuid,
+      projectUuid,
+    );
   }
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
@@ -206,10 +185,13 @@ export class DeviceController {
   async updateDeviceFirmware(
     @Param('deviceUuid') deviceUuid: string,
     @Param('firmwareVersion') firmwareVersion: number,
-  ) {
+    @Req() req: any,
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
     return await this.deviceService.updateDeviceFirmware(
       deviceUuid,
       firmwareVersion,
+      projectUuid,
     );
   }
   @ApiBearerAuth()
@@ -221,14 +203,21 @@ export class DeviceController {
     description:
       ControllerRoute.DEVICE.ACTIONS.GET_DEVICES_IN_GATEWAY_DESCRIPTION,
   })
-  async getDevicesInGateway(@Param('gatewayUuid') gatewayUuid: string) {
+  async getDevicesInGateway(
-    return await this.deviceService.getDevicesInGateway(gatewayUuid);
+    @Param('gatewayUuid') gatewayUuid: string,
+    @Req() req: any,
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.getDevicesInGateway(
+      gatewayUuid,
+      projectUuid,
+    );
   }
 
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('DEVICE_VIEW')
-  @Get('report-logs/:deviceUuid')
+  @Get(':deviceUuid/report-logs')
   @ApiOperation({
     summary: ControllerRoute.DEVICE.ACTIONS.GET_DEVICE_LOGS_SUMMARY,
     description: ControllerRoute.DEVICE.ACTIONS.GET_DEVICE_LOGS_DESCRIPTION,
@@ -236,13 +225,19 @@ export class DeviceController {
   async getBuildingChildByUuid(
     @Param('deviceUuid') deviceUuid: string,
     @Query() query: GetDeviceLogsDto,
-  ) {
+    @Req() req: any,
-    return await this.deviceService.getDeviceLogs(deviceUuid, query);
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.getDeviceLogs(
+      deviceUuid,
+      query,
+      projectUuid,
+    );
   }
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('DEVICE_BATCH_CONTROL')
-  @Post('control/batch')
+  @Post('batch')
   @ApiOperation({
     summary: ControllerRoute.DEVICE.ACTIONS.BATCH_CONTROL_DEVICES_SUMMARY,
     description:
@@ -250,13 +245,18 @@ export class DeviceController {
   })
   async batchControlDevices(
     @Body() batchControlDevicesDto: BatchControlDevicesDto,
+    @Req() req: any,
   ) {
-    return await this.deviceService.batchControlDevices(batchControlDevicesDto);
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.batchControlDevices(
+      batchControlDevicesDto,
+      projectUuid,
+    );
   }
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('DEVICE_BATCH_CONTROL')
-  @Get('status/batch')
+  @Get('batch')
   @ApiOperation({
     summary: ControllerRoute.DEVICE.ACTIONS.BATCH_STATUS_DEVICES_SUMMARY,
     description:
@@ -264,41 +264,15 @@ export class DeviceController {
   })
   async batchStatusDevices(
     @Query() batchStatusDevicesDto: BatchStatusDevicesDto,
-  ) {
+    @Req() req: any,
-    return await this.deviceService.batchStatusDevices(batchStatusDevicesDto);
+  ): Promise<BaseResponseDto> {
-  }
+    const projectUuid = req.user.project.uuid;
-  @ApiBearerAuth()
+    return await this.deviceService.batchStatusDevices(
-  @UseGuards(PermissionsGuard)
+      batchStatusDevicesDto,
-  @Permissions('DEVICE_DELETE')
+      projectUuid,
-  @Post('factory/reset/:deviceUuid')
-  @ApiOperation({
-    summary: ControllerRoute.DEVICE.ACTIONS.BATCH_FACTORY_RESET_DEVICES_SUMMARY,
-    description:
-      ControllerRoute.DEVICE.ACTIONS.BATCH_FACTORY_RESET_DEVICES_DESCRIPTION,
-  })
-  async batchFactoryResetDevices(
-    @Body() batchFactoryResetDevicesDto: BatchFactoryResetDevicesDto,
-  ) {
-    return await this.deviceService.batchFactoryResetDevices(
-      batchFactoryResetDevicesDto,
-    );
-  }
-  @ApiBearerAuth()
-  @UseGuards(PermissionsGuard)
-  @Permissions('DEVICE_VIEW')
-  @Get(':powerClampUuid/power-clamp/status')
-  @ApiOperation({
-    summary: ControllerRoute.DEVICE.ACTIONS.GET_POWER_CLAMP_STATUS_SUMMARY,
-    description:
-      ControllerRoute.DEVICE.ACTIONS.GET_POWER_CLAMP_STATUS_DESCRIPTION,
-  })
-  async getPowerClampInstructionStatus(
-    @Param('powerClampUuid') powerClampUuid: string,
-  ) {
-    return await this.deviceService.getPowerClampInstructionStatus(
-      powerClampUuid,
     );
   }
+
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard, CheckFourAndSixSceneDeviceTypeGuard)
   @Permissions('DEVICE_SINGLE_CONTROL')
@@ -310,18 +284,14 @@ export class DeviceController {
   async addSceneToSceneDevice(
     @Param('deviceUuid') deviceUuid: string,
     @Body() addSceneToFourSceneDeviceDto: AddSceneToFourSceneDeviceDto,
-  ) {
+    @Req() req: any,
-    const device = await this.deviceService.addSceneToSceneDevice(
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.addSceneToSceneDevice(
       deviceUuid,
       addSceneToFourSceneDeviceDto,
+      projectUuid,
     );
-
-    return {
-      statusCode: HttpStatus.CREATED,
-      success: true,
-      message: `scene added successfully to device ${deviceUuid}`,
-      data: device,
-    };
   }
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard, CheckFourAndSixSceneDeviceTypeGuard)
@@ -335,10 +305,13 @@ export class DeviceController {
   async getScenesBySceneDevice(
     @Param('deviceUuid') deviceUuid: string,
     @Query() getSceneFourSceneDeviceDto: GetSceneFourSceneDeviceDto,
-  ) {
+    @Req() req: any,
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
     return await this.deviceService.getScenesBySceneDevice(
       deviceUuid,
       getSceneFourSceneDeviceDto,
+      projectUuid,
     );
   }
   @ApiBearerAuth()
@@ -354,7 +327,13 @@ export class DeviceController {
   async deleteSceneFromSceneDevice(
     @Param() param: DeviceSceneParamDto,
     @Query() query: DeleteSceneFromSceneDeviceDto,
+    @Req() req: any,
   ): Promise<BaseResponseDto> {
-    return await this.deviceService.deleteSceneFromSceneDevice(param, query);
+    const projectUuid = req.user.project.uuid;
+    return await this.deviceService.deleteSceneFromSceneDevice(
+      param,
+      query,
+      projectUuid,
+    );
   }
 }

src/device/dtos/add.device.dto.ts

@@ -10,16 +10,8 @@ export class AddDeviceDto {
   @IsString()
   @IsNotEmpty()
   public deviceTuyaUuid: string;
-
-  @ApiProperty({
-    description: 'userUuid',
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
 }
-export class UpdateDeviceInSpaceDto {
+export class AssignDeviceToSpaceDto {
   @ApiProperty({
     description: 'deviceUuid',
     required: true,

src/device/dtos/control.device.dto.ts

@@ -1,5 +1,12 @@
+import { BatchDeviceTypeEnum } from '@app/common/constants/batch-device.enum';
 import { ApiProperty } from '@nestjs/swagger';
-import { IsArray, IsNotEmpty, IsOptional, IsString } from 'class-validator';
+import {
+  IsArray,
+  IsEnum,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+} from 'class-validator';
 
 export class ControlDeviceDto {
   @ApiProperty({
@@ -17,6 +24,15 @@ export class ControlDeviceDto {
   public value: any;
 }
 export class BatchControlDevicesDto {
+  @ApiProperty({
+    description: 'Operation type',
+    enum: BatchDeviceTypeEnum,
+    required: true,
+  })
+  @IsEnum(BatchDeviceTypeEnum)
+  @IsNotEmpty()
+  public operationType: BatchDeviceTypeEnum;
+
   @ApiProperty({
     description: 'devicesUuid',
     required: true,

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

@@ -64,13 +64,15 @@ export interface GetDeviceDetailsFunctionsStatusInterface {
 }
 
 export interface DeviceInstructionResponse {
-  productUuid: string;
+  data: {
-  productType: string;
+    productUuid: string;
-  functions: {
+    productType: string;
-    code: string;
+    functions: {
-    values: any[];
+      code: string;
-    dataType: string;
+      values: any[];
-  }[];
+      dataType: string;
+    }[];
+  };
 }
 export interface updateDeviceFirmwareInterface {
   success: boolean;

src/guards/scene.device.type.guard.ts

@@ -15,14 +15,17 @@ export class CheckFourAndSixSceneDeviceTypeGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
     const deviceUuid = request.params.deviceUuid;
-
+    const projectUuid = request.user.project.uuid;
     if (!deviceUuid) {
       throw new BadRequestException('Device UUID is required');
     }
 
     try {
-      const deviceDetails =
+      const deviceDetails = await this.deviceService.getDeviceByDeviceUuid(
-        await this.deviceService.getDeviceByDeviceUuid(deviceUuid);
+        deviceUuid,
+        true,
+        projectUuid,
+      );
 
       if (
         deviceDetails.productDevice.prodType !== ProductType.FOUR_S &&

src/scene/controllers/scene.controller.ts

@@ -8,6 +8,7 @@ import {
   Param,
   Post,
   Put,
+  Req,
   UseGuards,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
@@ -42,8 +43,13 @@ export class SceneController {
   })
   async addTapToRunScene(
     @Body() addSceneTapToRunDto: AddSceneTapToRunDto,
+    @Req() req: any,
   ): Promise<BaseResponseDto> {
-    return await this.sceneService.createScene(addSceneTapToRunDto);
+    const projectUuid = req.user.project.uuid;
+    return await this.sceneService.createScene(
+      addSceneTapToRunDto,
+      projectUuid,
+    );
   }
 
   @ApiBearerAuth()
@@ -100,10 +106,13 @@ export class SceneController {
   async updateTapToRunScene(
     @Body() updateSceneTapToRunDto: UpdateSceneTapToRunDto,
     @Param() param: SceneParamDto,
+    @Req() req: any,
   ) {
+    const projectUuid = req.user.project.uuid;
     return await this.sceneService.updateTapToRunScene(
       updateSceneTapToRunDto,
       param.sceneUuid,
+      projectUuid,
     );
   }
 

src/scene/services/scene.service.ts

@@ -60,13 +60,18 @@ export class SceneService {
 
   async createScene(
     addSceneTapToRunDto: AddSceneTapToRunDto,
+    projectUuid: string,
   ): Promise<BaseResponseDto> {
     try {
       const { spaceUuid } = addSceneTapToRunDto;
 
       const space = await this.getSpaceByUuid(spaceUuid);
 
-      const scene = await this.create(space.spaceTuyaUuid, addSceneTapToRunDto);
+      const scene = await this.create(
+        space.spaceTuyaUuid,
+        addSceneTapToRunDto,
+        projectUuid,
+      );
 
       return new SuccessResponseDto({
         message: `Successfully created new scene with uuid ${scene.uuid}`,
@@ -90,6 +95,7 @@ export class SceneService {
   async create(
     spaceTuyaUuid: string,
     addSceneTapToRunDto: AddSceneTapToRunDto,
+    projectUuid: string,
   ): Promise<SceneEntity> {
     const { iconUuid, showInHomePage, spaceUuid } = addSceneTapToRunDto;
 
@@ -107,6 +113,7 @@ export class SceneService {
       const response = await this.createSceneExternalService(
         spaceTuyaUuid,
         addSceneTapToRunDto,
+        projectUuid,
       );
 
       const scene = await this.sceneRepository.save({
@@ -137,10 +144,11 @@ export class SceneService {
     spaceTuyaUuid: string,
     sceneTuyaUuid: string,
     updateSceneTapToRunDto: UpdateSceneTapToRunDto,
+    projectUuid: string,
   ) {
     const { sceneName, decisionExpr, actions } = updateSceneTapToRunDto;
     try {
-      const formattedActions = await this.prepareActions(actions);
+      const formattedActions = await this.prepareActions(actions, projectUuid);
 
       const response = (await this.tuyaService.updateTapToRunScene(
         sceneTuyaUuid,
@@ -178,10 +186,11 @@ export class SceneService {
   async createSceneExternalService(
     spaceTuyaUuid: string,
     addSceneTapToRunDto: AddSceneTapToRunDto,
+    projectUuid: string,
   ) {
     const { sceneName, decisionExpr, actions } = addSceneTapToRunDto;
     try {
-      const formattedActions = await this.prepareActions(actions);
+      const formattedActions = await this.prepareActions(actions, projectUuid);
 
       const response = (await this.tuyaService.addTapToRunScene(
         spaceTuyaUuid,
@@ -324,6 +333,7 @@ export class SceneService {
   async updateTapToRunScene(
     updateSceneTapToRunDto: UpdateSceneTapToRunDto,
     sceneUuid: string,
+    projectUuid: string,
   ) {
     try {
       const scene = await this.findScene(sceneUuid);
@@ -340,6 +350,7 @@ export class SceneService {
         space.spaceTuyaUuid,
         scene.sceneTuyaUuid,
         addSceneTapToRunDto,
+        projectUuid,
       );
 
       if (!updateTuyaSceneResponse.success) {
@@ -573,7 +584,10 @@ export class SceneService {
     }
   }
 
-  private async prepareActions(actions: Action[]): Promise<ConvertedAction[]> {
+  private async prepareActions(
+    actions: Action[],
+    projectUuid: string,
+  ): Promise<ConvertedAction[]> {
     const convertedData = convertKeysToSnakeCase(actions) as ConvertedAction[];
 
     await Promise.all(
@@ -582,6 +596,7 @@ export class SceneService {
           const device = await this.deviceService.getDeviceByDeviceUuid(
             action.entity_id,
             false,
+            projectUuid,
           );
           if (device) {
             action.entity_id = device.deviceTuyaUuid;