diff --git a/libs/common/src/modules/device/entities/device.entity.ts b/libs/common/src/modules/device/entities/device.entity.ts index 787b100..26d2e96 100644 --- a/libs/common/src/modules/device/entities/device.entity.ts +++ b/libs/common/src/modules/device/entities/device.entity.ts @@ -6,7 +6,6 @@ import { Unique, Index, JoinColumn, - JoinTable, } from 'typeorm'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { DeviceDto, DeviceUserPermissionDto } from '../dtos/device.dto'; @@ -77,9 +76,8 @@ export class DeviceEntity extends AbstractEntity { @OneToMany(() => SceneDeviceEntity, (sceneDevice) => sceneDevice.device, {}) sceneDevices: SceneDeviceEntity[]; - @OneToMany(() => NewTagEntity, (tag) => tag.devices) - @JoinTable({ name: 'device_tags' }) + // @JoinTable({ name: 'device_tags' }) public tag: NewTagEntity[]; constructor(partial: Partial) { diff --git a/libs/common/src/modules/tag/entities/tag.entity.ts b/libs/common/src/modules/tag/entities/tag.entity.ts index db20979..99a2265 100644 --- a/libs/common/src/modules/tag/entities/tag.entity.ts +++ b/libs/common/src/modules/tag/entities/tag.entity.ts @@ -1,11 +1,4 @@ -import { - Entity, - Column, - ManyToOne, - Unique, - ManyToMany, - OneToMany, -} from 'typeorm'; +import { Entity, Column, ManyToOne, Unique, ManyToMany } from 'typeorm'; import { ProductEntity } from '../../product/entities'; import { ProjectEntity } from '../../project/entities'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; @@ -55,7 +48,7 @@ export class NewTagEntity extends AbstractEntity { ) public subspaceModelAllocations: SubspaceModelProductAllocationEntity[]; - @OneToMany(() => DeviceEntity, (device) => device.tag) + @ManyToOne(() => DeviceEntity, (device) => device.tag) public devices: DeviceEntity[]; constructor(partial: Partial) {