diff --git a/libs/common/src/modules/device/device.repository.module.ts b/libs/common/src/modules/device/device.repository.module.ts index b3d35d7..438e268 100644 --- a/libs/common/src/modules/device/device.repository.module.ts +++ b/libs/common/src/modules/device/device.repository.module.ts @@ -1,13 +1,11 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { DeviceEntity, DeviceUserPermissionEntity } from './entities'; +import { DeviceEntity } from './entities'; @Module({ providers: [], exports: [], controllers: [], - imports: [ - TypeOrmModule.forFeature([DeviceEntity, DeviceUserPermissionEntity]), - ], + imports: [TypeOrmModule.forFeature([DeviceEntity])], }) export class DeviceRepositoryModule {} diff --git a/libs/common/src/modules/device/dtos/device-user-type.dto.ts b/libs/common/src/modules/device/dtos/device-user-type.dto.ts deleted file mode 100644 index 0571356..0000000 --- a/libs/common/src/modules/device/dtos/device-user-type.dto.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { IsNotEmpty, IsString } from 'class-validator'; - -export class DeviceUserTypeDto { - @IsString() - @IsNotEmpty() - public uuid: string; - - @IsString() - @IsNotEmpty() - public userUuid: string; - - @IsString() - @IsNotEmpty() - public deviceUuid: string; - - @IsString() - @IsNotEmpty() - public permissionTypeUuid: string; -} diff --git a/libs/common/src/modules/device/dtos/index.ts b/libs/common/src/modules/device/dtos/index.ts index 9d647c8..343f2bd 100644 --- a/libs/common/src/modules/device/dtos/index.ts +++ b/libs/common/src/modules/device/dtos/index.ts @@ -1,2 +1 @@ export * from './device.dto'; -export * from './device-user-type.dto'; diff --git a/libs/common/src/modules/device/entities/device-user-type.entity.ts b/libs/common/src/modules/device/entities/device-user-type.entity.ts deleted file mode 100644 index 904b18a..0000000 --- a/libs/common/src/modules/device/entities/device-user-type.entity.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm'; -import { AbstractEntity } from '../../abstract/entities/abstract.entity'; -import { DeviceUserTypeDto } from '../dtos/device-user-type.dto'; -import { DeviceEntity } from './device.entity'; -import { PermissionTypeEntity } from '../../permission/entities'; - -@Entity({ name: 'device-user-permission' }) -export class DeviceUserPermissionEntity extends AbstractEntity { - @Column({ - nullable: false, - }) - public userUuid: string; - - @Column({ - nullable: false, - }) - deviceUuid: string; - - @Column({ - nullable: false, - }) - public permissionTypeUuid: string; - - @ManyToOne(() => DeviceEntity, { - onDelete: 'CASCADE', - onUpdate: 'CASCADE', - }) - @JoinColumn({ name: 'device_uuid', referencedColumnName: 'uuid' }) - device: DeviceEntity; - - @ManyToOne(() => PermissionTypeEntity, { - onDelete: 'CASCADE', - onUpdate: 'CASCADE', - }) - @JoinColumn({ name: 'permission_type_uuid', referencedColumnName: 'uuid' }) - type: PermissionTypeEntity; - - constructor(partial: Partial) { - super(); - Object.assign(this, partial); - } -} diff --git a/libs/common/src/modules/device/entities/device.entity.ts b/libs/common/src/modules/device/entities/device.entity.ts index df27e44..a7f5548 100644 --- a/libs/common/src/modules/device/entities/device.entity.ts +++ b/libs/common/src/modules/device/entities/device.entity.ts @@ -1,10 +1,10 @@ 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'; +import { DeviceUserPermissionEntity } from '../../device-user-permission/entities'; @Entity({ name: 'device' }) @Unique(['spaceDevice', 'deviceTuyaUuid']) diff --git a/libs/common/src/modules/device/entities/index.ts b/libs/common/src/modules/device/entities/index.ts index d6cf7b2..64911c7 100644 --- a/libs/common/src/modules/device/entities/index.ts +++ b/libs/common/src/modules/device/entities/index.ts @@ -1,2 +1 @@ export * from './device.entity'; -export * from './device-user-type.entity'; diff --git a/libs/common/src/modules/device/repositories/device-user-type.repository.ts b/libs/common/src/modules/device/repositories/device-user-type.repository.ts deleted file mode 100644 index e3d2176..0000000 --- a/libs/common/src/modules/device/repositories/device-user-type.repository.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { DataSource, Repository } from 'typeorm'; -import { Injectable } from '@nestjs/common'; -import { DeviceUserPermissionEntity } from '../entities'; - -@Injectable() -export class DeviceUserTypeRepository extends Repository { - constructor(private dataSource: DataSource) { - super(DeviceUserPermissionEntity, dataSource.createEntityManager()); - } -} diff --git a/libs/common/src/modules/device/repositories/index.ts b/libs/common/src/modules/device/repositories/index.ts index f91e07f..bf59e16 100644 --- a/libs/common/src/modules/device/repositories/index.ts +++ b/libs/common/src/modules/device/repositories/index.ts @@ -1,2 +1 @@ export * from './device.repository'; -export * from './device-user-type.repository';