ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-11-26 20:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #157 from SyncrowIOT/fix-space-column-issue-in-scene-table

Browse Source 
Update scene service to use space object instead of spaceUuid
This commit is contained in:
faris Aljohari
2024-11-24 23:48:59 -06:00
committed by GitHub
parent eb8e6a89b3 9721cb765f
commit 3509ea70bd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scene/services/scene.service.ts
View File

@ -106,7 +106,7 @@ export class SceneService {
sceneTuyaUuid: response.result.id, sceneTuyaUuid: response.result.id,
sceneIcon: { uuid: iconUuid || defaultSceneIcon.uuid }, sceneIcon: { uuid: iconUuid || defaultSceneIcon.uuid },
showInHomePage, showInHomePage,
spaceUuid, space: { uuid: spaceUuid },
}); });
return scene; return scene;
@ -174,7 +174,7 @@ export class SceneService {
const scenesData = await this.sceneRepository.find({ const scenesData = await this.sceneRepository.find({
where: { where: {
spaceUuid, space: { uuid: spaceUuid },
...(showInHomePage ? { showInHomePage } : {}), ...(showInHomePage ? { showInHomePage } : {}),
}, },
relations: ['sceneIcon'], relations: ['sceneIcon'],
@ -278,11 +278,11 @@ export class SceneService {
) { ) {
try { try {
const scene = await this.findScene(sceneUuid); const scene = await this.findScene(sceneUuid);
const space = await this.getSpaceByUuid(scene.spaceUuid); const space = await this.getSpaceByUuid(scene.space.uuid);
const addSceneTapToRunDto: AddSceneTapToRunDto = { const addSceneTapToRunDto: AddSceneTapToRunDto = {
...updateSceneTapToRunDto, ...updateSceneTapToRunDto,
spaceUuid: scene.spaceUuid, spaceUuid: scene.space.uuid,
iconUuid: updateSceneTapToRunDto.iconUuid, iconUuid: updateSceneTapToRunDto.iconUuid,
showInHomePage: updateSceneTapToRunDto.showInHomePage, showInHomePage: updateSceneTapToRunDto.showInHomePage,
}; };
@ -310,7 +310,7 @@ export class SceneService {
sceneIcon: { sceneIcon: {
uuid: addSceneTapToRunDto.iconUuid, uuid: addSceneTapToRunDto.iconUuid,
}, },
spaceUuid: scene.spaceUuid, space: { uuid: scene.space.uuid },
}, },
); );
return new SuccessResponseDto({ return new SuccessResponseDto({
@ -438,7 +438,7 @@ export class SceneService {
showInHome: scene.showInHomePage, showInHome: scene.showInHomePage,
type: 'tap_to_run', type: 'tap_to_run',
actions, actions,
spaceId: scene.spaceUuid, spaceId: scene.space.uuid,
}; };
} catch (err) { } catch (err) {
if (err instanceof BadRequestException) { if (err instanceof BadRequestException) {
@ -456,7 +456,7 @@ export class SceneService {
try { try {
const { sceneUuid } = params; const { sceneUuid } = params;
const scene = await this.findScene(sceneUuid); const scene = await this.findScene(sceneUuid);
const space = await this.getSpaceByUuid(scene.spaceUuid); const space = await this.getSpaceByUuid(scene.space.uuid);
await this.delete(scene.sceneTuyaUuid, space.spaceTuyaUuid); await this.delete(scene.sceneTuyaUuid, space.spaceTuyaUuid);
await this.sceneRepository.delete({ uuid: sceneUuid }); await this.sceneRepository.delete({ uuid: sceneUuid });