From 7ea69a10b971fad1b5b734232a4ade148b077493 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:01:09 -0600 Subject: [PATCH] finished fix duplication --- .../src/modules/scene-device/entities/scene-device.entity.ts | 3 ++- src/device/services/device.service.ts | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/common/src/modules/scene-device/entities/scene-device.entity.ts b/libs/common/src/modules/scene-device/entities/scene-device.entity.ts index 537a627..27882d6 100644 --- a/libs/common/src/modules/scene-device/entities/scene-device.entity.ts +++ b/libs/common/src/modules/scene-device/entities/scene-device.entity.ts @@ -1,4 +1,4 @@ -import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm'; +import { Column, Entity, JoinColumn, ManyToOne, Unique } from 'typeorm'; import { SceneDeviceDto } from '../dtos'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { FourSceneSwitchesEnum } from '@app/common/constants/four-scene.enum'; @@ -6,6 +6,7 @@ import { DeviceEntity } from '../../device/entities'; import { SceneEntity } from '../../scene/entities'; @Entity({ name: 'scene-device' }) +@Unique(['device', 'switchName']) export class SceneDeviceEntity extends AbstractEntity { @Column({ type: 'uuid', diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts index 950da44..1e1d5f0 100644 --- a/src/device/services/device.service.ts +++ b/src/device/services/device.service.ts @@ -1285,7 +1285,6 @@ export class DeviceService { const existingSceneDevice = await this.sceneDeviceRepository.findOne({ where: { device: { uuid: deviceUuid }, - scene: { uuid: sceneUuid }, switchName: switchName, }, relations: ['scene', 'device'],