Merge branch 'dev' into create-vistor-password

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/dtos/user-auth.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import { IsPasswordStrong } from 'src/validators/password.validator';
 
 export class UserSignUpDto {
@@ -38,4 +38,8 @@ export class UserSignUpDto {
   @IsString()
   @IsNotEmpty()
   public lastName: string;
+
+  @IsString()
+  @IsOptional()
+  public regionUuid: string;
 }

src/auth/dtos/user-login.dto.ts

@@ -11,4 +11,9 @@ export class UserLoginDto {
   @IsString()
   @IsOptional()
   password: string;
+
+  @ApiProperty()
+  @IsString()
+  @IsOptional()
+  regionUuid?: string;
 }

src/auth/dtos/user-otp.dto.ts

@@ -1,6 +1,12 @@
 import { OtpType } from '../../../libs/common/src/constants/otp-type.enum';
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEmail, IsEnum, IsNotEmpty, IsString } from 'class-validator';
+import {
+  IsEmail,
+  IsEnum,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+} from 'class-validator';
 
 export class UserOtpDto {
   @ApiProperty()
@@ -12,6 +18,11 @@ export class UserOtpDto {
   @IsEnum(OtpType)
   @IsNotEmpty()
   type: OtpType;
+
+  @ApiProperty()
+  @IsOptional()
+  @IsString()
+  regionUuid?: string;
 }
 
 export class VerifyOtpDto extends UserOtpDto {

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,12 +12,14 @@ 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';
 import { UserEntity } from '../../../libs/common/src/modules/user/entities/user.entity';
 import * as argon2 from 'argon2';
+import { differenceInSeconds } from '@app/common/helper/differenceInSeconds';
+import { LessThan, MoreThan } from 'typeorm';
 
 @Injectable()
 export class UserAuthService {
@@ -44,9 +46,17 @@ export class UserAuthService {
     );
 
     try {
+      const { regionUuid, ...rest } = userSignUpDto;
       const user = await this.userRepository.save({
-        ...userSignUpDto,
+        ...rest,
         password: hashedPassword,
+        region: regionUuid
+          ? {
+              uuid: regionUuid,
+            }
+          : {
+              regionName: 'United Arab Emirates',
+            },
       });
 
       return user;
@@ -80,41 +90,49 @@ export class UserAuthService {
   }
 
   async userLogin(data: UserLoginDto) {
-    const user = await this.authService.validateUser(data.email, data.password);
+    try {
+      const user = await this.authService.validateUser(
+        data.email,
+        data.password,
+        data.regionUuid,
+      );
 
-    if (!user) {
-      throw new UnauthorizedException('Invalid login credentials.');
-    }
+      if (!user) {
+        throw new UnauthorizedException('Invalid login credentials.');
+      }
 
-    const session = await Promise.all([
-      await this.sessionRepository.update(
-        { userId: user.id },
-        {
-          isLoggedOut: true,
-        },
-      ),
-      await this.authService.createSession({
+      const session = await Promise.all([
+        await this.sessionRepository.update(
+          { userId: user.id },
+          {
+            isLoggedOut: true,
+          },
+        ),
+        await this.authService.createSession({
+          userId: user.uuid,
+          loginTime: new Date(),
+          isLoggedOut: false,
+        }),
+      ]);
+
+      return await this.authService.login({
+        email: user.email,
         userId: user.uuid,
-        loginTime: new Date(),
-        isLoggedOut: false,
-      }),
-    ]);
-
-    return await this.authService.login({
-      email: user.email,
-      userId: user.uuid,
-      uuid: user.uuid,
-      roles: user?.roles?.map((role) => {
-        return { uuid: role.uuid, type: role.roleType.type };
-      }),
-      sessionId: session[1].uuid,
-    });
+        uuid: user.uuid,
+        roles: user?.roles?.map((role) => {
+          return { uuid: role.uuid, type: role.roleType.type };
+        }),
+        sessionId: session[1].uuid,
+      });
+    } catch (error) {
+      throw new BadRequestException('Invalid credentials');
+    }
   }
 
   async deleteUser(uuid: string) {
     const user = await this.findOneById(uuid);
     if (!user) {
-      throw new BadRequestException('User does not found');
+      throw new BadRequestException('User not found');
     }
     return await this.userRepository.update({ uuid }, { isActive: false });
   }
@@ -124,7 +142,55 @@ export class UserAuthService {
   }
 
   async generateOTP(data: UserOtpDto): Promise<string> {
-    await this.otpRepository.delete({ email: data.email, type: data.type });
+    const threeDaysAgo = new Date();
+    threeDaysAgo.setDate(threeDaysAgo.getDate() - 3);
+    const userExists = await this.userRepository.exists({
+      where: {
+        region: data.regionUuid
+          ? {
+              uuid: data.regionUuid,
+            }
+          : undefined,
+        email: data.email,
+        isUserVerified: data.type === OtpType.PASSWORD ? true : undefined,
+      },
+    });
+    if (!userExists) {
+      throw new BadRequestException('User not found');
+    }
+    await this.otpRepository.softDelete({ email: data.email, type: data.type });
+    await this.otpRepository.delete({
+      email: data.email,
+      type: data.type,
+      createdAt: LessThan(threeDaysAgo),
+    });
+    const countOfOtp = await this.otpRepository.count({
+      withDeleted: true,
+      where: {
+        email: data.email,
+        type: data.type,
+        createdAt: MoreThan(threeDaysAgo),
+      },
+    });
+    const lastOtp = await this.otpRepository.findOne({
+      where: { email: data.email, type: data.type },
+      order: { createdAt: 'DESC' },
+      withDeleted: true,
+    });
+    const cooldown = 30 * Math.pow(2, countOfOtp - 1);
+    if (lastOtp) {
+      const now = new Date();
+      const timeSinceLastOtp = differenceInSeconds(now, lastOtp.createdAt);
+
+      if (timeSinceLastOtp < cooldown) {
+        throw new BadRequestException({
+          message: `Please wait ${cooldown - timeSinceLastOtp} more seconds before requesting a new OTP.`,
+          data: {
+            cooldown: cooldown - timeSinceLastOtp,
+          },
+        });
+      }
+    }
     const otpCode = Math.floor(100000 + Math.random() * 900000).toString();
     const expiryTime = new Date();
     expiryTime.setMinutes(expiryTime.getMinutes() + 1);

src/automation/automation.module.ts

@@ -7,9 +7,10 @@ import { SpaceRepository } from '@app/common/modules/space/repositories';
 import { DeviceService } from 'src/device/services';
 import { DeviceRepository } from '@app/common/modules/device/repositories';
 import { ProductRepository } from '@app/common/modules/product/repositories';
+import { DeviceStatusFirebaseModule } from '@app/common/firebase/devices-status/devices-status.module';
 
 @Module({
-  imports: [ConfigModule, SpaceRepositoryModule],
+  imports: [ConfigModule, SpaceRepositoryModule, DeviceStatusFirebaseModule],
   controllers: [AutomationController],
   providers: [
     AutomationService,

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,10 +8,16 @@ 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';
+import { DeviceStatusFirebaseModule } from '@app/common/firebase/devices-status/devices-status.module';
 @Module({
-  imports: [ConfigModule, ProductRepositoryModule, DeviceRepositoryModule],
+  imports: [
+    ConfigModule,
+    ProductRepositoryModule,
+    DeviceRepositoryModule,
+    DeviceStatusFirebaseModule,
+  ],
   controllers: [DeviceController],
   providers: [
     DeviceService,

src/device/services/device.service.ts

@@ -25,6 +25,7 @@ import { PermissionType } from '@app/common/constants/permission-type.enum';
 import { In } from 'typeorm';
 import { ProductType } from '@app/common/constants/product-type.enum';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
+import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
 
 @Injectable()
 export class DeviceService {
@@ -33,6 +34,7 @@ export class DeviceService {
     private readonly configService: ConfigService,
     private readonly deviceRepository: DeviceRepository,
     private readonly productRepository: ProductRepository,
+    private readonly deviceStatusFirebaseService: DeviceStatusFirebaseService,
     private readonly spaceRepository: SpaceRepository,
   ) {
     const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY');
@@ -72,14 +74,28 @@ export class DeviceService {
       if (!device.productUuid) {
         throw new Error('Product UUID is missing for the device.');
       }
-
-      return await this.deviceRepository.save({
+      const deviceSaved = await this.deviceRepository.save({
         deviceTuyaUuid: addDeviceDto.deviceTuyaUuid,
         productDevice: { uuid: device.productUuid },
         user: {
           uuid: addDeviceDto.userUuid,
         },
       });
+      if (deviceSaved.uuid) {
+        const deviceStatus = await this.getDevicesInstructionStatus(
+          deviceSaved.uuid,
+        );
+        if (deviceStatus.productUuid) {
+          await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
+            deviceUuid: deviceSaved.uuid,
+            deviceTuyaUuid: addDeviceDto.deviceTuyaUuid,
+            status: deviceStatus.status,
+            productUuid: deviceStatus.productUuid,
+            productType: deviceStatus.productType,
+          });
+        }
+      }
+      return deviceSaved;
     } catch (error) {
       if (error.code === '23505') {
         throw new HttpException(

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/region/controllers/region.controller.ts

@@ -1,13 +1,6 @@
-import {
-  Controller,
-  Get,
-  HttpException,
-  HttpStatus,
-  UseGuards,
-} from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus } from '@nestjs/common';
 import { RegionService } from '../services/region.service';
-import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
+import { ApiTags } from '@nestjs/swagger';
 
 @ApiTags('Region Module')
 @Controller({
@@ -17,8 +10,6 @@ import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
 export class RegionController {
   constructor(private readonly regionService: RegionService) {}
 
-  @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
   @Get()
   async getAllRegions() {
     try {

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/scene/scene.module.ts

@@ -7,9 +7,10 @@ import { SpaceRepository } from '@app/common/modules/space/repositories';
 import { DeviceService } from 'src/device/services';
 import { DeviceRepository } from '@app/common/modules/device/repositories';
 import { ProductRepository } from '@app/common/modules/product/repositories';
+import { DeviceStatusFirebaseModule } from '@app/common/firebase/devices-status/devices-status.module';
 
 @Module({
-  imports: [ConfigModule, SpaceRepositoryModule],
+  imports: [ConfigModule, SpaceRepositoryModule, DeviceStatusFirebaseModule],
   controllers: [SceneController],
   providers: [
     SceneService,

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],