Merge pull request #71 from SyncrowIOT/SP-345-review-the-modules-in-the-backend

changed entity and type structure

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

@@ -4,18 +4,18 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { SnakeNamingStrategy } from './strategies';
 import { UserEntity } from '../modules/user/entities/user.entity';
 import { UserSessionEntity } from '../modules/session/entities/session.entity';
-import { UserOtpEntity } from '../modules/user-otp/entities';
+import { UserOtpEntity } from '../modules/user/entities';
 import { ProductEntity } from '../modules/product/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 { DeviceUserPermissionEntity } from '../modules/device-user-permission/entities';
-import { UserRoleEntity } from '../modules/user-role/entities';
+import { SpaceTypeEntity } from '../modules/space/entities';
+import { UserSpaceEntity } from '../modules/user/entities';
+import { DeviceUserPermissionEntity } from '../modules/device/entities';
+import { UserRoleEntity } from '../modules/user/entities';
 import { RoleTypeEntity } from '../modules/role-type/entities';
-import { UserNotificationEntity } from '../modules/user-notification/entities';
-import { DeviceNotificationEntity } from '../modules/device-notification/entities';
+import { UserNotificationEntity } from '../modules/user/entities';
+import { DeviceNotificationEntity } from '../modules/device/entities';
 import { RegionEntity } from '../modules/region/entities';
 import { TimeZoneEntity } from '../modules/timezone/entities';
 

libs/common/src/helper/helper.module.ts

@@ -7,8 +7,8 @@ import { TuyaWebSocketService } from './services/tuya.web.socket.service';
 
 import { OneSignalService } from './services/onesignal.service';
 import { DeviceMessagesService } from './services/device.messages.service';
-import { DeviceNotificationRepositoryModule } from '../modules/device-notification/device.notification.module';
-import { DeviceNotificationRepository } from '../modules/device-notification/repositories';
+import { DeviceRepositoryModule } from '../modules/device/device.repository.module';
+import { DeviceNotificationRepository } from '../modules/device/repositories';
 
 @Global()
 @Module({
@@ -23,6 +23,6 @@ import { DeviceNotificationRepository } from '../modules/device-notification/rep
   ],
   exports: [HelperHashService, SpacePermissionService],
   controllers: [],
-  imports: [SpaceRepositoryModule, DeviceNotificationRepositoryModule],
+  imports: [SpaceRepositoryModule, DeviceRepositoryModule],
 })
 export class HelperModule {}

libs/common/src/helper/services/device.messages.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { DeviceNotificationRepository } from '@app/common/modules/device-notification/repositories';
+import { DeviceNotificationRepository } from '@app/common/modules/device/repositories';
 import { OneSignalService } from './onesignal.service';
 
 @Injectable()

libs/common/src/modules/device-notification/device.notification.module.ts

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

libs/common/src/modules/device-notification/dtos/device.notification.dto.ts

@@ -1,15 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class DeviceNotificationDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public deviceUuid: string;
-}

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

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

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

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

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

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

libs/common/src/modules/device-notification/repositories/device.notification.repository.ts

@@ -1,10 +0,0 @@
-import { DataSource, Repository } from 'typeorm';
-import { Injectable } from '@nestjs/common';
-import { DeviceNotificationEntity } from '../entities';
-
-@Injectable()
-export class DeviceNotificationRepository extends Repository<DeviceNotificationEntity> {
-  constructor(private dataSource: DataSource) {
-    super(DeviceNotificationEntity, dataSource.createEntityManager());
-  }
-}

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

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

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

@@ -1,10 +0,0 @@
-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,19 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class DeviceUserPermissionDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public deviceUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public permissionTypeUuid: string;
-}

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

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

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

@@ -1,43 +0,0 @@
-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

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

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

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

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

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

libs/common/src/modules/device/device.repository.module.ts

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

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

@@ -21,3 +21,35 @@ export class DeviceDto {
   @IsNotEmpty()
   productUuid: string;
 }
+
+export class DeviceUserPermissionDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public userUuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public deviceUuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public permissionTypeUuid: string;
+}
+
+export class DeviceNotificationDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public userUuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public deviceUuid: string;
+}

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

@@ -1,11 +1,11 @@
 import { Column, Entity, ManyToOne, OneToMany, Unique, Index } from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { DeviceDto } from '../dtos/device.dto';
+import { DeviceDto, DeviceUserPermissionDto } from '../dtos/device.dto';
 import { SpaceEntity } from '../../space/entities';
 import { ProductEntity } from '../../product/entities';
-import { DeviceUserPermissionEntity } from '../../device-user-permission/entities';
-import { DeviceNotificationEntity } from '../../device-notification/entities';
 import { UserEntity } from '../../user/entities';
+import { DeviceNotificationDto } from '../dtos';
+import { PermissionTypeEntity } from '../../permission/entities';
 
 @Entity({ name: 'device' })
 @Unique(['deviceTuyaUuid'])
@@ -60,3 +60,68 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
     Object.assign(this, partial);
   }
 }
