Refactor Device Module

libs/common/src/modules/device/entities/device.entity.ts

@@ -1,26 +1,19 @@
-import { Column, Entity, OneToMany } from 'typeorm';
+import { Column, Entity, ManyToOne, OneToMany, Unique } from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { DeviceDto } from '../dtos/device.dto';
 import { DeviceUserPermissionEntity } from './device-user-type.entity';
 import { GroupDeviceEntity } from '../../group-device/entities';
+import { SpaceEntity } from '../../space/entities';
+import { ProductEntity } from '../../product/entities';
 
 @Entity({ name: 'device' })
+@Unique(['spaceDevice', 'deviceTuyaUuid'])
 export class DeviceEntity extends AbstractEntity<DeviceDto> {
-  @Column({
-    nullable: false,
-  })
-  public spaceUuid: string;
-
   @Column({
     nullable: false,
   })
   deviceTuyaUuid: string;
 
-  @Column({
-    nullable: false,
-  })
-  public productUuid: string;
-
   @Column({
     nullable: true,
     default: true,
@@ -44,6 +37,15 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
   )
   userGroupDevices: GroupDeviceEntity[];
 
+  @ManyToOne(() => SpaceEntity, (space) => space.devicesSpaceEntity, {
+    nullable: false,
+  })
+  spaceDevice: SpaceEntity;
+
+  @ManyToOne(() => ProductEntity, (product) => product.devicesProductEntity, {
+    nullable: false,
+  })
+  productDevice: ProductEntity;
   constructor(partial: Partial<DeviceEntity>) {
     super();
     Object.assign(this, partial);

libs/common/src/modules/product/entities/product.entity.ts

@@ -1,6 +1,7 @@
-import { Column, Entity } from 'typeorm';
+import { Column, Entity, OneToMany } from 'typeorm';
 import { ProductDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { DeviceEntity } from '../../device/entities';
 
 @Entity({ name: 'product' })
 export class ProductEntity extends AbstractEntity<ProductDto> {
@@ -20,6 +21,11 @@ export class ProductEntity extends AbstractEntity<ProductDto> {
   })
   public prodType: string;
 
+  @OneToMany(
+    () => DeviceEntity,
+    (devicesProductEntity) => devicesProductEntity.productDevice,
+  )
+  devicesProductEntity: DeviceEntity[];
   constructor(partial: Partial<ProductEntity>) {
     super();
     Object.assign(this, partial);

libs/common/src/modules/space/entities/space.entity.ts

@@ -3,6 +3,7 @@ import { SpaceDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { SpaceTypeEntity } from '../../space-type/entities';
 import { UserSpaceEntity } from '../../user-space/entities';
+import { DeviceEntity } from '../../device/entities';
 
 @Entity({ name: 'space' })
 export class SpaceEntity extends AbstractEntity<SpaceDto> {
@@ -30,6 +31,12 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   @OneToMany(() => UserSpaceEntity, (userSpace) => userSpace.space)
   userSpaces: UserSpaceEntity[];
 
+  @OneToMany(
+    () => DeviceEntity,
+    (devicesSpaceEntity) => devicesSpaceEntity.spaceDevice,
+  )
+  devicesSpaceEntity: DeviceEntity[];
+
   constructor(partial: Partial<SpaceEntity>) {
     super();
     Object.assign(this, partial);