Merge branch 'dev' into real-time-devices

src/scene/interface/scene.interface.ts

@@ -21,3 +21,8 @@ export interface DeleteTapToRunSceneInterface {
   msg?: string;
   result: boolean;
 }
+export interface SceneDetailsResult {
+  id: string;
+  name: string;
+  type: string;
+}

src/scene/services/scene.service.ts

@@ -15,6 +15,7 @@ import {
   AddTapToRunSceneInterface,
   DeleteTapToRunSceneInterface,
   GetTapToRunSceneByUnitInterface,
+  SceneDetailsResult,
 } from '../interface/scene.interface';
 import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
 
@@ -256,6 +257,18 @@ export class SceneService {
           if (device) {
             action.entityId = device.uuid;
           }
+        } else if (
+          action.actionExecutor !== 'device_issue' &&
+          action.actionExecutor !== 'delay'
+        ) {
+          const sceneDetails = await this.getTapToRunSceneDetailsTuya(
+            action.entityId,
+          );
+
+          if (sceneDetails.id) {
+            action.name = sceneDetails.name;
+            action.type = sceneDetails.type;
+          }
         }
       }
 
@@ -275,6 +288,38 @@ export class SceneService {
       }
     }
   }
+  async getTapToRunSceneDetailsTuya(
+    sceneId: string,
+  ): Promise<SceneDetailsResult> {
+    try {
+      const path = `/v2.0/cloud/scene/rule/${sceneId}`;
+      const response = await this.tuya.request({
+        method: 'GET',
+        path,
+      });
+
+      if (!response.success) {
+        throw new HttpException(response.msg, HttpStatus.BAD_REQUEST);
+      }
+      const camelCaseResponse = convertKeysToCamelCase(response);
+      const { id, name, type } = camelCaseResponse.result;
+
+      return {
+        id,
+        name,
+        type,
+      } as SceneDetailsResult;
+    } catch (err) {
+      if (err instanceof BadRequestException) {
+        throw err; // Re-throw BadRequestException
+      } else {
+        throw new HttpException(
+          'Scene not found for Tuya',
+          HttpStatus.NOT_FOUND,
+        );
+      }
+    }
+  }
   async updateTapToRunScene(
     updateSceneTapToRunDto: UpdateSceneTapToRunDto,
     sceneId: string,