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

Merge pull request #148 from SyncrowIOT/fix-duplication-issue-in-four-scene-device

Browse Source 
finished fix duplication
This commit is contained in:
faris Aljohari
2024-11-19 23:59:01 -06:00
committed by GitHub
parent 25ce2f7b94 7ea69a10b9
commit 0f484c5cbf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/common/src/modules/scene-device/entities/scene-device.entity.ts
View File

@ -1,4 +1,4 @@
import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm'; import { Column, Entity, JoinColumn, ManyToOne, Unique } from 'typeorm';
import { SceneDeviceDto } from '../dtos'; import { SceneDeviceDto } from '../dtos';
import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { AbstractEntity } from '../../abstract/entities/abstract.entity';
import { FourSceneSwitchesEnum } from '@app/common/constants/four-scene.enum'; import { FourSceneSwitchesEnum } from '@app/common/constants/four-scene.enum';
@ -6,6 +6,7 @@ import { DeviceEntity } from '../../device/entities';
import { SceneEntity } from '../../scene/entities'; import { SceneEntity } from '../../scene/entities';
@Entity({ name: 'scene-device' }) @Entity({ name: 'scene-device' })
@Unique(['device', 'switchName'])
export class SceneDeviceEntity extends AbstractEntity<SceneDeviceDto> { export class SceneDeviceEntity extends AbstractEntity<SceneDeviceDto> {
@Column({ @Column({
type: 'uuid', type: 'uuid',

1
src/device/services/device.service.ts
View File

@ -1285,7 +1285,6 @@ export class DeviceService {
const existingSceneDevice = await this.sceneDeviceRepository.findOne({ const existingSceneDevice = await this.sceneDeviceRepository.findOne({
where: { where: {
device: { uuid: deviceUuid }, device: { uuid: deviceUuid },
scene: { uuid: sceneUuid },
switchName: switchName, switchName: switchName,
}, },
relations: ['scene', 'device'], relations: ['scene', 'device'],