+
+@Entity({ name: 'device-notification' })
+@Unique(['userUuid', 'deviceUuid'])
+export class DeviceNotificationEntity extends AbstractEntity<DeviceNotificationDto> {
+  @Column({
+    nullable: false,
+  })
+  public userUuid: string;
+
+  @Column({
+    nullable: false,
+  })
+  deviceUuid: string;
+
+  @ManyToOne(() => DeviceEntity, (device) => device.permission, {
+    nullable: false,
+  })
+  device: DeviceEntity;
+
+  @ManyToOne(() => UserEntity, (user) => user.userPermission, {
+    nullable: false,
+  })
+  user: UserEntity;
+  constructor(partial: Partial<DeviceNotificationEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}
+
+@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/repositories/device.repository.ts

@@ -1,6 +1,10 @@
 import { DataSource, Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
-import { DeviceEntity } from '../entities';
+import {
+  DeviceEntity,
+  DeviceNotificationEntity,
+  DeviceUserPermissionEntity,
+} from '../entities';
 
 @Injectable()
 export class DeviceRepository extends Repository<DeviceEntity> {
@@ -8,3 +12,15 @@ export class DeviceRepository extends Repository<DeviceEntity> {
     super(DeviceEntity, dataSource.createEntityManager());
   }
 }
+@Injectable()
+export class DeviceNotificationRepository extends Repository<DeviceNotificationEntity> {
+  constructor(private dataSource: DataSource) {
+    super(DeviceNotificationEntity, dataSource.createEntityManager());
+  }
+}
+@Injectable()
+export class DeviceUserPermissionRepository extends Repository<DeviceUserPermissionEntity> {
+  constructor(private dataSource: DataSource) {
+    super(DeviceUserPermissionEntity, dataSource.createEntityManager());
+  }
+}

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-user-permission/entities';
+import { DeviceUserPermissionEntity } from '../../device/entities';
 
 @Entity({ name: 'permission-type' })
 export class PermissionTypeEntity extends AbstractEntity<PermissionTypeDto> {

libs/common/src/modules/role-type/entities/role.type.entity.ts

@@ -2,7 +2,7 @@ import { Column, Entity, OneToMany, Unique } from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { RoleTypeDto } from '../dtos/role.type.dto';
 import { RoleType } from '@app/common/constants/role.type.enum';
-import { UserRoleEntity } from '../../user-role/entities';
+import { UserRoleEntity } from '../../user/entities';
 
 @Entity({ name: 'role-type' })
 @Unique(['type'])

libs/common/src/modules/space-type/dtos/index.ts

@@ -1 +0,0 @@
-export * from './space.type.dto';

libs/common/src/modules/space-type/dtos/space.type.dto.ts

@@ -1,11 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class SpaceTypeDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public type: string;
-}

libs/common/src/modules/space-type/entities/index.ts

@@ -1 +0,0 @@
-export * from './space.type.entity';

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

@@ -1,26 +0,0 @@
-import { Column, Entity, OneToMany } from 'typeorm';
-import { SpaceTypeDto } from '../dtos';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { SpaceEntity } from '../../space/entities';
-
-@Entity({ name: 'space-type' })
-export class SpaceTypeEntity extends AbstractEntity<SpaceTypeDto> {
-  @Column({
-    type: 'uuid',
-    default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value
-    nullable: false,
-  })
-  public uuid: string;
-
-  @Column({
-    nullable: false,
-  })
-  type: string;
-
-  @OneToMany(() => SpaceEntity, (space) => space.spaceType)
-  spaces: SpaceEntity[];
-  constructor(partial: Partial<SpaceTypeEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

libs/common/src/modules/space-type/repositories/index.ts

@@ -1 +0,0 @@
-export * from './space.type.repository';

libs/common/src/modules/space-type/repositories/space.type.repository.ts

@@ -1,10 +0,0 @@
-import { DataSource, Repository } from 'typeorm';
-import { Injectable } from '@nestjs/common';
-import { SpaceTypeEntity } from '../entities/space.type.entity';
-
-@Injectable()
-export class SpaceTypeRepository extends Repository<SpaceTypeEntity> {
-  constructor(private dataSource: DataSource) {
-    super(SpaceTypeEntity, dataSource.createEntityManager());
-  }
-}

libs/common/src/modules/space-type/space.type.repository.module.ts

@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { SpaceTypeEntity } from './entities/space.type.entity';
-
-@Module({
-  providers: [],
-  exports: [],
-  controllers: [],
-  imports: [TypeOrmModule.forFeature([SpaceTypeEntity])],
-})
-export class SpaceTypeRepositoryModule {}

libs/common/src/modules/space/dtos/space.dto.ts

@@ -21,3 +21,13 @@ export class SpaceDto {
   @IsNotEmpty()
   public invitationCode: string;
 }
+
+export class SpaceTypeDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public type: string;
+}

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

@@ -1,16 +1,37 @@
 import { Column, Entity, ManyToOne, OneToMany, Unique } from 'typeorm';
-import { SpaceDto } from '../dtos';
+import { SpaceDto, SpaceTypeDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { SpaceTypeEntity } from '../../space-type/entities';
-import { UserSpaceEntity } from '../../user-space/entities';
+import { UserSpaceEntity } from '../../user/entities';
 import { DeviceEntity } from '../../device/entities';
 
+@Entity({ name: 'space-type' })
+export class SpaceTypeEntity extends AbstractEntity<SpaceTypeDto> {
+  @Column({
+    type: 'uuid',
+    default: () => 'gen_random_uuid()',
+    nullable: false,
+  })
+  public uuid: string;
+
+  @Column({
+    nullable: false,
+  })
+  type: string;
+
+  @OneToMany(() => SpaceEntity, (space) => space.spaceType)
+  spaces: SpaceEntity[];
+  constructor(partial: Partial<SpaceTypeEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}
+
 @Entity({ name: 'space' })
 @Unique(['invitationCode'])
 export class SpaceEntity extends AbstractEntity<SpaceDto> {
   @Column({
     type: 'uuid',
-    default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value
+    default: () => 'gen_random_uuid()',
     nullable: false,
   })
   public uuid: string;

libs/common/src/modules/space/repositories/space.repository.ts

@@ -1,6 +1,6 @@
 import { DataSource, Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
-import { SpaceEntity } from '../entities/space.entity';
+import { SpaceEntity, SpaceTypeEntity } from '../entities';
 
 @Injectable()
 export class SpaceRepository extends Repository<SpaceEntity> {
@@ -8,3 +8,10 @@ export class SpaceRepository extends Repository<SpaceEntity> {
     super(SpaceEntity, dataSource.createEntityManager());
   }
 }
+
+@Injectable()
+export class SpaceTypeRepository extends Repository<SpaceTypeEntity> {
+  constructor(private dataSource: DataSource) {
+    super(SpaceTypeEntity, dataSource.createEntityManager());
+  }
+}

libs/common/src/modules/space/space.repository.module.ts

@@ -1,11 +1,11 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { SpaceEntity } from './entities/space.entity';
+import { SpaceEntity, SpaceTypeEntity } from './entities';
 
 @Module({
   providers: [],
   exports: [],
   controllers: [],
-  imports: [TypeOrmModule.forFeature([SpaceEntity])],
+  imports: [TypeOrmModule.forFeature([SpaceEntity, SpaceTypeEntity])],
 })
 export class SpaceRepositoryModule {}

libs/common/src/modules/user-notification/dtos/index.ts

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

libs/common/src/modules/user-notification/dtos/user.notification.dto.ts

@@ -1,19 +0,0 @@
-import { IsBoolean, IsNotEmpty, IsString } from 'class-validator';
-
-export class UserNotificationDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public subscriptionUuid: string;
-
-  @IsBoolean()
-  @IsNotEmpty()
-  public active: boolean;
-}

libs/common/src/modules/user-notification/entities/index.ts

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

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

@@ -1,27 +0,0 @@
-import { Column, Entity, ManyToOne, Unique } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { UserNotificationDto } from '../dtos';
-import { UserEntity } from '../../user/entities';
-
-@Entity({ name: 'user-notification' })
-@Unique(['user', 'subscriptionUuid'])
-export class UserNotificationEntity extends AbstractEntity<UserNotificationDto> {
-  @ManyToOne(() => UserEntity, (user) => user.roles, {
-    nullable: false,
-  })
-  user: UserEntity;
-  @Column({
-    nullable: false,
-  })
-  subscriptionUuid: string;
-
-  @Column({
-    nullable: false,
-    default: true,
-  })
-  active: boolean;
-  constructor(partial: Partial<UserNotificationEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

libs/common/src/modules/user-notification/repositories/index.ts

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

libs/common/src/modules/user-notification/repositories/user.notification.repository.ts

@@ -1,10 +0,0 @@
-import { DataSource, Repository } from 'typeorm';
-import { Injectable } from '@nestjs/common';
-import { UserNotificationEntity } from '../entities';
-
-@Injectable()
-export class UserNotificationRepository extends Repository<UserNotificationEntity> {
-  constructor(private dataSource: DataSource) {
-    super(UserNotificationEntity, dataSource.createEntityManager());
-  }
-}

libs/common/src/modules/user-notification/user.notification.repository.module.ts

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

libs/common/src/modules/user-otp/dtos/index.ts

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

libs/common/src/modules/user-otp/dtos/user-otp.dto.ts

@@ -1,19 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class UserOtpDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public email: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public otpCode: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public expiryTime: string;
-}

libs/common/src/modules/user-otp/entities/index.ts

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

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

@@ -1,34 +0,0 @@
-import { Column, Entity } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { UserOtpDto } from '../dtos';
-import { OtpType } from '../../../../src/constants/otp-type.enum';
-
-@Entity({ name: 'user-otp' })
-export class UserOtpEntity extends AbstractEntity<UserOtpDto> {
-  @Column({
-    type: 'uuid',
-    default: () => 'gen_random_uuid()',
-    nullable: false,
-  })
-  public uuid: string;
-
-  @Column({ nullable: false })
-  email: string;
-
-  @Column({ nullable: false })
-  otpCode: string;
-
-  @Column({ nullable: false })
-  expiryTime: Date;
-
-  @Column({
-    type: 'enum',
-    enum: Object.values(OtpType),
-  })
-  type: OtpType;
-
-  constructor(partial: Partial<UserOtpEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

libs/common/src/modules/user-otp/repositories/user-otp.repository.ts

@@ -1,10 +0,0 @@
-import { DataSource, Repository } from 'typeorm';
-import { Injectable } from '@nestjs/common';
-import { UserOtpEntity } from '../entities';
-
-@Injectable()
-export class UserOtpRepository extends Repository<UserOtpEntity> {
-  constructor(private dataSource: DataSource) {
-    super(UserOtpEntity, dataSource.createEntityManager());
-  }
-}

libs/common/src/modules/user-otp/user-otp.repository.module.ts

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

libs/common/src/modules/user-role/dtos/index.ts

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

libs/common/src/modules/user-role/dtos/user.role.dto.ts

@@ -1,15 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class UserRoleDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public roleTypeUuid: string;
-}

libs/common/src/modules/user-role/entities/index.ts

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

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

@@ -1,24 +0,0 @@
-import { Entity, ManyToOne, Unique } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { UserRoleDto } from '../dtos';
-import { UserEntity } from '../../user/entities';
-import { RoleTypeEntity } from '../../role-type/entities';
-
-@Entity({ name: 'user-role' })
-@Unique(['user', 'roleType'])
-export class UserRoleEntity extends AbstractEntity<UserRoleDto> {
-  @ManyToOne(() => UserEntity, (user) => user.roles, {
-    nullable: false,
-  })
-  user: UserEntity;
-
-  @ManyToOne(() => RoleTypeEntity, (roleType) => roleType.roles, {
-    nullable: false,
-  })
-  roleType: RoleTypeEntity;
-
-  constructor(partial: Partial<UserRoleEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

libs/common/src/modules/user-role/repositories/index.ts

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

libs/common/src/modules/user-role/repositories/user.role.repository.ts

@@ -1,10 +0,0 @@
-import { DataSource, Repository } from 'typeorm';
-import { Injectable } from '@nestjs/common';
-import { UserRoleEntity } from '../entities';
-
-@Injectable()
-export class UserRoleRepository extends Repository<UserRoleEntity> {
-  constructor(private dataSource: DataSource) {
-    super(UserRoleEntity, dataSource.createEntityManager());
-  }
-}

libs/common/src/modules/user-role/user.role.repository.module.ts

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

libs/common/src/modules/user-space/dtos/index.ts

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

libs/common/src/modules/user-space/dtos/user.space.dto.ts

@@ -1,15 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class UserSpaceDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public spaceUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
-}

libs/common/src/modules/user-space/entities/index.ts

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

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

@@ -1,29 +0,0 @@
-import { Column, Entity, ManyToOne, Unique } from 'typeorm';
-import { UserSpaceDto } from '../dtos';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { SpaceEntity } from '../../space/entities';
-import { UserEntity } from '../../user/entities';
-
-@Entity({ name: 'user-space' })
-@Unique(['user', 'space'])
-export class UserSpaceEntity extends AbstractEntity<UserSpaceDto> {
-  @Column({
-    type: 'uuid',
-    default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value
-    nullable: false,
-  })
-  public uuid: string;
-
-  @ManyToOne(() => UserEntity, (user) => user.userSpaces, { nullable: false })
-  user: UserEntity;
-
-  @ManyToOne(() => SpaceEntity, (space) => space.userSpaces, {
-    nullable: false,
-  })
-  space: SpaceEntity;
-
-  constructor(partial: Partial<UserSpaceEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

libs/common/src/modules/user-space/repositories/index.ts

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

libs/common/src/modules/user-space/repositories/user.space.repository.ts

@@ -1,10 +0,0 @@
-import { DataSource, Repository } from 'typeorm';
-import { Injectable } from '@nestjs/common';
-import { UserSpaceEntity } from '../entities/user.space.entity';
-
-@Injectable()
-export class UserSpaceRepository extends Repository<UserSpaceEntity> {
-  constructor(private dataSource: DataSource) {
-    super(UserSpaceEntity, dataSource.createEntityManager());
-  }
-}

libs/common/src/modules/user-space/user.space.repository.module.ts

@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserSpaceEntity } from './entities/user.space.entity';
-
-@Module({
-  providers: [],
-  exports: [],
-  controllers: [],
-  imports: [TypeOrmModule.forFeature([UserSpaceEntity])],
-})
-export class UserSpaceRepositoryModule {}

libs/common/src/modules/user/dtos/user.dto.ts

@@ -1,4 +1,4 @@
-import { IsNotEmpty, IsString } from 'class-validator';
+import { IsBoolean, IsNotEmpty, IsString } from 'class-validator';
 
 export class UserDto {
   @IsString()
@@ -21,3 +21,67 @@ export class UserDto {
   @IsNotEmpty()
   public lastName: string;
 }
+
+export class UserNotificationDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public userUuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public subscriptionUuid: string;
+
+  @IsBoolean()
+  @IsNotEmpty()
+  public active: boolean;
+}
+
+export class UserOtpDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public email: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public otpCode: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public expiryTime: string;
+}
+
+export class UserRoleDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public userUuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public roleTypeUuid: string;
+}
+
+export class UserSpaceDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public spaceUuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public userUuid: string;
+}

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

@@ -1,15 +1,23 @@
-import { DeviceUserPermissionEntity } from '../../device-user-permission/entities/device.user.permission.entity';
-import { Column, Entity, ManyToOne, OneToMany } from 'typeorm';
-import { UserDto } from '../dtos';
+import { Column, Entity, ManyToOne, OneToMany, Unique } from 'typeorm';
+import {
+  UserDto,
+  UserNotificationDto,
+  UserOtpDto,
+  UserRoleDto,
+  UserSpaceDto,
+} from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { UserSpaceEntity } from '../../user-space/entities';
-import { UserRoleEntity } from '../../user-role/entities';
-import { DeviceNotificationEntity } from '../../device-notification/entities';
-import { UserNotificationEntity } from '../../user-notification/entities';
-import { DeviceEntity } from '../../device/entities';
+import {
+  DeviceEntity,
+  DeviceNotificationEntity,
+  DeviceUserPermissionEntity,
+} from '../../device/entities';
 import { defaultProfilePicture } from '@app/common/constants/default.profile.picture';
 import { RegionEntity } from '../../region/entities';
 import { TimeZoneEntity } from '../../timezone/entities';
+import { OtpType } from '../../../../src/constants/otp-type.enum';
+import { RoleTypeEntity } from '../../role-type/entities';
+import { SpaceEntity } from '../../space/entities';
 
 @Entity({ name: 'user' })
 export class UserEntity extends AbstractEntity<UserDto> {
@@ -99,3 +107,99 @@ export class UserEntity extends AbstractEntity<UserDto> {
     Object.assign(this, partial);
   }
 }
+
+@Entity({ name: 'user-notification' })
+@Unique(['user', 'subscriptionUuid'])
+export class UserNotificationEntity extends AbstractEntity<UserNotificationDto> {
+  @ManyToOne(() => UserEntity, (user) => user.roles, {
+    nullable: false,
+  })
+  user: UserEntity;
+  @Column({
+    nullable: false,
+  })
+  subscriptionUuid: string;
+
+  @Column({
+    nullable: false,
+    default: true,
+  })
+  active: boolean;
+  constructor(partial: Partial<UserNotificationEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}
+
+@Entity({ name: 'user-otp' })
+export class UserOtpEntity extends AbstractEntity<UserOtpDto> {
+  @Column({
+    type: 'uuid',
+    default: () => 'gen_random_uuid()',
+    nullable: false,
+  })
+  public uuid: string;
+
+  @Column({ nullable: false })
+  email: string;
+
+  @Column({ nullable: false })
+  otpCode: string;
+
+  @Column({ nullable: false })
+  expiryTime: Date;
+
+  @Column({
+    type: 'enum',
+    enum: Object.values(OtpType),
+  })
+  type: OtpType;
+
+  constructor(partial: Partial<UserOtpEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}
+
+@Entity({ name: 'user-role' })
+@Unique(['user', 'roleType'])
+export class UserRoleEntity extends AbstractEntity<UserRoleDto> {
+  @ManyToOne(() => UserEntity, (user) => user.roles, {
+    nullable: false,
+  })
+  user: UserEntity;
+
+  @ManyToOne(() => RoleTypeEntity, (roleType) => roleType.roles, {
+    nullable: false,
+  })
+  roleType: RoleTypeEntity;
+
+  constructor(partial: Partial<UserRoleEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}
+
+@Entity({ name: 'user-space' })
+@Unique(['user', 'space'])
+export class UserSpaceEntity extends AbstractEntity<UserSpaceDto> {
+  @Column({
+    type: 'uuid',
+    default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value
+    nullable: false,
+  })
+  public uuid: string;
+
+  @ManyToOne(() => UserEntity, (user) => user.userSpaces, { nullable: false })
+  user: UserEntity;
+
+  @ManyToOne(() => SpaceEntity, (space) => space.userSpaces, {
+    nullable: false,
+  })
+  space: SpaceEntity;
+
+  constructor(partial: Partial<UserSpaceEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}

libs/common/src/modules/user/repositories/user.repository.ts

@@ -1,6 +1,12 @@
 import { DataSource, Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
-import { UserEntity } from '../entities/user.entity';
+import {
+  UserEntity,
+  UserNotificationEntity,
+  UserOtpEntity,
+  UserRoleEntity,
+  UserSpaceEntity,
+} from '../entities/';
 
 @Injectable()
 export class UserRepository extends Repository<UserEntity> {
@@ -8,3 +14,31 @@ export class UserRepository extends Repository<UserEntity> {
     super(UserEntity, dataSource.createEntityManager());
   }
 }
+
+@Injectable()
+export class UserNotificationRepository extends Repository<UserNotificationEntity> {
+  constructor(private dataSource: DataSource) {
+    super(UserNotificationEntity, dataSource.createEntityManager());
+  }
+}
+
+@Injectable()
+export class UserOtpRepository extends Repository<UserOtpEntity> {
+  constructor(private dataSource: DataSource) {
+    super(UserOtpEntity, dataSource.createEntityManager());
+  }
+}
+
+@Injectable()
+export class UserRoleRepository extends Repository<UserRoleEntity> {
+  constructor(private dataSource: DataSource) {
+    super(UserRoleEntity, dataSource.createEntityManager());
+  }
+}
+
+@Injectable()
+export class UserSpaceRepository extends Repository<UserSpaceEntity> {
+  constructor(private dataSource: DataSource) {
+    super(UserSpaceEntity, dataSource.createEntityManager());
+  }
+}

libs/common/src/modules/user/user.repository.module.ts

@@ -1,11 +1,25 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserEntity } from './entities/user.entity';
+import {
+  UserEntity,
+  UserNotificationEntity,
+  UserOtpEntity,
+  UserRoleEntity,
+  UserSpaceEntity,
+} from './entities';
 
 @Module({
   providers: [],
   exports: [],
   controllers: [],
-  imports: [TypeOrmModule.forFeature([UserEntity])],
+  imports: [
+    TypeOrmModule.forFeature([
+      UserEntity,
+      UserNotificationEntity,
+      UserOtpEntity,
+      UserRoleEntity,
+      UserSpaceEntity,
+    ]),
+  ],
 })
 export class UserRepositoryModule {}

libs/common/src/seed/seeder.module.ts

@@ -7,13 +7,12 @@ import { ConfigModule } from '@nestjs/config';
 import { RoleTypeRepositoryModule } from '../modules/role-type/role.type.repository.module';
 import { RoleTypeRepository } from '../modules/role-type/repositories';
 import { RoleTypeSeeder } from './services/role.type.seeder';
-import { SpaceTypeRepository } from '../modules/space-type/repositories';
+import { SpaceTypeRepository } from '../modules/space/repositories';
 import { SpaceTypeSeeder } from './services/space.type.seeder';
-import { SpaceTypeRepositoryModule } from '../modules/space-type/space.type.repository.module';
+import { SpaceRepositoryModule } from '../modules/space/space.repository.module';
 import { SuperAdminSeeder } from './services/supper.admin.seeder';
 import { UserRepository } from '../modules/user/repositories';
-import { UserRoleRepository } from '../modules/user-role/repositories';
-import { UserRoleRepositoryModule } from '../modules/user-role/user.role.repository.module';
+import { UserRoleRepository } from '../modules/user/repositories';
 import { UserRepositoryModule } from '../modules/user/user.repository.module';
 import { RegionSeeder } from './services/regions.seeder';
 import { RegionRepository } from '../modules/region/repositories';
@@ -44,8 +43,7 @@ import { TimeZoneRepository } from '../modules/timezone/repositories';
     PermissionTypeRepositoryModule,
     RoleTypeRepositoryModule,
     UserRepositoryModule,
-    UserRoleRepositoryModule,
-    SpaceTypeRepositoryModule,
+    SpaceRepositoryModule,
   ],
 })
 export class SeederModule {}

libs/common/src/seed/services/space.type.seeder.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { SpaceType } from '../../constants/space-type.enum';
-import { SpaceTypeRepository } from '../../modules/space-type/repositories';
+import { SpaceTypeRepository } from '../../modules/space/repositories';
 
 @Injectable()
 export class SpaceTypeSeeder {

libs/common/src/seed/services/supper.admin.seeder.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { UserRepository } from '@app/common/modules/user/repositories';
 import { RoleType } from '@app/common/constants/role.type.enum';
-import { UserRoleRepository } from '@app/common/modules/user-role/repositories';
+import { UserRoleRepository } from '@app/common/modules/user/repositories';
 import { RoleTypeRepository } from '@app/common/modules/role-type/repositories';
 import { ConfigService } from '@nestjs/config';
 import { HelperHashService } from '../../helper/services';

src/auth/auth.module.ts

@@ -2,14 +2,16 @@ import { Module } from '@nestjs/common';
 import { AuthenticationController } from './controllers/authentication.controller';
 import { AuthenticationService } from './services/authentication.service';
 import { ConfigModule } from '@nestjs/config';
-import { UserRepositoryModule } from '../../libs/common/src/modules/user/user.repository.module';
+import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module';
 import { CommonModule } from '../../libs/common/src';
 import { UserAuthController } from './controllers';
 import { UserAuthService } from './services';
-import { UserRepository } from '../../libs/common/src/modules/user/repositories';
-import { UserSessionRepository } from '../../libs/common/src/modules/session/repositories/session.repository';
-import { UserOtpRepository } from '../../libs/common/src/modules/user-otp/repositories/user-otp.repository';
-import { UserRoleRepository } from '@app/common/modules/user-role/repositories';
+import { UserRepository } from '@app/common/modules/user/repositories';
+import { UserSessionRepository } from '@app/common/modules/session/repositories/session.repository';
+import {
+  UserRoleRepository,
+  UserOtpRepository,
+} from '@app/common/modules/user/repositories';
 import { RoleTypeRepository } from '@app/common/modules/role-type/repositories';
 
 @Module({

src/auth/services/user-auth.service.ts

@@ -1,5 +1,5 @@
 import { RoleTypeRepository } from './../../../libs/common/src/modules/role-type/repositories/role.type.repository';
-import { UserRoleRepository } from './../../../libs/common/src/modules/user-role/repositories/user.role.repository';
+import { UserRoleRepository } from './../../../libs/common/src/modules/user/repositories/user.repository';
 import { UserRepository } from '../../../libs/common/src/modules/user/repositories';
 import {
   BadRequestException,
@@ -12,7 +12,7 @@ import { HelperHashService } from '../../../libs/common/src/helper/services';
 import { UserLoginDto } from '../dtos/user-login.dto';
 import { AuthService } from '../../../libs/common/src/auth/services/auth.service';
 import { UserSessionRepository } from '../../../libs/common/src/modules/session/repositories/session.repository';
-import { UserOtpRepository } from '../../../libs/common/src/modules/user-otp/repositories/user-otp.repository';
+import { UserOtpRepository } from '../../../libs/common/src/modules/user/repositories/user.repository';
 import { ForgetPasswordDto, UserOtpDto, VerifyOtpDto } from '../dtos';
 import { EmailService } from '../../../libs/common/src/util/email.service';
 import { OtpType } from '../../../libs/common/src/constants/otp-type.enum';

src/building/building.module.ts

@@ -4,21 +4,13 @@ import { BuildingController } from './controllers/building.controller';
 import { ConfigModule } from '@nestjs/config';
 import { SpaceRepositoryModule } from '@app/common/modules/space/space.repository.module';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
-import { SpaceTypeRepositoryModule } from '@app/common/modules/space-type/space.type.repository.module';
-import { SpaceTypeRepository } from '@app/common/modules/space-type/repositories';
-import { UserSpaceRepositoryModule } from '@app/common/modules/user-space/user.space.repository.module';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { SpaceTypeRepository } from '@app/common/modules/space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 import { UserRepository } from '@app/common/modules/user/repositories';
 import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module';
 
 @Module({
-  imports: [
-    ConfigModule,
-    SpaceRepositoryModule,
-    SpaceTypeRepositoryModule,
-    UserSpaceRepositoryModule,
-    UserRepositoryModule,
-  ],
+  imports: [ConfigModule, SpaceRepositoryModule, UserRepositoryModule],
   controllers: [BuildingController],
   providers: [
     BuildingService,

src/building/services/building.service.ts

@@ -1,5 +1,5 @@
 import { GetBuildingChildDto } from '../dtos/get.building.dto';
-import { SpaceTypeRepository } from '../../../libs/common/src/modules/space-type/repositories/space.type.repository';
+import { SpaceTypeRepository } from '../../../libs/common/src/modules/space/repositories/space.repository';
 import {
   Injectable,
   HttpException,
@@ -17,7 +17,7 @@ import {
 } from '../interface/building.interface';
 import { SpaceEntity } from '@app/common/modules/space/entities';
 import { UpdateBuildingNameDto } from '../dtos/update.building.dto';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 
 @Injectable()
 export class BuildingService {

src/community/community.module.ts

@@ -4,22 +4,14 @@ import { CommunityController } from './controllers/community.controller';
 import { ConfigModule } from '@nestjs/config';
 import { SpaceRepositoryModule } from '@app/common/modules/space/space.repository.module';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
-import { SpaceTypeRepositoryModule } from '@app/common/modules/space-type/space.type.repository.module';
-import { SpaceTypeRepository } from '@app/common/modules/space-type/repositories';
-import { UserSpaceRepositoryModule } from '@app/common/modules/user-space/user.space.repository.module';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { SpaceTypeRepository } from '@app/common/modules/space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module';
 import { UserRepository } from '@app/common/modules/user/repositories';
 import { SpacePermissionService } from '@app/common/helper/services';
 
 @Module({
-  imports: [
-    ConfigModule,
-    SpaceRepositoryModule,
-    SpaceTypeRepositoryModule,
-    UserSpaceRepositoryModule,
-    UserRepositoryModule,
-  ],
+  imports: [ConfigModule, SpaceRepositoryModule, UserRepositoryModule],
   controllers: [CommunityController],
   providers: [
     CommunityService,

src/community/services/community.service.ts

@@ -1,5 +1,5 @@
 import { GetCommunityChildDto } from './../dtos/get.community.dto';
-import { SpaceTypeRepository } from './../../../libs/common/src/modules/space-type/repositories/space.type.repository';
+import { SpaceTypeRepository } from './../../../libs/common/src/modules/space/repositories/space.repository';
 import {
   Injectable,
   HttpException,
@@ -16,7 +16,7 @@ import {
 } from '../interface/community.interface';
 import { SpaceEntity } from '@app/common/modules/space/entities';
 import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 
 @Injectable()
 export class CommunityService {

src/device-messages/device-messages.module.ts

@@ -2,11 +2,11 @@ import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { DeviceMessagesSubscriptionController } from './controllers';
 import { DeviceMessagesSubscriptionService } from './services';
-import { DeviceNotificationRepositoryModule } from '@app/common/modules/device-notification/device.notification.module';
-import { DeviceNotificationRepository } from '@app/common/modules/device-notification/repositories';
+import { DeviceRepositoryModule } from '@app/common/modules/device/device.repository.module';
+import { DeviceNotificationRepository } from '@app/common/modules/device/repositories';
 
 @Module({
-  imports: [ConfigModule, DeviceNotificationRepositoryModule],
+  imports: [ConfigModule, DeviceRepositoryModule],
   controllers: [DeviceMessagesSubscriptionController],
   providers: [DeviceNotificationRepository, DeviceMessagesSubscriptionService],
   exports: [DeviceMessagesSubscriptionService],

src/device-messages/services/device-messages.service.ts

@@ -1,6 +1,6 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { DeviceMessagesAddDto } from '../dtos/device-messages.dto';
-import { DeviceNotificationRepository } from '@app/common/modules/device-notification/repositories';
+import { DeviceNotificationRepository } from '@app/common/modules/device/repositories';
 
 @Injectable()
 export class DeviceMessagesSubscriptionService {

src/device/device.module.ts

@@ -8,7 +8,7 @@ import { DeviceRepositoryModule } from '@app/common/modules/device';
 import { DeviceRepository } from '@app/common/modules/device/repositories';
 import { PermissionTypeRepository } from '@app/common/modules/permission/repositories';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
-import { DeviceUserPermissionRepository } from '@app/common/modules/device-user-permission/repositories';
+import { DeviceUserPermissionRepository } from '@app/common/modules/device/repositories';
 import { UserRepository } from '@app/common/modules/user/repositories';
 @Module({
   imports: [ConfigModule, ProductRepositoryModule, DeviceRepositoryModule],

src/floor/floor.module.ts

@@ -4,21 +4,13 @@ import { FloorController } from './controllers/floor.controller';
 import { ConfigModule } from '@nestjs/config';
 import { SpaceRepositoryModule } from '@app/common/modules/space/space.repository.module';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
-import { SpaceTypeRepositoryModule } from '@app/common/modules/space-type/space.type.repository.module';
-import { SpaceTypeRepository } from '@app/common/modules/space-type/repositories';
-import { UserSpaceRepositoryModule } from '@app/common/modules/user-space/user.space.repository.module';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { SpaceTypeRepository } from '@app/common/modules/space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module';
 import { UserRepository } from '@app/common/modules/user/repositories';
 
 @Module({
-  imports: [
-    ConfigModule,
-    SpaceRepositoryModule,
-    SpaceTypeRepositoryModule,
-    UserSpaceRepositoryModule,
-    UserRepositoryModule,
-  ],
+  imports: [ConfigModule, SpaceRepositoryModule, UserRepositoryModule],
   controllers: [FloorController],
   providers: [
     FloorService,

src/floor/services/floor.service.ts

@@ -1,5 +1,5 @@
 import { GetFloorChildDto } from '../dtos/get.floor.dto';
-import { SpaceTypeRepository } from '../../../libs/common/src/modules/space-type/repositories/space.type.repository';
+import { SpaceTypeRepository } from '../../../libs/common/src/modules/space/repositories/space.repository';
 import {
   Injectable,
   HttpException,
@@ -17,7 +17,7 @@ import {
 } from '../interface/floor.interface';
 import { SpaceEntity } from '@app/common/modules/space/entities';
 import { UpdateFloorNameDto } from '../dtos/update.floor.dto';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 
 @Injectable()
 export class FloorService {

src/role/role.module.ts

@@ -4,10 +4,10 @@ import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { RoleService } from './services/role.service';
 import { RoleController } from './controllers/role.controller';
-import { DeviceUserPermissionRepository } from '@app/common/modules/device-user-permission/repositories';
+import { DeviceUserPermissionRepository } from '@app/common/modules/device/repositories';
 import { PermissionTypeRepository } from '@app/common/modules/permission/repositories';
 import { RoleTypeRepository } from '@app/common/modules/role-type/repositories';
-import { UserRoleRepository } from '@app/common/modules/user-role/repositories';
+import { UserRoleRepository } from '@app/common/modules/user/repositories';
 
 @Module({
   imports: [ConfigModule, DeviceRepositoryModule],

src/role/services/role.service.ts

@@ -1,7 +1,7 @@
 import { RoleTypeRepository } from './../../../libs/common/src/modules/role-type/repositories/role.type.repository';
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { AddUserRoleDto } from '../dtos/role.add.dto';
-import { UserRoleRepository } from '@app/common/modules/user-role/repositories';
+import { UserRoleRepository } from '@app/common/modules/user/repositories';
 import { QueryFailedError } from 'typeorm';
 
 @Injectable()

src/room/room.module.ts

@@ -4,21 +4,13 @@ import { RoomController } from './controllers/room.controller';
 import { ConfigModule } from '@nestjs/config';
 import { SpaceRepositoryModule } from '@app/common/modules/space/space.repository.module';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
-import { SpaceTypeRepositoryModule } from '@app/common/modules/space-type/space.type.repository.module';
-import { SpaceTypeRepository } from '@app/common/modules/space-type/repositories';
-import { UserSpaceRepositoryModule } from '@app/common/modules/user-space/user.space.repository.module';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { SpaceTypeRepository } from '@app/common/modules/space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module';
 import { UserRepository } from '@app/common/modules/user/repositories';
 
 @Module({
-  imports: [
-    ConfigModule,
-    SpaceRepositoryModule,
-    SpaceTypeRepositoryModule,
-    UserSpaceRepositoryModule,
-    UserRepositoryModule,
-  ],
+  imports: [ConfigModule, SpaceRepositoryModule, UserRepositoryModule],
   controllers: [RoomController],
   providers: [
     RoomService,

src/room/services/room.service.ts

@@ -1,4 +1,4 @@
-import { SpaceTypeRepository } from '../../../libs/common/src/modules/space-type/repositories/space.type.repository';
+import { SpaceTypeRepository } from '../../../libs/common/src/modules/space/repositories/space.repository';
 import {
   Injectable,
   HttpException,
@@ -14,7 +14,7 @@ import {
   GetRoomByUserUuidInterface,
 } from '../interface/room.interface';
 import { UpdateRoomNameDto } from '../dtos/update.room.dto';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 
 @Injectable()
 export class RoomService {

src/unit/services/unit.service.ts

@@ -1,5 +1,5 @@
 import { GetUnitChildDto } from '../dtos/get.unit.dto';
-import { SpaceTypeRepository } from '../../../libs/common/src/modules/space-type/repositories/space.type.repository';
+import { SpaceTypeRepository } from '../../../libs/common/src/modules/space/repositories/space.repository';
 import {
   Injectable,
   HttpException,
@@ -18,7 +18,7 @@ import {
 } from '../interface/unit.interface';
 import { SpaceEntity } from '@app/common/modules/space/entities';
 import { UpdateUnitNameDto } from '../dtos/update.unit.dto';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 import { generateRandomString } from '@app/common/helper/randomString';
 import { UserDevicePermissionService } from 'src/user-device-permission/services';
 import { PermissionType } from '@app/common/constants/permission-type.enum';

src/unit/unit.module.ts

@@ -4,24 +4,16 @@ import { UnitController } from './controllers/unit.controller';
 import { ConfigModule } from '@nestjs/config';
 import { SpaceRepositoryModule } from '@app/common/modules/space/space.repository.module';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
-import { SpaceTypeRepositoryModule } from '@app/common/modules/space-type/space.type.repository.module';
-import { SpaceTypeRepository } from '@app/common/modules/space-type/repositories';
-import { UserSpaceRepositoryModule } from '@app/common/modules/user-space/user.space.repository.module';
-import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
+import { SpaceTypeRepository } from '@app/common/modules/space/repositories';
+import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module';
 import { UserRepository } from '@app/common/modules/user/repositories';
 import { UserDevicePermissionService } from 'src/user-device-permission/services';
-import { DeviceUserPermissionRepository } from '@app/common/modules/device-user-permission/repositories';
+import { DeviceUserPermissionRepository } from '@app/common/modules/device/repositories';
 import { PermissionTypeRepository } from '@app/common/modules/permission/repositories';
 
 @Module({
-  imports: [
-    ConfigModule,
-    SpaceRepositoryModule,
-    SpaceTypeRepositoryModule,
-    UserSpaceRepositoryModule,
-    UserRepositoryModule,
-  ],
+  imports: [ConfigModule, SpaceRepositoryModule, UserRepositoryModule],
   controllers: [UnitController],
   providers: [
     UnitService,

src/user-device-permission/services/user-device-permission.service.ts

@@ -1,7 +1,7 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { UserDevicePermissionAddDto } from '../dtos/user-device-permission.add.dto';
 import { UserDevicePermissionEditDto } from '../dtos/user-device-permission.edit.dto';
-import { DeviceUserPermissionRepository } from '@app/common/modules/device-user-permission/repositories';
+import { DeviceUserPermissionRepository } from '@app/common/modules/device/repositories';
 import { PermissionTypeRepository } from '@app/common/modules/permission/repositories';
 
 @Injectable()

src/user-device-permission/user-device-permission.module.ts

@@ -4,7 +4,7 @@ import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { UserDevicePermissionService } from './services/user-device-permission.service';
 import { UserDevicePermissionController } from './controllers/user-device-permission.controller';
-import { DeviceUserPermissionRepository } from '@app/common/modules/device-user-permission/repositories';
+import { DeviceUserPermissionRepository } from '@app/common/modules/device/repositories';
 import { PermissionTypeRepository } from '@app/common/modules/permission/repositories';
 
 @Module({

src/user-notification/services/user-notification.service.ts

@@ -3,7 +3,7 @@ import {
   UserNotificationAddDto,
   UserNotificationUpdateDto,
 } from '../dtos/user-notification.dto';
-import { UserNotificationRepository } from '@app/common/modules/user-notification/repositories';
+import { UserNotificationRepository } from '@app/common/modules/user/repositories';
 
 @Injectable()
 export class UserNotificationService {

src/user-notification/user-notification.module.ts

@@ -1,12 +1,12 @@
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { UserNotificationRepositoryModule } from '@app/common/modules/user-notification/user.notification.repository.module';
-import { UserNotificationRepository } from '@app/common/modules/user-notification/repositories';
+import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module';
+import { UserNotificationRepository } from '@app/common/modules/user/repositories';
 import { UserNotificationService } from 'src/user-notification/services';
 import { UserNotificationController } from 'src/user-notification/controllers';
 
 @Module({
-  imports: [ConfigModule, UserNotificationRepositoryModule],
+  imports: [ConfigModule, UserRepositoryModule],
   controllers: [UserNotificationController],
   providers: [UserNotificationRepository, UserNotificationService],
   exports: [UserNotificationService],