ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-07-15 18:27:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #165 from SyncrowIOT/fix-add-scene-issue

Browse Source 
Update AutomationService to use SceneRepository for scene details
This commit is contained in:
faris Aljohari
2024-12-02 01:15:11 -06:00
committed by GitHub
parent b101b4cac6 5feabb8049
commit 7dca9ea5ff
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/automation/services/automation.service.ts
View File

@ -33,6 +33,7 @@ import {
import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service'; import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service';
import { ConvertedAction } from '@app/common/integrations/tuya/interfaces'; import { ConvertedAction } from '@app/common/integrations/tuya/interfaces';
import { SceneDeviceRepository } from '@app/common/modules/scene-device/repositories'; import { SceneDeviceRepository } from '@app/common/modules/scene-device/repositories';
import { SceneRepository } from '@app/common/modules/scene/repositories';
@Injectable() @Injectable()
export class AutomationService { export class AutomationService {
@ -43,6 +44,7 @@ export class AutomationService {
private readonly deviceService: DeviceService, private readonly deviceService: DeviceService,
private readonly tuyaService: TuyaService, private readonly tuyaService: TuyaService,
private readonly sceneDeviceRepository: SceneDeviceRepository, private readonly sceneDeviceRepository: SceneDeviceRepository,
private readonly sceneRepository: SceneRepository,
) { ) {
const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY'); const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY');
const secretKey = this.configService.get<string>('auth-config.SECRET_KEY'); const secretKey = this.configService.get<string>('auth-config.SECRET_KEY');
@ -245,13 +247,20 @@ export class AutomationService {
action.actionExecutor !== ActionExecutorEnum.DEVICE_ISSUE && action.actionExecutor !== ActionExecutorEnum.DEVICE_ISSUE &&
action.actionExecutor !== ActionExecutorEnum.DELAY action.actionExecutor !== ActionExecutorEnum.DELAY
) { ) {
const sceneDetails = await this.getTapToRunSceneDetailsTuya( const scene = await this.sceneRepository.findOne({
action.entityId, where: {
); uuid: action.entityId,
},
});
if (scene.uuid) {
const sceneDetails = await this.getTapToRunSceneDetailsTuya(
scene.sceneTuyaUuid,
);
if (sceneDetails.id) { if (sceneDetails.id) {
action.name = sceneDetails.name; action.name = sceneDetails.name;
action.type = sceneDetails.type; action.type = sceneDetails.type;
}
} }
} }
} }