Merge branch 'SP-205-be-user-device-permission' into SP-201-be-handle-roles

libs/common/src/database/database.module.ts

@@ -6,16 +6,14 @@ import { UserEntity } from '../modules/user/entities/user.entity';
 import { UserSessionEntity } from '../modules/session/entities/session.entity';
 import { UserOtpEntity } from '../modules/user-otp/entities';
 import { ProductEntity } from '../modules/product/entities';
-import {
-  DeviceEntity,
-  DeviceUserPermissionEntity,
-} from '../modules/device/entities';
+import { DeviceEntity } from '../modules/device/entities';
 import { PermissionTypeEntity } from '../modules/permission/entities';
 import { SpaceEntity } from '../modules/space/entities';
 import { SpaceTypeEntity } from '../modules/space-type/entities';
 import { UserSpaceEntity } from '../modules/user-space/entities';
 import { GroupEntity } from '../modules/group/entities';
 import { GroupDeviceEntity } from '../modules/group-device/entities';
+import { DeviceUserPermissionEntity } from '../modules/device-user-permission/entities';
 
 @Module({
   imports: [
@@ -43,6 +41,7 @@ import { GroupDeviceEntity } from '../modules/group-device/entities';
           UserSpaceEntity,
           GroupEntity,
           GroupDeviceEntity,
+          DeviceUserPermissionEntity,
         ],
         namingStrategy: new SnakeNamingStrategy(),
         synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),

libs/common/src/modules/device-user-permission/device.user.permission.repository.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { DeviceUserPermissionEntity } from './entities';
+@Module({
+  providers: [],
+  exports: [],
+  controllers: [],
+  imports: [TypeOrmModule.forFeature([DeviceUserPermissionEntity])],
+})
+export class DeviceUserPermissionRepositoryModule {}

libs/common/src/modules/device-user-permission/dtos/device.user.permission.dto.ts

@@ -1,6 +1,6 @@
 import { IsNotEmpty, IsString } from 'class-validator';
 
-export class DeviceUserTypeDto {
+export class DeviceUserPermissionDto {
   @IsString()
   @IsNotEmpty()
   public uuid: string;

libs/common/src/modules/device-user-permission/dtos/index.ts

@@ -0,0 +1 @@
+export * from './device.user.permission.dto';

libs/common/src/modules/device-user-permission/entities/device.user.permission.entity.ts

@@ -0,0 +1,43 @@
+import { Column, Entity, ManyToOne, Unique } from 'typeorm';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { DeviceUserPermissionDto } from '../dtos';
+import { PermissionTypeEntity } from '../../permission/entities';
+import { DeviceEntity } from '../../device/entities';
+import { UserEntity } from '../../user/entities';
+
+@Entity({ name: 'device-user-permission' })
+@Unique(['userUuid', 'deviceUuid'])
+export class DeviceUserPermissionEntity extends AbstractEntity<DeviceUserPermissionDto> {
+  @Column({
+    nullable: false,
+  })
+  public userUuid: string;
+
+  @Column({
+    nullable: false,
+  })
+  deviceUuid: string;
+
+  @ManyToOne(() => DeviceEntity, (device) => device.permission, {
+    nullable: false,
+  })
+  device: DeviceEntity;
+
+  @ManyToOne(
+    () => PermissionTypeEntity,
+    (permissionType) => permissionType.permission,
+    {
+      nullable: false,
+    },
+  )
+  permissionType: PermissionTypeEntity;
+
+  @ManyToOne(() => UserEntity, (user) => user.userPermission, {
+    nullable: false,
+  })
+  user: UserEntity;
+  constructor(partial: Partial<DeviceUserPermissionEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}

libs/common/src/modules/device-user-permission/entities/index.ts

@@ -0,0 +1 @@
+export * from './device.user.permission.entity';

libs/common/src/modules/device-user-permission/repositories/device.user.permission.repository.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { DeviceUserPermissionEntity } from '../entities';
 
 @Injectable()
-export class DeviceUserTypeRepository extends Repository<DeviceUserPermissionEntity> {
+export class DeviceUserPermissionRepository extends Repository<DeviceUserPermissionEntity> {
   constructor(private dataSource: DataSource) {
     super(DeviceUserPermissionEntity, dataSource.createEntityManager());
   }

libs/common/src/modules/device-user-permission/repositories/index.ts

@@ -0,0 +1 @@
+export * from './device.user.permission.repository';

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 {}

libs/common/src/modules/device/dtos/index.ts

@@ -1,2 +1 @@
 export * from './device.dto';
-export * from './device-user-type.dto';

libs/common/src/modules/device/entities/device-user-type.entity.ts

@@ -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<DeviceUserTypeDto> {
-  @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<DeviceUserPermissionEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

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'])

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

@@ -1,2 +1 @@
 export * from './device.entity';
-export * from './device-user-type.entity';

libs/common/src/modules/device/repositories/index.ts

@@ -1,2 +1 @@
 export * from './device.repository';
-export * from './device-user-type.repository';

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

@@ -2,7 +2,7 @@ import { Column, Entity, OneToMany } from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { PermissionType } from '@app/common/constants/permission-type.enum';
 import { PermissionTypeDto } from '../dtos/permission.dto';
-import { DeviceUserPermissionEntity } from '../../device/entities';
+import { DeviceUserPermissionEntity } from '../../device-user-permission/entities';
 
 @Entity({ name: 'permission-type' })
 export class PermissionTypeEntity extends AbstractEntity<PermissionTypeDto> {
@@ -14,7 +14,7 @@ export class PermissionTypeEntity extends AbstractEntity<PermissionTypeDto> {
 
   @OneToMany(
     () => DeviceUserPermissionEntity,
-    (permission) => permission.type,
+    (permission) => permission.permissionType,
     {
       nullable: true,
       onDelete: 'CASCADE',

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

@@ -1,3 +1,4 @@
+import { DeviceUserPermissionEntity } from '../../device-user-permission/entities/device.user.permission.entity';
 import { Column, Entity, OneToMany } from 'typeorm';
 import { UserDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
@@ -51,6 +52,11 @@ export class UserEntity extends AbstractEntity<UserDto> {
   @OneToMany(() => UserSpaceEntity, (userSpace) => userSpace.user)
   userSpaces: UserSpaceEntity[];
 
+  @OneToMany(
+    () => DeviceUserPermissionEntity,
+    (userPermission) => userPermission.user,
+  )
+  userPermission: DeviceUserPermissionEntity[];
   constructor(partial: Partial<UserEntity>) {
     super();
     Object.assign(this, partial);