diff --git a/libs/common/src/auth/auth.module.ts b/libs/common/src/auth/auth.module.ts index 236fea3..b6c6d45 100644 --- a/libs/common/src/auth/auth.module.ts +++ b/libs/common/src/auth/auth.module.ts @@ -1,28 +1,28 @@ import { PassportModule } from '@nestjs/passport'; import { JwtModule } from '@nestjs/jwt'; -import { ConfigModule, ConfigService } from '@nestjs/config'; +import { ConfigModule } from '@nestjs/config'; import { Module } from '@nestjs/common'; import { HelperModule } from '../helper/helper.module'; import { JwtStrategy } from './strategies/jwt.strategy'; import { UserSessionRepository } from '../modules/session/repositories/session.repository'; import { AuthService } from './services/auth.service'; import { UserRepository } from '../modules/user/repositories'; +import { RefreshTokenStrategy } from './strategies/refresh-token.strategy'; @Module({ imports: [ ConfigModule.forRoot(), PassportModule, - JwtModule.registerAsync({ - imports: [ConfigModule], - inject: [ConfigService], - useFactory: async (configService: ConfigService) => ({ - secret: configService.get('JWT_SECRET'), - signOptions: { expiresIn: configService.get('JWT_EXPIRE_TIME') }, - }), - }), + JwtModule.register({}), HelperModule, ], - providers: [JwtStrategy, UserSessionRepository, AuthService, UserRepository], + providers: [ + JwtStrategy, + RefreshTokenStrategy, + UserSessionRepository, + AuthService, + UserRepository, + ], exports: [AuthService], }) export class AuthModule {} diff --git a/libs/common/src/auth/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts index d305d94..5e57550 100644 --- a/libs/common/src/auth/services/auth.service.ts +++ b/libs/common/src/auth/services/auth.service.ts @@ -1,9 +1,11 @@ import { BadRequestException, Injectable } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; +import * as argon2 from 'argon2'; import { HelperHashService } from '../../helper/services'; import { UserRepository } from '../../../../common/src/modules/user/repositories'; import { UserSessionRepository } from '../../../../common/src/modules/session/repositories/session.repository'; import { UserSessionEntity } from '../../../../common/src/modules/session/entities'; +import { ConfigService } from '@nestjs/config'; @Injectable() export class AuthService { @@ -12,6 +14,7 @@ export class AuthService { private readonly userRepository: UserRepository, private readonly sessionRepository: UserSessionRepository, private readonly helperHashService: HelperHashService, + private readonly configService: ConfigService, ) {} async validateUser(email: string, pass: string): Promise { @@ -40,6 +43,24 @@ export class AuthService { return await this.sessionRepository.save(data); } + async getTokens(payload) { + const [accessToken, refreshToken] = await Promise.all([ + this.jwtService.signAsync(payload, { + secret: this.configService.get('JWT_SECRET'), + expiresIn: '24h', + }), + this.jwtService.signAsync(payload, { + secret: this.configService.get('JWT_SECRET'), + expiresIn: '7d', + }), + ]); + + return { + accessToken, + refreshToken, + }; + } + async login(user: any) { const payload = { email: user.email, @@ -48,8 +69,22 @@ export class AuthService { type: user.type, sessionId: user.sessionId, }; - return { - access_token: this.jwtService.sign(payload), - }; + const tokens = await this.getTokens(payload); + await this.updateRefreshToken(user.uuid, tokens.refreshToken); + return tokens; + } + + async updateRefreshToken(userId: string, refreshToken: string) { + const hashedRefreshToken = await this.hashData(refreshToken); + await this.userRepository.update( + { uuid: userId }, + { + refreshToken: hashedRefreshToken, + }, + ); + } + + hashData(data: string) { + return argon2.hash(data); } } diff --git a/libs/common/src/auth/strategies/jwt.strategy.ts b/libs/common/src/auth/strategies/jwt.strategy.ts index ac43543..67faecf 100644 --- a/libs/common/src/auth/strategies/jwt.strategy.ts +++ b/libs/common/src/auth/strategies/jwt.strategy.ts @@ -6,7 +6,7 @@ import { UserSessionRepository } from '../../../src/modules/session/repositories import { AuthInterface } from '../interfaces/auth.interface'; @Injectable() -export class JwtStrategy extends PassportStrategy(Strategy) { +export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') { constructor( private readonly sessionRepository: UserSessionRepository, private readonly configService: ConfigService, diff --git a/libs/common/src/auth/strategies/refresh-token.strategy.ts b/libs/common/src/auth/strategies/refresh-token.strategy.ts new file mode 100644 index 0000000..9b21010 --- /dev/null +++ b/libs/common/src/auth/strategies/refresh-token.strategy.ts @@ -0,0 +1,42 @@ +import { ConfigService } from '@nestjs/config'; +import { ExtractJwt, Strategy } from 'passport-jwt'; +import { PassportStrategy } from '@nestjs/passport'; +import { BadRequestException, Injectable } from '@nestjs/common'; +import { UserSessionRepository } from '../../../src/modules/session/repositories/session.repository'; +import { AuthInterface } from '../interfaces/auth.interface'; + +@Injectable() +export class RefreshTokenStrategy extends PassportStrategy( + Strategy, + 'jwt-refresh', +) { + constructor( + private readonly sessionRepository: UserSessionRepository, + private readonly configService: ConfigService, + ) { + super({ + jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(), + ignoreExpiration: false, + secretOrKey: configService.get('JWT_SECRET'), + }); + } + + async validate(payload: AuthInterface) { + const validateUser = await this.sessionRepository.findOne({ + where: { + uuid: payload.sessionId, + isLoggedOut: false, + }, + }); + if (validateUser) { + return { + email: payload.email, + userId: payload.id, + uuid: payload.uuid, + sessionId: payload.sessionId, + }; + } else { + throw new BadRequestException('Unauthorized'); + } + } +} diff --git a/libs/common/src/constants/permission-type.enum.ts b/libs/common/src/constants/permission-type.enum.ts new file mode 100644 index 0000000..67fea31 --- /dev/null +++ b/libs/common/src/constants/permission-type.enum.ts @@ -0,0 +1,4 @@ +export enum PermissionType { + READ = 'READ', + CONTROLLABLE = 'CONTROLLABLE', +} diff --git a/libs/common/src/database/database.module.ts b/libs/common/src/database/database.module.ts index c604089..819be74 100644 --- a/libs/common/src/database/database.module.ts +++ b/libs/common/src/database/database.module.ts @@ -7,8 +7,16 @@ import { UserSessionEntity } from '../modules/session/entities/session.entity'; import { UserOtpEntity } from '../modules/user-otp/entities'; import { HomeEntity } from '../modules/home/entities'; import { ProductEntity } from '../modules/product/entities'; +import { + DeviceEntity, + DeviceUserPermissionEntity, +} 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'; @Module({ imports: [ @@ -29,8 +37,14 @@ import { SpaceTypeEntity } from '../modules/space-type/entities'; UserOtpEntity, HomeEntity, ProductEntity, + DeviceUserPermissionEntity, + DeviceEntity, + PermissionTypeEntity, SpaceEntity, SpaceTypeEntity, + UserSpaceEntity, + GroupEntity, + GroupDeviceEntity, ], namingStrategy: new SnakeNamingStrategy(), synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))), diff --git a/libs/common/src/guards/jwt-refresh.auth.guard.ts b/libs/common/src/guards/jwt-refresh.auth.guard.ts new file mode 100644 index 0000000..62c23d8 --- /dev/null +++ b/libs/common/src/guards/jwt-refresh.auth.guard.ts @@ -0,0 +1,11 @@ +import { UnauthorizedException } from '@nestjs/common'; +import { AuthGuard } from '@nestjs/passport'; + +export class RefreshTokenGuard extends AuthGuard('jwt-refresh') { + handleRequest(err, user) { + if (err || !user) { + throw err || new UnauthorizedException(); + } + return user; + } +} diff --git a/libs/common/src/modules/device/device.repository.module.ts b/libs/common/src/modules/device/device.repository.module.ts new file mode 100644 index 0000000..b3d35d7 --- /dev/null +++ b/libs/common/src/modules/device/device.repository.module.ts @@ -0,0 +1,13 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { DeviceEntity, DeviceUserPermissionEntity } from './entities'; + +@Module({ + providers: [], + exports: [], + controllers: [], + imports: [ + TypeOrmModule.forFeature([DeviceEntity, DeviceUserPermissionEntity]), + ], +}) +export class DeviceRepositoryModule {} diff --git a/libs/common/src/modules/device/dtos/device-user-type.dto.ts b/libs/common/src/modules/device/dtos/device-user-type.dto.ts new file mode 100644 index 0000000..0571356 --- /dev/null +++ b/libs/common/src/modules/device/dtos/device-user-type.dto.ts @@ -0,0 +1,19 @@ +import { IsNotEmpty, IsString } from 'class-validator'; + +export class DeviceUserTypeDto { + @IsString() + @IsNotEmpty() + public uuid: string; + + @IsString() + @IsNotEmpty() + public userUuid: string; + + @IsString() + @IsNotEmpty() + public deviceUuid: string; + + @IsString() + @IsNotEmpty() + public permissionTypeUuid: string; +} diff --git a/libs/common/src/modules/device/dtos/device.dto.ts b/libs/common/src/modules/device/dtos/device.dto.ts new file mode 100644 index 0000000..8873f31 --- /dev/null +++ b/libs/common/src/modules/device/dtos/device.dto.ts @@ -0,0 +1,19 @@ +import { IsNotEmpty, IsString } from 'class-validator'; + +export class DeviceDto { + @IsString() + @IsNotEmpty() + public uuid: string; + + @IsString() + @IsNotEmpty() + spaceUuid: string; + + @IsString() + @IsNotEmpty() + deviceTuyaUuid: string; + + @IsString() + @IsNotEmpty() + productUuid: string; +} diff --git a/libs/common/src/modules/device/dtos/index.ts b/libs/common/src/modules/device/dtos/index.ts new file mode 100644 index 0000000..9d647c8 --- /dev/null +++ b/libs/common/src/modules/device/dtos/index.ts @@ -0,0 +1,2 @@ +export * from './device.dto'; +export * from './device-user-type.dto'; diff --git a/libs/common/src/modules/device/entities/device-user-type.entity.ts b/libs/common/src/modules/device/entities/device-user-type.entity.ts new file mode 100644 index 0000000..904b18a --- /dev/null +++ b/libs/common/src/modules/device/entities/device-user-type.entity.ts @@ -0,0 +1,42 @@ +import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm'; +import { AbstractEntity } from '../../abstract/entities/abstract.entity'; +import { DeviceUserTypeDto } from '../dtos/device-user-type.dto'; +import { DeviceEntity } from './device.entity'; +import { PermissionTypeEntity } from '../../permission/entities'; + +@Entity({ name: 'device-user-permission' }) +export class DeviceUserPermissionEntity extends AbstractEntity { + @Column({ + nullable: false, + }) + public userUuid: string; + + @Column({ + nullable: false, + }) + deviceUuid: string; + + @Column({ + nullable: false, + }) + public permissionTypeUuid: string; + + @ManyToOne(() => DeviceEntity, { + onDelete: 'CASCADE', + onUpdate: 'CASCADE', + }) + @JoinColumn({ name: 'device_uuid', referencedColumnName: 'uuid' }) + device: DeviceEntity; + + @ManyToOne(() => PermissionTypeEntity, { + onDelete: 'CASCADE', + onUpdate: 'CASCADE', + }) + @JoinColumn({ name: 'permission_type_uuid', referencedColumnName: 'uuid' }) + type: PermissionTypeEntity; + + constructor(partial: Partial) { + super(); + Object.assign(this, partial); + } +} diff --git a/libs/common/src/modules/device/entities/device.entity.ts b/libs/common/src/modules/device/entities/device.entity.ts new file mode 100644 index 0000000..2c1837a --- /dev/null +++ b/libs/common/src/modules/device/entities/device.entity.ts @@ -0,0 +1,51 @@ +import { Column, Entity, OneToMany } 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'; + +@Entity({ name: 'device' }) +export class DeviceEntity extends AbstractEntity { + @Column({ + nullable: false, + }) + public spaceUuid: string; + + @Column({ + nullable: false, + }) + deviceTuyaUuid: string; + + @Column({ + nullable: false, + }) + public productUuid: string; + + @Column({ + nullable: true, + default: true, + }) + isActive: true; + + @OneToMany( + () => DeviceUserPermissionEntity, + (permission) => permission.device, + { + nullable: true, + onDelete: 'CASCADE', + onUpdate: 'CASCADE', + }, + ) + permission: DeviceUserPermissionEntity[]; + + @OneToMany( + () => GroupDeviceEntity, + (userGroupDevices) => userGroupDevices.device, + ) + userGroupDevices: GroupDeviceEntity[]; + + constructor(partial: Partial) { + super(); + Object.assign(this, partial); + } +} diff --git a/libs/common/src/modules/device/entities/index.ts b/libs/common/src/modules/device/entities/index.ts new file mode 100644 index 0000000..d6cf7b2 --- /dev/null +++ b/libs/common/src/modules/device/entities/index.ts @@ -0,0 +1,2 @@ +export * from './device.entity'; +export * from './device-user-type.entity'; diff --git a/libs/common/src/modules/device/index.ts b/libs/common/src/modules/device/index.ts new file mode 100644 index 0000000..0529a42 --- /dev/null +++ b/libs/common/src/modules/device/index.ts @@ -0,0 +1 @@ +export * from './device.repository.module'; diff --git a/libs/common/src/modules/device/repositories/device-user-type.repository.ts b/libs/common/src/modules/device/repositories/device-user-type.repository.ts new file mode 100644 index 0000000..e3d2176 --- /dev/null +++ b/libs/common/src/modules/device/repositories/device-user-type.repository.ts @@ -0,0 +1,10 @@ +import { DataSource, Repository } from 'typeorm'; +import { Injectable } from '@nestjs/common'; +import { DeviceUserPermissionEntity } from '../entities'; + +@Injectable() +export class DeviceUserTypeRepository extends Repository { + constructor(private dataSource: DataSource) { + super(DeviceUserPermissionEntity, dataSource.createEntityManager()); + } +} diff --git a/libs/common/src/modules/device/repositories/device.repository.ts b/libs/common/src/modules/device/repositories/device.repository.ts new file mode 100644 index 0000000..267c06c --- /dev/null +++ b/libs/common/src/modules/device/repositories/device.repository.ts @@ -0,0 +1,10 @@ +import { DataSource, Repository } from 'typeorm'; +import { Injectable } from '@nestjs/common'; +import { DeviceEntity } from '../entities'; + +@Injectable() +export class DeviceRepository extends Repository { + constructor(private dataSource: DataSource) { + super(DeviceEntity, dataSource.createEntityManager()); + } +} diff --git a/libs/common/src/modules/device/repositories/index.ts b/libs/common/src/modules/device/repositories/index.ts new file mode 100644 index 0000000..f91e07f --- /dev/null +++ b/libs/common/src/modules/device/repositories/index.ts @@ -0,0 +1,2 @@ +export * from './device.repository'; +export * from './device-user-type.repository'; diff --git a/libs/common/src/modules/group-device/dtos/group.device.dto.ts b/libs/common/src/modules/group-device/dtos/group.device.dto.ts new file mode 100644 index 0000000..1a4d51c --- /dev/null +++ b/libs/common/src/modules/group-device/dtos/group.device.dto.ts @@ -0,0 +1,15 @@ +import { IsNotEmpty, IsString } from 'class-validator'; + +export class GroupDeviceDto { + @IsString() + @IsNotEmpty() + public uuid: string; + + @IsString() + @IsNotEmpty() + public deviceUuid: string; + + @IsString() + @IsNotEmpty() + public groupUuid: string; +} diff --git a/libs/common/src/modules/group-device/dtos/index.ts b/libs/common/src/modules/group-device/dtos/index.ts new file mode 100644 index 0000000..66bc84a --- /dev/null +++ b/libs/common/src/modules/group-device/dtos/index.ts @@ -0,0 +1 @@ +export * from './group.device.dto'; diff --git a/libs/common/src/modules/group-device/entities/group.device.entity.ts b/libs/common/src/modules/group-device/entities/group.device.entity.ts new file mode 100644 index 0000000..8a39dc7 --- /dev/null +++ b/libs/common/src/modules/group-device/entities/group.device.entity.ts @@ -0,0 +1,48 @@ +import { Column, Entity, ManyToOne, Unique } from 'typeorm'; +import { GroupDeviceDto } from '../dtos'; +import { AbstractEntity } from '../../abstract/entities/abstract.entity'; +import { DeviceEntity } from '../../device/entities'; +import { GroupEntity } from '../../group/entities'; + +@Entity({ name: 'group-device' }) +@Unique(['device', 'group']) +export class GroupDeviceEntity extends AbstractEntity { + @Column({ + type: 'uuid', + default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value + nullable: false, + }) + public uuid: string; + + @Column({ + type: 'string', + nullable: false, + }) + deviceUuid: string; + + @Column({ + type: 'string', + nullable: false, + }) + groupUuid: string; + + @ManyToOne(() => DeviceEntity, (device) => device.userGroupDevices, { + nullable: false, + }) + device: DeviceEntity; + + @ManyToOne(() => GroupEntity, (group) => group.groupDevices, { + nullable: false, + }) + group: GroupEntity; + + @Column({ + nullable: true, + default: true, + }) + public isActive: boolean; + constructor(partial: Partial) { + super(); + Object.assign(this, partial); + } +} diff --git a/libs/common/src/modules/group-device/entities/index.ts b/libs/common/src/modules/group-device/entities/index.ts new file mode 100644 index 0000000..6b96f11 --- /dev/null +++ b/libs/common/src/modules/group-device/entities/index.ts @@ -0,0 +1 @@ +export * from './group.device.entity'; diff --git a/libs/common/src/modules/group-device/group.device.repository.module.ts b/libs/common/src/modules/group-device/group.device.repository.module.ts new file mode 100644 index 0000000..a3af56d --- /dev/null +++ b/libs/common/src/modules/group-device/group.device.repository.module.ts @@ -0,0 +1,11 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { GroupDeviceEntity } from './entities/group.device.entity'; + +@Module({ + providers: [], + exports: [], + controllers: [], + imports: [TypeOrmModule.forFeature([GroupDeviceEntity])], +}) +export class GroupDeviceRepositoryModule {} diff --git a/libs/common/src/modules/group-device/repositories/group.device.repository.ts b/libs/common/src/modules/group-device/repositories/group.device.repository.ts new file mode 100644 index 0000000..472c5aa --- /dev/null +++ b/libs/common/src/modules/group-device/repositories/group.device.repository.ts @@ -0,0 +1,10 @@ +import { DataSource, Repository } from 'typeorm'; +import { Injectable } from '@nestjs/common'; +import { GroupDeviceEntity } from '../entities/group.device.entity'; + +@Injectable() +export class GroupDeviceRepository extends Repository { + constructor(private dataSource: DataSource) { + super(GroupDeviceEntity, dataSource.createEntityManager()); + } +} diff --git a/libs/common/src/modules/group-device/repositories/index.ts b/libs/common/src/modules/group-device/repositories/index.ts new file mode 100644 index 0000000..2b40191 --- /dev/null +++ b/libs/common/src/modules/group-device/repositories/index.ts @@ -0,0 +1 @@ +export * from './group.device.repository'; diff --git a/libs/common/src/modules/group/dtos/group.dto.ts b/libs/common/src/modules/group/dtos/group.dto.ts new file mode 100644 index 0000000..d3696b8 --- /dev/null +++ b/libs/common/src/modules/group/dtos/group.dto.ts @@ -0,0 +1,11 @@ +import { IsNotEmpty, IsString } from 'class-validator'; + +export class GroupDto { + @IsString() + @IsNotEmpty() + public uuid: string; + + @IsString() + @IsNotEmpty() + public groupName: string; +} diff --git a/libs/common/src/modules/group/dtos/index.ts b/libs/common/src/modules/group/dtos/index.ts new file mode 100644 index 0000000..ba43fbc --- /dev/null +++ b/libs/common/src/modules/group/dtos/index.ts @@ -0,0 +1 @@ +export * from './group.dto'; diff --git a/libs/common/src/modules/group/entities/group.entity.ts b/libs/common/src/modules/group/entities/group.entity.ts new file mode 100644 index 0000000..7cea8e8 --- /dev/null +++ b/libs/common/src/modules/group/entities/group.entity.ts @@ -0,0 +1,35 @@ +import { Column, Entity, OneToMany } from 'typeorm'; +import { GroupDto } from '../dtos'; +import { AbstractEntity } from '../../abstract/entities/abstract.entity'; +import { GroupDeviceEntity } from '../../group-device/entities'; + +@Entity({ name: 'group' }) +export class GroupEntity extends AbstractEntity { + @Column({ + type: 'uuid', + default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value + nullable: false, + }) + public uuid: string; + + @Column({ + nullable: false, + }) + public groupName: string; + + @OneToMany(() => GroupDeviceEntity, (groupDevice) => groupDevice.group, { + cascade: true, + onDelete: 'CASCADE', + }) + groupDevices: GroupDeviceEntity[]; + + @Column({ + nullable: true, + default: true, + }) + public isActive: boolean; + constructor(partial: Partial) { + super(); + Object.assign(this, partial); + } +} diff --git a/libs/common/src/modules/group/entities/index.ts b/libs/common/src/modules/group/entities/index.ts new file mode 100644 index 0000000..50f4201 --- /dev/null +++ b/libs/common/src/modules/group/entities/index.ts @@ -0,0 +1 @@ +export * from './group.entity'; diff --git a/libs/common/src/modules/group/group.repository.module.ts b/libs/common/src/modules/group/group.repository.module.ts new file mode 100644 index 0000000..5b711e5 --- /dev/null +++ b/libs/common/src/modules/group/group.repository.module.ts @@ -0,0 +1,11 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { GroupEntity } from './entities/group.entity'; + +@Module({ + providers: [], + exports: [], + controllers: [], + imports: [TypeOrmModule.forFeature([GroupEntity])], +}) +export class GroupRepositoryModule {} diff --git a/libs/common/src/modules/group/repositories/group.repository.ts b/libs/common/src/modules/group/repositories/group.repository.ts new file mode 100644 index 0000000..824d671 --- /dev/null +++ b/libs/common/src/modules/group/repositories/group.repository.ts @@ -0,0 +1,10 @@ +import { DataSource, Repository } from 'typeorm'; +import { Injectable } from '@nestjs/common'; +import { GroupEntity } from '../entities/group.entity'; + +@Injectable() +export class GroupRepository extends Repository { + constructor(private dataSource: DataSource) { + super(GroupEntity, dataSource.createEntityManager()); + } +} diff --git a/libs/common/src/modules/group/repositories/index.ts b/libs/common/src/modules/group/repositories/index.ts new file mode 100644 index 0000000..7018977 --- /dev/null +++ b/libs/common/src/modules/group/repositories/index.ts @@ -0,0 +1 @@ +export * from './group.repository'; diff --git a/libs/common/src/modules/permission/dtos/index.ts b/libs/common/src/modules/permission/dtos/index.ts new file mode 100644 index 0000000..48e985e --- /dev/null +++ b/libs/common/src/modules/permission/dtos/index.ts @@ -0,0 +1 @@ +export * from './permission.dto'; diff --git a/libs/common/src/modules/permission/dtos/permission.dto.ts b/libs/common/src/modules/permission/dtos/permission.dto.ts new file mode 100644 index 0000000..86912ee --- /dev/null +++ b/libs/common/src/modules/permission/dtos/permission.dto.ts @@ -0,0 +1,11 @@ +import { PermissionType } from '@app/common/constants/permission-type.enum'; +import { IsEnum, IsNotEmpty, IsString } from 'class-validator'; + +export class PermissionTypeDto { + @IsString() + @IsNotEmpty() + public uuid: string; + + @IsEnum(PermissionType) + public type: PermissionType; +} diff --git a/libs/common/src/modules/permission/entities/index.ts b/libs/common/src/modules/permission/entities/index.ts new file mode 100644 index 0000000..90a8fd8 --- /dev/null +++ b/libs/common/src/modules/permission/entities/index.ts @@ -0,0 +1 @@ +export * from './permission.entity'; diff --git a/libs/common/src/modules/permission/entities/permission.entity.ts b/libs/common/src/modules/permission/entities/permission.entity.ts new file mode 100644 index 0000000..f2ba950 --- /dev/null +++ b/libs/common/src/modules/permission/entities/permission.entity.ts @@ -0,0 +1,30 @@ +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'; + +@Entity({ name: 'permission-type' }) +export class PermissionTypeEntity extends AbstractEntity { + @Column({ + nullable: false, + enum: Object.values(PermissionType), + }) + type: string; + + @OneToMany( + () => DeviceUserPermissionEntity, + (permission) => permission.type, + { + nullable: true, + onDelete: 'CASCADE', + onUpdate: 'CASCADE', + }, + ) + permission: DeviceUserPermissionEntity[]; + + constructor(partial: Partial) { + super(); + Object.assign(this, partial); + } +} diff --git a/libs/common/src/modules/permission/permission.repository.module.ts b/libs/common/src/modules/permission/permission.repository.module.ts new file mode 100644 index 0000000..6819e9b --- /dev/null +++ b/libs/common/src/modules/permission/permission.repository.module.ts @@ -0,0 +1,11 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { PermissionTypeEntity } from './entities/permission.entity'; + +@Module({ + providers: [], + exports: [], + controllers: [], + imports: [TypeOrmModule.forFeature([PermissionTypeEntity])], +}) +export class PermissionTypeRepositoryModule {} diff --git a/libs/common/src/modules/permission/repositories/index.ts b/libs/common/src/modules/permission/repositories/index.ts new file mode 100644 index 0000000..528b955 --- /dev/null +++ b/libs/common/src/modules/permission/repositories/index.ts @@ -0,0 +1 @@ +export * from './permission.repository'; diff --git a/libs/common/src/modules/permission/repositories/permission.repository.ts b/libs/common/src/modules/permission/repositories/permission.repository.ts new file mode 100644 index 0000000..c9a3f94 --- /dev/null +++ b/libs/common/src/modules/permission/repositories/permission.repository.ts @@ -0,0 +1,10 @@ +import { DataSource, Repository } from 'typeorm'; +import { Injectable } from '@nestjs/common'; +import { PermissionTypeEntity } from '../entities/permission.entity'; + +@Injectable() +export class PermissionTypeRepository extends Repository { + constructor(private dataSource: DataSource) { + super(PermissionTypeEntity, dataSource.createEntityManager()); + } +} diff --git a/libs/common/src/modules/space/entities/space.entity.ts b/libs/common/src/modules/space/entities/space.entity.ts index 1f523f3..af6922e 100644 --- a/libs/common/src/modules/space/entities/space.entity.ts +++ b/libs/common/src/modules/space/entities/space.entity.ts @@ -2,6 +2,7 @@ import { Column, Entity, ManyToOne, OneToMany } from 'typeorm'; import { SpaceDto } from '../dtos'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { SpaceTypeEntity } from '../../space-type/entities'; +import { UserSpaceEntity } from '../../user-space/entities'; @Entity({ name: 'space' }) export class SpaceEntity extends AbstractEntity { @@ -26,6 +27,9 @@ export class SpaceEntity extends AbstractEntity { }) spaceType: SpaceTypeEntity; + @OneToMany(() => UserSpaceEntity, (userSpace) => userSpace.space) + userSpaces: UserSpaceEntity[]; + constructor(partial: Partial) { super(); Object.assign(this, partial); diff --git a/libs/common/src/modules/user-space/dtos/index.ts b/libs/common/src/modules/user-space/dtos/index.ts new file mode 100644 index 0000000..41572f5 --- /dev/null +++ b/libs/common/src/modules/user-space/dtos/index.ts @@ -0,0 +1 @@ +export * from './user.space.dto'; diff --git a/libs/common/src/modules/user-space/dtos/user.space.dto.ts b/libs/common/src/modules/user-space/dtos/user.space.dto.ts new file mode 100644 index 0000000..b9ef4d0 --- /dev/null +++ b/libs/common/src/modules/user-space/dtos/user.space.dto.ts @@ -0,0 +1,15 @@ +import { IsNotEmpty, IsString } from 'class-validator'; + +export class UserSpaceDto { + @IsString() + @IsNotEmpty() + public uuid: string; + + @IsString() + @IsNotEmpty() + public spaceUuid: string; + + @IsString() + @IsNotEmpty() + public userUuid: string; +} diff --git a/libs/common/src/modules/user-space/entities/index.ts b/libs/common/src/modules/user-space/entities/index.ts new file mode 100644 index 0000000..ef6849a --- /dev/null +++ b/libs/common/src/modules/user-space/entities/index.ts @@ -0,0 +1 @@ +export * from './user.space.entity'; diff --git a/libs/common/src/modules/user-space/entities/user.space.entity.ts b/libs/common/src/modules/user-space/entities/user.space.entity.ts new file mode 100644 index 0000000..a6caaa5 --- /dev/null +++ b/libs/common/src/modules/user-space/entities/user.space.entity.ts @@ -0,0 +1,29 @@ +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 { + @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) { + super(); + Object.assign(this, partial); + } +} diff --git a/libs/common/src/modules/user-space/repositories/index.ts b/libs/common/src/modules/user-space/repositories/index.ts new file mode 100644 index 0000000..3ad6d48 --- /dev/null +++ b/libs/common/src/modules/user-space/repositories/index.ts @@ -0,0 +1 @@ +export * from './user.space.repository'; diff --git a/libs/common/src/modules/user-space/repositories/user.space.repository.ts b/libs/common/src/modules/user-space/repositories/user.space.repository.ts new file mode 100644 index 0000000..b4b7507 --- /dev/null +++ b/libs/common/src/modules/user-space/repositories/user.space.repository.ts @@ -0,0 +1,10 @@ +import { DataSource, Repository } from 'typeorm'; +import { Injectable } from '@nestjs/common'; +import { UserSpaceEntity } from '../entities/user.space.entity'; + +@Injectable() +export class UserSpaceRepository extends Repository { + constructor(private dataSource: DataSource) { + super(UserSpaceEntity, dataSource.createEntityManager()); + } +} diff --git a/libs/common/src/modules/user-space/user.space.repository.module.ts b/libs/common/src/modules/user-space/user.space.repository.module.ts new file mode 100644 index 0000000..9655252 --- /dev/null +++ b/libs/common/src/modules/user-space/user.space.repository.module.ts @@ -0,0 +1,11 @@ +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 {} diff --git a/libs/common/src/modules/user/entities/index.ts b/libs/common/src/modules/user/entities/index.ts index e69de29..e4aa507 100644 --- a/libs/common/src/modules/user/entities/index.ts +++ b/libs/common/src/modules/user/entities/index.ts @@ -0,0 +1 @@ +export * from './user.entity'; diff --git a/libs/common/src/modules/user/entities/user.entity.ts b/libs/common/src/modules/user/entities/user.entity.ts index 63f2185..0981bcc 100644 --- a/libs/common/src/modules/user/entities/user.entity.ts +++ b/libs/common/src/modules/user/entities/user.entity.ts @@ -1,6 +1,7 @@ -import { Column, Entity } from 'typeorm'; +import { Column, Entity, OneToMany } from 'typeorm'; import { UserDto } from '../dtos'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; +import { UserSpaceEntity } from '../../user-space/entities'; @Entity({ name: 'user' }) export class UserEntity extends AbstractEntity { @@ -30,12 +31,26 @@ export class UserEntity extends AbstractEntity { }) public lastName: string; + @Column({ + nullable: true, + }) + public refreshToken: string; + @Column({ nullable: true, default: false, }) public isUserVerified: boolean; + @Column({ + nullable: false, + default: true, + }) + public isActive: boolean; + + @OneToMany(() => UserSpaceEntity, (userSpace) => userSpace.user) + userSpaces: UserSpaceEntity[]; + constructor(partial: Partial) { super(); Object.assign(this, partial); diff --git a/package-lock.json b/package-lock.json index a41b90f..f333ed5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@nestjs/swagger": "^7.3.0", "@nestjs/typeorm": "^10.0.2", "@tuya/tuya-connector-nodejs": "^2.1.2", + "argon2": "^0.40.1", "axios": "^1.6.7", "bcryptjs": "^2.4.3", "class-transformer": "^0.5.1", @@ -2111,6 +2112,14 @@ "npm": ">=5.0.0" } }, + "node_modules/@phc/format": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz", + "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -3032,6 +3041,20 @@ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "devOptional": true }, + "node_modules/argon2": { + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.40.1.tgz", + "integrity": "sha512-DjtHDwd7pm12qeWyfihHoM8Bn5vGcgH6sKwgPqwNYroRmxlrzadHEvMyuvQxN/V8YSyRRKD5x6ito09q1e9OyA==", + "hasInstallScript": true, + "dependencies": { + "@phc/format": "^1.0.0", + "node-addon-api": "^7.1.0", + "node-gyp-build": "^4.8.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -7168,6 +7191,14 @@ "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==", "dev": true }, + "node_modules/node-addon-api": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", + "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", + "engines": { + "node": "^16 || ^18 || >= 20" + } + }, "node_modules/node-emoji": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", @@ -7196,6 +7227,16 @@ } } }, + "node_modules/node-gyp-build": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz", + "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", diff --git a/package.json b/package.json index 759b7e8..a8502be 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@nestjs/swagger": "^7.3.0", "@nestjs/typeorm": "^10.0.2", "@tuya/tuya-connector-nodejs": "^2.1.2", + "argon2": "^0.40.1", "axios": "^1.6.7", "bcryptjs": "^2.4.3", "class-transformer": "^0.5.1", diff --git a/src/app.module.ts b/src/app.module.ts index 7050ec6..1a60f18 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -8,6 +8,7 @@ import { HomeModule } from './home/home.module'; import { RoomModule } from './room/room.module'; import { GroupModule } from './group/group.module'; import { DeviceModule } from './device/device.module'; +import { UserDevicePermissionModule } from './user-device-permission/user-device-permission.module'; import { CommunityModule } from './community/community.module'; import { BuildingModule } from './building/building.module'; import { FloorModule } from './floor/floor.module'; @@ -28,6 +29,7 @@ import { UnitModule } from './unit/unit.module'; RoomModule, GroupModule, DeviceModule, + UserDevicePermissionModule, ], controllers: [AuthenticationController], }) diff --git a/src/auth/controllers/user-auth.controller.ts b/src/auth/controllers/user-auth.controller.ts index c434ef8..f8c45f9 100644 --- a/src/auth/controllers/user-auth.controller.ts +++ b/src/auth/controllers/user-auth.controller.ts @@ -2,9 +2,11 @@ import { Body, Controller, Delete, + Get, HttpStatus, Param, Post, + Req, UseGuards, } from '@nestjs/common'; import { UserAuthService } from '../services/user-auth.service'; @@ -14,6 +16,7 @@ import { ResponseMessage } from '../../../libs/common/src/response/response.deco import { UserLoginDto } from '../dtos/user-login.dto'; import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard'; import { ForgetPasswordDto, UserOtpDto, VerifyOtpDto } from '../dtos'; +import { RefreshTokenGuard } from '@app/common/guards/jwt-refresh.auth.guard'; @Controller({ version: '1', @@ -93,4 +96,33 @@ export class UserAuthController { message: 'Password changed successfully', }; } + + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Get('user/list') + async userList() { + const userList = await this.userAuthService.userList(); + return { + statusCode: HttpStatus.OK, + data: userList, + message: 'User List Fetched Successfully', + }; + } + + @ApiBearerAuth() + @UseGuards(RefreshTokenGuard) + @Get('refresh-token') + async refreshToken(@Req() req) { + const refreshToken = await this.userAuthService.refreshToken( + req.user.uuid, + req.headers.authorization, + req.user.type, + req.user.sessionId, + ); + return { + statusCode: HttpStatus.OK, + data: refreshToken, + message: 'Refresh Token added Successfully', + }; + } } diff --git a/src/auth/services/user-auth.service.ts b/src/auth/services/user-auth.service.ts index 6c1e172..7b278b2 100644 --- a/src/auth/services/user-auth.service.ts +++ b/src/auth/services/user-auth.service.ts @@ -1,6 +1,7 @@ import { UserRepository } from '../../../libs/common/src/modules/user/repositories'; import { BadRequestException, + ForbiddenException, Injectable, UnauthorizedException, } from '@nestjs/common'; @@ -14,7 +15,7 @@ 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 { ILoginResponse } from '../constants/login.response.constant'; +import * as argon2 from 'argon2'; @Injectable() export class UserAuthService { @@ -64,7 +65,7 @@ export class UserAuthService { ); } - async userLogin(data: UserLoginDto): Promise { + async userLogin(data: UserLoginDto) { const user = await this.authService.validateUser(data.email, data.password); if (!user) { throw new UnauthorizedException('Invalid login credentials.'); @@ -86,7 +87,7 @@ export class UserAuthService { return await this.authService.login({ email: user.email, - userId: user.id, + userId: user.uuid, uuid: user.uuid, sessionId: session[1].uuid, }); @@ -97,7 +98,7 @@ export class UserAuthService { if (!user) { throw new BadRequestException('User does not found'); } - return await this.userRepository.delete({ uuid }); + return await this.userRepository.update({ uuid }, { isActive: false }); } async findOneById(id: string): Promise { @@ -148,4 +149,41 @@ export class UserAuthService { return true; } + + async userList(): Promise { + return await this.userRepository.find({ + where: { isActive: true }, + select: { + firstName: true, + lastName: true, + email: true, + isActive: true, + }, + }); + } + + async refreshToken( + userId: string, + refreshToken: string, + type: string, + sessionId: string, + ) { + const user = await this.userRepository.findOne({ where: { uuid: userId } }); + if (!user || !user.refreshToken) + throw new ForbiddenException('Access Denied'); + const refreshTokenMatches = await argon2.verify( + user.refreshToken, + refreshToken, + ); + if (!refreshTokenMatches) throw new ForbiddenException('Access Denied'); + const tokens = await this.authService.getTokens({ + email: user.email, + userId: user.uuid, + uuid: user.uuid, + type, + sessionId, + }); + await this.authService.updateRefreshToken(user.uuid, tokens.refreshToken); + return tokens; + } } diff --git a/src/building/building.module.ts b/src/building/building.module.ts index 7574f81..80391fe 100644 --- a/src/building/building.module.ts +++ b/src/building/building.module.ts @@ -6,11 +6,27 @@ import { SpaceRepositoryModule } from '@app/common/modules/space/space.repositor 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 { UserRepository } from '@app/common/modules/user/repositories'; +import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module'; @Module({ - imports: [ConfigModule, SpaceRepositoryModule, SpaceTypeRepositoryModule], + imports: [ + ConfigModule, + SpaceRepositoryModule, + SpaceTypeRepositoryModule, + UserSpaceRepositoryModule, + UserRepositoryModule, + ], controllers: [BuildingController], - providers: [BuildingService, SpaceRepository, SpaceTypeRepository], + providers: [ + BuildingService, + SpaceRepository, + SpaceTypeRepository, + UserSpaceRepository, + UserRepository, + ], exports: [BuildingService], }) export class BuildingModule {} diff --git a/src/building/controllers/building.controller.ts b/src/building/controllers/building.controller.ts index ec4a616..8517ee1 100644 --- a/src/building/controllers/building.controller.ts +++ b/src/building/controllers/building.controller.ts @@ -13,10 +13,11 @@ import { } from '@nestjs/common'; import { ApiTags, ApiBearerAuth } from '@nestjs/swagger'; import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard'; -import { AddBuildingDto } from '../dtos/add.building.dto'; +import { AddBuildingDto, AddUserBuildingDto } from '../dtos/add.building.dto'; import { GetBuildingChildDto } from '../dtos/get.building.dto'; import { UpdateBuildingNameDto } from '../dtos/update.building.dto'; import { CheckCommunityTypeGuard } from 'src/guards/community.type.guard'; +import { CheckUserBuildingGuard } from 'src/guards/user.building.guard'; @ApiTags('Building Module') @Controller({ @@ -92,6 +93,34 @@ export class BuildingController { ); } } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard, CheckUserBuildingGuard) + @Post('user') + async addUserBuilding(@Body() addUserBuildingDto: AddUserBuildingDto) { + try { + await this.buildingService.addUserBuilding(addUserBuildingDto); + return { message: 'user building added successfully' }; + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Get('user/:userUuid') + async getBuildingsByUserId(@Param('userUuid') userUuid: string) { + try { + return await this.buildingService.getBuildingsByUserId(userUuid); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + @ApiBearerAuth() @UseGuards(JwtAuthGuard) @Put('rename/:buildingUuid') diff --git a/src/building/dtos/add.building.dto.ts b/src/building/dtos/add.building.dto.ts index e9268c0..5d79231 100644 --- a/src/building/dtos/add.building.dto.ts +++ b/src/building/dtos/add.building.dto.ts @@ -21,3 +21,22 @@ export class AddBuildingDto { Object.assign(this, dto); } } +export class AddUserBuildingDto { + @ApiProperty({ + description: 'buildingUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public buildingUuid: string; + @ApiProperty({ + description: 'userUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public userUuid: string; + constructor(dto: Partial) { + Object.assign(this, dto); + } +} diff --git a/src/building/interface/building.interface.ts b/src/building/interface/building.interface.ts index 4bdf760..1127456 100644 --- a/src/building/interface/building.interface.ts +++ b/src/building/interface/building.interface.ts @@ -24,3 +24,8 @@ export interface RenameBuildingByUuidInterface { name: string; type: string; } +export interface GetBuildingByUserUuidInterface { + uuid: string; + name: string; + type: string; +} diff --git a/src/building/services/building.service.ts b/src/building/services/building.service.ts index 7bfd33c..fcb803b 100644 --- a/src/building/services/building.service.ts +++ b/src/building/services/building.service.ts @@ -7,21 +7,24 @@ import { BadRequestException, } from '@nestjs/common'; import { SpaceRepository } from '@app/common/modules/space/repositories'; -import { AddBuildingDto } from '../dtos'; +import { AddBuildingDto, AddUserBuildingDto } from '../dtos'; import { BuildingChildInterface, BuildingParentInterface, + GetBuildingByUserUuidInterface, GetBuildingByUuidInterface, RenameBuildingByUuidInterface, } 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'; @Injectable() export class BuildingService { constructor( private readonly spaceRepository: SpaceRepository, private readonly spaceTypeRepository: SpaceTypeRepository, + private readonly userSpaceRepository: UserSpaceRepository, ) {} async addBuilding(addBuildingDto: AddBuildingDto) { @@ -210,6 +213,58 @@ export class BuildingService { } } + async getBuildingsByUserId( + userUuid: string, + ): Promise { + try { + const buildings = await this.userSpaceRepository.find({ + relations: ['space', 'space.spaceType'], + where: { + user: { uuid: userUuid }, + space: { spaceType: { type: 'building' } }, + }, + }); + + if (buildings.length === 0) { + throw new HttpException( + 'this user has no buildings', + HttpStatus.NOT_FOUND, + ); + } + const spaces = buildings.map((building) => ({ + uuid: building.space.uuid, + name: building.space.spaceName, + type: building.space.spaceType.type, + })); + + return spaces; + } catch (err) { + if (err instanceof HttpException) { + throw err; + } else { + throw new HttpException('user not found', HttpStatus.NOT_FOUND); + } + } + } + async addUserBuilding(addUserBuildingDto: AddUserBuildingDto) { + try { + await this.userSpaceRepository.save({ + user: { uuid: addUserBuildingDto.userUuid }, + space: { uuid: addUserBuildingDto.buildingUuid }, + }); + } catch (err) { + if (err.code === '23505') { + throw new HttpException( + 'User already belongs to this building', + HttpStatus.BAD_REQUEST, + ); + } + throw new HttpException( + err.message || 'Internal Server Error', + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } async renameBuildingByUuid( buildingUuid: string, updateBuildingNameDto: UpdateBuildingNameDto, diff --git a/src/community/community.module.ts b/src/community/community.module.ts index 36b9da2..742e3ad 100644 --- a/src/community/community.module.ts +++ b/src/community/community.module.ts @@ -6,11 +6,27 @@ import { SpaceRepositoryModule } from '@app/common/modules/space/space.repositor 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 { UserRepositoryModule } from '@app/common/modules/user/user.repository.module'; +import { UserRepository } from '@app/common/modules/user/repositories'; @Module({ - imports: [ConfigModule, SpaceRepositoryModule, SpaceTypeRepositoryModule], + imports: [ + ConfigModule, + SpaceRepositoryModule, + SpaceTypeRepositoryModule, + UserSpaceRepositoryModule, + UserRepositoryModule, + ], controllers: [CommunityController], - providers: [CommunityService, SpaceRepository, SpaceTypeRepository], + providers: [ + CommunityService, + SpaceRepository, + SpaceTypeRepository, + UserSpaceRepository, + UserRepository, + ], exports: [CommunityService], }) export class CommunityModule {} diff --git a/src/community/controllers/community.controller.ts b/src/community/controllers/community.controller.ts index f889e13..f20aa3d 100644 --- a/src/community/controllers/community.controller.ts +++ b/src/community/controllers/community.controller.ts @@ -13,9 +13,13 @@ import { } from '@nestjs/common'; import { ApiTags, ApiBearerAuth } from '@nestjs/swagger'; import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard'; -import { AddCommunityDto } from '../dtos/add.community.dto'; +import { + AddCommunityDto, + AddUserCommunityDto, +} from '../dtos/add.community.dto'; import { GetCommunityChildDto } from '../dtos/get.community.dto'; import { UpdateCommunityNameDto } from '../dtos/update.community.dto'; +import { CheckUserCommunityGuard } from 'src/guards/user.community.guard'; @ApiTags('Community Module') @Controller({ @@ -77,6 +81,33 @@ export class CommunityController { } } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Get('user/:userUuid') + async getCommunitiesByUserId(@Param('userUuid') userUuid: string) { + try { + return await this.communityService.getCommunitiesByUserId(userUuid); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard, CheckUserCommunityGuard) + @Post('user') + async addUserCommunity(@Body() addUserCommunityDto: AddUserCommunityDto) { + try { + await this.communityService.addUserCommunity(addUserCommunityDto); + return { message: 'user community added successfully' }; + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } @ApiBearerAuth() @UseGuards(JwtAuthGuard) @Put('rename/:communityUuid') diff --git a/src/community/dtos/add.community.dto.ts b/src/community/dtos/add.community.dto.ts index 96dce06..06aec7c 100644 --- a/src/community/dtos/add.community.dto.ts +++ b/src/community/dtos/add.community.dto.ts @@ -14,3 +14,22 @@ export class AddCommunityDto { Object.assign(this, dto); } } +export class AddUserCommunityDto { + @ApiProperty({ + description: 'communityUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public communityUuid: string; + @ApiProperty({ + description: 'userUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public userUuid: string; + constructor(dto: Partial) { + Object.assign(this, dto); + } +} diff --git a/src/community/interface/community.interface.ts b/src/community/interface/community.interface.ts index ca18aca..31c0579 100644 --- a/src/community/interface/community.interface.ts +++ b/src/community/interface/community.interface.ts @@ -18,3 +18,9 @@ export interface RenameCommunityByUuidInterface { name: string; type: string; } + +export interface GetCommunityByUserUuidInterface { + uuid: string; + name: string; + type: string; +} diff --git a/src/community/services/community.service.ts b/src/community/services/community.service.ts index 5e9b7ea..e88290f 100644 --- a/src/community/services/community.service.ts +++ b/src/community/services/community.service.ts @@ -7,20 +7,23 @@ import { BadRequestException, } from '@nestjs/common'; import { SpaceRepository } from '@app/common/modules/space/repositories'; -import { AddCommunityDto } from '../dtos'; +import { AddCommunityDto, AddUserCommunityDto } from '../dtos'; import { CommunityChildInterface, + GetCommunityByUserUuidInterface, GetCommunityByUuidInterface, RenameCommunityByUuidInterface, } 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'; @Injectable() export class CommunityService { constructor( private readonly spaceRepository: SpaceRepository, private readonly spaceTypeRepository: SpaceTypeRepository, + private readonly userSpaceRepository: UserSpaceRepository, ) {} async addCommunity(addCommunityDto: AddCommunityDto) { @@ -151,6 +154,60 @@ export class CommunityService { return childHierarchies; } + + async getCommunitiesByUserId( + userUuid: string, + ): Promise { + try { + const communities = await this.userSpaceRepository.find({ + relations: ['space', 'space.spaceType'], + where: { + user: { uuid: userUuid }, + space: { spaceType: { type: 'community' } }, + }, + }); + + if (communities.length === 0) { + throw new HttpException( + 'this user has no communities', + HttpStatus.NOT_FOUND, + ); + } + const spaces = communities.map((community) => ({ + uuid: community.space.uuid, + name: community.space.spaceName, + type: community.space.spaceType.type, + })); + + return spaces; + } catch (err) { + if (err instanceof HttpException) { + throw err; + } else { + throw new HttpException('user not found', HttpStatus.NOT_FOUND); + } + } + } + + async addUserCommunity(addUserCommunityDto: AddUserCommunityDto) { + try { + await this.userSpaceRepository.save({ + user: { uuid: addUserCommunityDto.userUuid }, + space: { uuid: addUserCommunityDto.communityUuid }, + }); + } catch (err) { + if (err.code === '23505') { + throw new HttpException( + 'User already belongs to this community', + HttpStatus.BAD_REQUEST, + ); + } + throw new HttpException( + err.message || 'Internal Server Error', + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } async renameCommunityByUuid( communityUuid: string, updateCommunityDto: UpdateCommunityNameDto, diff --git a/src/config/index.ts b/src/config/index.ts index 0dfc023..d7d0014 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1,4 +1,4 @@ import AuthConfig from './auth.config'; import AppConfig from './app.config'; - -export default [AuthConfig, AppConfig]; +import JwtConfig from './jwt.config'; +export default [AuthConfig, AppConfig, JwtConfig]; diff --git a/src/device/controllers/device.controller.ts b/src/device/controllers/device.controller.ts index 136e94f..387e765 100644 --- a/src/device/controllers/device.controller.ts +++ b/src/device/controllers/device.controller.ts @@ -19,6 +19,8 @@ import { GetDeviceByRoomIdDto, } from '../dtos/get.device.dto'; import { ControlDeviceDto } from '../dtos/control.device.dto'; +import { AuthGuardWithRoles } from 'src/guards/device.permission.guard'; +import { PermissionType } from '@app/common/constants/permission-type.enum'; @ApiTags('Device Module') @Controller({ @@ -29,7 +31,7 @@ export class DeviceController { constructor(private readonly deviceService: DeviceService) {} @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @AuthGuardWithRoles(PermissionType.READ) @Get('room') async getDevicesByRoomId( @Query() getDeviceByRoomIdDto: GetDeviceByRoomIdDto, @@ -41,7 +43,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @AuthGuardWithRoles(PermissionType.READ) @Get('group') async getDevicesByGroupId( @Query() getDeviceByGroupIdDto: GetDeviceByGroupIdDto, @@ -55,7 +57,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @AuthGuardWithRoles(PermissionType.READ) @Get(':deviceId') async getDeviceDetailsByDeviceId(@Param('deviceId') deviceId: string) { try { @@ -65,7 +67,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @AuthGuardWithRoles(PermissionType.READ) @Get(':deviceId/functions') async getDeviceInstructionByDeviceId(@Param('deviceId') deviceId: string) { try { @@ -75,7 +77,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @AuthGuardWithRoles(PermissionType.READ) @Get(':deviceId/functions/status') async getDevicesInstructionStatus(@Param('deviceId') deviceId: string) { try { @@ -85,7 +87,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @AuthGuardWithRoles(PermissionType.CONTROLLABLE) @Post('room') async addDeviceInRoom(@Body() addDeviceInRoomDto: AddDeviceInRoomDto) { try { @@ -95,7 +97,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @AuthGuardWithRoles(PermissionType.CONTROLLABLE) @Post('group') async addDeviceInGroup(@Body() addDeviceInGroupDto: AddDeviceInGroupDto) { try { @@ -105,7 +107,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @AuthGuardWithRoles(PermissionType.CONTROLLABLE) @Post('control') async controlDevice(@Body() controlDeviceDto: ControlDeviceDto) { try { diff --git a/src/device/device.module.ts b/src/device/device.module.ts index d72db05..3a829fc 100644 --- a/src/device/device.module.ts +++ b/src/device/device.module.ts @@ -4,10 +4,23 @@ import { DeviceController } from './controllers/device.controller'; import { ConfigModule } from '@nestjs/config'; import { ProductRepositoryModule } from '@app/common/modules/product/product.repository.module'; import { ProductRepository } from '@app/common/modules/product/repositories'; +import { DeviceRepositoryModule } from '@app/common/modules/device'; +import { DeviceRepository, DeviceUserTypeRepository } from '@app/common/modules/device/repositories'; +import { PermissionTypeRepository } from '@app/common/modules/permission/repositories'; +import { SpaceRepository } from '@app/common/modules/space/repositories'; +import { GroupDeviceRepository } from '@app/common/modules/group-device/repositories'; @Module({ - imports: [ConfigModule, ProductRepositoryModule], + imports: [ConfigModule, ProductRepositoryModule, DeviceRepositoryModule], controllers: [DeviceController], - providers: [DeviceService, ProductRepository], + providers: [ + DeviceService, + ProductRepository, + DeviceUserTypeRepository, + PermissionTypeRepository, + SpaceRepository, + DeviceRepository, + GroupDeviceRepository + ], exports: [DeviceService], }) export class DeviceModule {} diff --git a/src/device/interfaces/get.device.interface.ts b/src/device/interfaces/get.device.interface.ts index 30f57f8..d513c17 100644 --- a/src/device/interfaces/get.device.interface.ts +++ b/src/device/interfaces/get.device.interface.ts @@ -8,7 +8,7 @@ export interface GetDeviceDetailsInterface { export interface GetDevicesByRoomIdInterface { success: boolean; msg: string; - result: []; + result:any; } export interface GetDevicesByGroupIdInterface { diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts index 0fa0be7..dfa2e91 100644 --- a/src/device/services/device.service.ts +++ b/src/device/services/device.service.ts @@ -1,4 +1,9 @@ -import { Injectable, HttpException, HttpStatus } from '@nestjs/common'; +import { + Injectable, + HttpException, + HttpStatus, + NotFoundException, +} from '@nestjs/common'; import { TuyaContext } from '@tuya/tuya-connector-nodejs'; import { ConfigService } from '@nestjs/config'; import { @@ -23,6 +28,9 @@ import { import { ControlDeviceDto } from '../dtos/control.device.dto'; import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter'; import { ProductRepository } from '@app/common/modules/product/repositories'; +import { SpaceRepository } from '@app/common/modules/space/repositories'; +import { DeviceRepository } from '@app/common/modules/device/repositories'; +import { GroupDeviceRepository } from '@app/common/modules/group-device/repositories'; @Injectable() export class DeviceService { @@ -30,6 +38,9 @@ export class DeviceService { constructor( private readonly configService: ConfigService, private readonly productRepository: ProductRepository, + private readonly spaceRepository: SpaceRepository, + private readonly deviceRepository: DeviceRepository, + private readonly groupDeviceRepository: GroupDeviceRepository, ) { const accessKey = this.configService.get('auth-config.ACCESS_KEY'); const secretKey = this.configService.get('auth-config.SECRET_KEY'); @@ -42,6 +53,15 @@ export class DeviceService { async getDevicesByRoomId(getDeviceByRoomIdDto: GetDeviceByRoomIdDto) { try { + const findRoom = await this.spaceRepository.findOne({ + where: { + uuid: getDeviceByRoomIdDto.roomId, + }, + }); + if (!findRoom) { + throw new NotFoundException('Room Details Not Found'); + } + const response = await this.getDevicesByRoomIdTuya(getDeviceByRoomIdDto); return { @@ -62,7 +82,12 @@ export class DeviceService { ): Promise { try { const path = `/v2.0/cloud/thing/space/device`; - const response = await this.tuya.request({ + const getDeviceByRoomId = await this.deviceRepository.find({ + where: { + deviceTuyaUuid: getDeviceByRoomIdDto.roomId, + }, + }); + const response:any = await this.tuya.request({ method: 'GET', path, query: { @@ -70,7 +95,26 @@ export class DeviceService { page_size: getDeviceByRoomIdDto.pageSize, }, }); - return response as GetDevicesByRoomIdInterface; + if (!getDeviceByRoomId.length) { + throw new NotFoundException('Devices Not Found'); + } + + const matchingRecords = []; + + getDeviceByRoomId.forEach((item1) => { + const matchingItem = response.find( + (item2) => item1.deviceTuyaUuid === item2.uuid, + ); + if (matchingItem) { + matchingRecords.push({...matchingItem }); + } + }); + + return { + success:true, + msg:'Device Tuya Details Fetched successfully', + result:matchingRecords + }; } catch (error) { throw new HttpException( 'Error fetching devices by room from Tuya', @@ -126,7 +170,27 @@ export class DeviceService { } async addDeviceInRoom(addDeviceInRoomDto: AddDeviceInRoomDto) { - const response = await this.addDeviceInRoomTuya(addDeviceInRoomDto); + const [deviceDetails, roomDetails] = await Promise.all([ + this.deviceRepository.findOne({ + where: { + uuid: addDeviceInRoomDto.deviceId, + }, + }), + this.spaceRepository.findOne({ + where: { + uuid: addDeviceInRoomDto.roomId, + }, + }), + ]); + + if (!roomDetails) { + throw new NotFoundException('Room Details Not Found'); + } + + if (!deviceDetails) { + throw new NotFoundException('Device Details Not Found'); + } + const response = await this.addDeviceInRooms(addDeviceInRoomDto); if (response.success) { return { @@ -141,7 +205,7 @@ export class DeviceService { ); } } - async addDeviceInRoomTuya( + async addDeviceInRooms( addDeviceInRoomDto: AddDeviceInRoomDto, ): Promise { try { @@ -153,7 +217,6 @@ export class DeviceService { space_id: addDeviceInRoomDto.roomId, }, }); - return response as addDeviceInRoomInterface; } catch (error) { throw new HttpException( @@ -163,7 +226,17 @@ export class DeviceService { } } async addDeviceInGroup(addDeviceInGroupDto: AddDeviceInGroupDto) { - const response = await this.addDeviceInGroupTuya(addDeviceInGroupDto); + const deviceDetails = this.deviceRepository.findOne({ + where: { + uuid: addDeviceInGroupDto.deviceId, + }, + }); + + if (!deviceDetails) { + throw new NotFoundException('Device Details Not Found'); + } + + const response = await this.addDeviceInGroups(addDeviceInGroupDto); if (response.success) { return { @@ -178,21 +251,20 @@ export class DeviceService { ); } } - async addDeviceInGroupTuya( + async addDeviceInGroups( addDeviceInGroupDto: AddDeviceInGroupDto, ): Promise { try { - const path = `/v2.0/cloud/thing/group/${addDeviceInGroupDto.groupId}/device`; - const response = await this.tuya.request({ - method: 'PUT', - path, - body: { - space_id: addDeviceInGroupDto.homeId, - device_ids: addDeviceInGroupDto.deviceId, - }, + await this.groupDeviceRepository.create({ + deviceUuid: addDeviceInGroupDto.deviceId, + groupUuid: addDeviceInGroupDto.groupId, }); - return response as addDeviceInRoomInterface; + return { + success: true, + msg: 'Group is Added to Specific Device', + result: true, + } as addDeviceInRoomInterface; } catch (error) { throw new HttpException( 'Error adding device in group from Tuya', @@ -239,6 +311,15 @@ export class DeviceService { async getDeviceDetailsByDeviceId(deviceId: string) { try { + const deviceDetails = await this.deviceRepository.findOne({ + where: { + uuid: deviceId, + }, + }); + if (!deviceDetails) { + throw new NotFoundException('Device Details Not Found'); + } + const response = await this.getDeviceDetailsByDeviceIdTuya(deviceId); return { @@ -335,6 +416,15 @@ export class DeviceService { deviceId: string, ): Promise { try { + const deviceDetails = await this.deviceRepository.findOne({ + where: { + uuid: deviceId, + }, + }); + if (!deviceDetails) { + throw new NotFoundException('Device Details Not Found'); + } + const response = await this.getDeviceInstructionByDeviceIdTuya(deviceId); const productId: string = await this.getProductIdByDeviceId(deviceId); @@ -383,6 +473,14 @@ export class DeviceService { } async getDevicesInstructionStatus(deviceId: string) { try { + const deviceDetails = await this.deviceRepository.findOne({ + where: { + uuid: deviceId, + }, + }); + if (!deviceDetails) { + throw new NotFoundException('Device Details Not Found'); + } const deviceStatus = await this.getDevicesInstructionStatusTuya(deviceId); const productId: string = await this.getProductIdByDeviceId(deviceId); const productType: string = diff --git a/src/floor/controllers/floor.controller.ts b/src/floor/controllers/floor.controller.ts index 5c1021a..2033918 100644 --- a/src/floor/controllers/floor.controller.ts +++ b/src/floor/controllers/floor.controller.ts @@ -13,10 +13,11 @@ import { } from '@nestjs/common'; import { ApiTags, ApiBearerAuth } from '@nestjs/swagger'; import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard'; -import { AddFloorDto } from '../dtos/add.floor.dto'; +import { AddFloorDto, AddUserFloorDto } from '../dtos/add.floor.dto'; import { GetFloorChildDto } from '../dtos/get.floor.dto'; import { UpdateFloorNameDto } from '../dtos/update.floor.dto'; import { CheckBuildingTypeGuard } from 'src/guards/building.type.guard'; +import { CheckUserFloorGuard } from 'src/guards/user.floor.guard'; @ApiTags('Floor Module') @Controller({ @@ -91,6 +92,35 @@ export class FloorController { } } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard, CheckUserFloorGuard) + @Post('user') + async addUserFloor(@Body() addUserFloorDto: AddUserFloorDto) { + try { + await this.floorService.addUserFloor(addUserFloorDto); + return { message: 'user floor added successfully' }; + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Get('user/:userUuid') + async getFloorsByUserId(@Param('userUuid') userUuid: string) { + try { + return await this.floorService.getFloorsByUserId(userUuid); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + @ApiBearerAuth() @UseGuards(JwtAuthGuard) @Put('rename/:floorUuid') diff --git a/src/floor/dtos/add.floor.dto.ts b/src/floor/dtos/add.floor.dto.ts index 9f2de58..3d1655a 100644 --- a/src/floor/dtos/add.floor.dto.ts +++ b/src/floor/dtos/add.floor.dto.ts @@ -21,3 +21,22 @@ export class AddFloorDto { Object.assign(this, dto); } } +export class AddUserFloorDto { + @ApiProperty({ + description: 'floorUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public floorUuid: string; + @ApiProperty({ + description: 'userUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public userUuid: string; + constructor(dto: Partial) { + Object.assign(this, dto); + } +} diff --git a/src/floor/floor.module.ts b/src/floor/floor.module.ts index 7085659..71a6c67 100644 --- a/src/floor/floor.module.ts +++ b/src/floor/floor.module.ts @@ -6,11 +6,27 @@ import { SpaceRepositoryModule } from '@app/common/modules/space/space.repositor 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 { UserRepositoryModule } from '@app/common/modules/user/user.repository.module'; +import { UserRepository } from '@app/common/modules/user/repositories'; @Module({ - imports: [ConfigModule, SpaceRepositoryModule, SpaceTypeRepositoryModule], + imports: [ + ConfigModule, + SpaceRepositoryModule, + SpaceTypeRepositoryModule, + UserSpaceRepositoryModule, + UserRepositoryModule, + ], controllers: [FloorController], - providers: [FloorService, SpaceRepository, SpaceTypeRepository], + providers: [ + FloorService, + SpaceRepository, + SpaceTypeRepository, + UserSpaceRepository, + UserRepository, + ], exports: [FloorService], }) export class FloorModule {} diff --git a/src/floor/interface/floor.interface.ts b/src/floor/interface/floor.interface.ts index eb6a5ec..37f35c4 100644 --- a/src/floor/interface/floor.interface.ts +++ b/src/floor/interface/floor.interface.ts @@ -24,3 +24,9 @@ export interface RenameFloorByUuidInterface { name: string; type: string; } + +export interface GetFloorByUserUuidInterface { + uuid: string; + name: string; + type: string; +} diff --git a/src/floor/services/floor.service.ts b/src/floor/services/floor.service.ts index f4f0759..91de93b 100644 --- a/src/floor/services/floor.service.ts +++ b/src/floor/services/floor.service.ts @@ -7,21 +7,24 @@ import { BadRequestException, } from '@nestjs/common'; import { SpaceRepository } from '@app/common/modules/space/repositories'; -import { AddFloorDto } from '../dtos'; +import { AddFloorDto, AddUserFloorDto } from '../dtos'; import { FloorChildInterface, FloorParentInterface, + GetFloorByUserUuidInterface, GetFloorByUuidInterface, RenameFloorByUuidInterface, } 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'; @Injectable() export class FloorService { constructor( private readonly spaceRepository: SpaceRepository, private readonly spaceTypeRepository: SpaceTypeRepository, + private readonly userSpaceRepository: UserSpaceRepository, ) {} async addFloor(addFloorDto: AddFloorDto) { @@ -195,6 +198,58 @@ export class FloorService { } } + async getFloorsByUserId( + userUuid: string, + ): Promise { + try { + const floors = await this.userSpaceRepository.find({ + relations: ['space', 'space.spaceType'], + where: { + user: { uuid: userUuid }, + space: { spaceType: { type: 'floor' } }, + }, + }); + + if (floors.length === 0) { + throw new HttpException( + 'this user has no floors', + HttpStatus.NOT_FOUND, + ); + } + const spaces = floors.map((floor) => ({ + uuid: floor.space.uuid, + name: floor.space.spaceName, + type: floor.space.spaceType.type, + })); + + return spaces; + } catch (err) { + if (err instanceof HttpException) { + throw err; + } else { + throw new HttpException('user not found', HttpStatus.NOT_FOUND); + } + } + } + async addUserFloor(addUserFloorDto: AddUserFloorDto) { + try { + await this.userSpaceRepository.save({ + user: { uuid: addUserFloorDto.userUuid }, + space: { uuid: addUserFloorDto.floorUuid }, + }); + } catch (err) { + if (err.code === '23505') { + throw new HttpException( + 'User already belongs to this floor', + HttpStatus.BAD_REQUEST, + ); + } + throw new HttpException( + err.message || 'Internal Server Error', + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } async renameFloorByUuid( floorUuid: string, updateFloorDto: UpdateFloorNameDto, diff --git a/src/group/controllers/group.controller.ts b/src/group/controllers/group.controller.ts index be0c7a3..0f74ff6 100644 --- a/src/group/controllers/group.controller.ts +++ b/src/group/controllers/group.controller.ts @@ -5,17 +5,18 @@ import { Get, Post, UseGuards, - Query, Param, Put, Delete, + HttpException, + HttpStatus, } from '@nestjs/common'; import { ApiTags, ApiBearerAuth } from '@nestjs/swagger'; import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard'; import { AddGroupDto } from '../dtos/add.group.dto'; -import { GetGroupDto } from '../dtos/get.group.dto'; import { ControlGroupDto } from '../dtos/control.group.dto'; import { RenameGroupDto } from '../dtos/rename.group.dto copy'; +import { CheckProductUuidForAllDevicesGuard } from 'src/guards/device.product.guard'; @ApiTags('Group Module') @Controller({ @@ -27,32 +28,41 @@ export class GroupController { @ApiBearerAuth() @UseGuards(JwtAuthGuard) - @Get() - async getGroupsByHomeId(@Query() getGroupsDto: GetGroupDto) { + @Get('space/:spaceUuid') + async getGroupsBySpaceUuid(@Param('spaceUuid') spaceUuid: string) { try { - return await this.groupService.getGroupsByHomeId(getGroupsDto); - } catch (err) { - throw new Error(err); + return await this.groupService.getGroupsBySpaceUuid(spaceUuid); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); } } @ApiBearerAuth() @UseGuards(JwtAuthGuard) - @Get(':groupId') - async getGroupsByGroupId(@Param('groupId') groupId: number) { + @Get(':groupUuid') + async getGroupsByGroupId(@Param('groupUuid') groupUuid: string) { try { - return await this.groupService.getGroupsByGroupId(groupId); - } catch (err) { - throw new Error(err); + return await this.groupService.getGroupsByGroupUuid(groupUuid); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); } } @ApiBearerAuth() - @UseGuards(JwtAuthGuard) + @UseGuards(JwtAuthGuard, CheckProductUuidForAllDevicesGuard) @Post() async addGroup(@Body() addGroupDto: AddGroupDto) { try { return await this.groupService.addGroup(addGroupDto); - } catch (err) { - throw new Error(err); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); } } @@ -62,30 +72,45 @@ export class GroupController { async controlGroup(@Body() controlGroupDto: ControlGroupDto) { try { return await this.groupService.controlGroup(controlGroupDto); - } catch (err) { - throw new Error(err); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); } } @ApiBearerAuth() @UseGuards(JwtAuthGuard) - @Put('rename') - async renameGroup(@Body() renameGroupDto: RenameGroupDto) { + @Put('rename/:groupUuid') + async renameGroupByUuid( + @Param('groupUuid') groupUuid: string, + @Body() renameGroupDto: RenameGroupDto, + ) { try { - return await this.groupService.renameGroup(renameGroupDto); - } catch (err) { - throw new Error(err); + return await this.groupService.renameGroupByUuid( + groupUuid, + renameGroupDto, + ); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); } } @ApiBearerAuth() @UseGuards(JwtAuthGuard) - @Delete(':groupId') - async deleteGroup(@Param('groupId') groupId: number) { + @Delete(':groupUuid') + async deleteGroup(@Param('groupUuid') groupUuid: string) { try { - return await this.groupService.deleteGroup(groupId); - } catch (err) { - throw new Error(err); + return await this.groupService.deleteGroup(groupUuid); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); } } } diff --git a/src/group/dtos/add.group.dto.ts b/src/group/dtos/add.group.dto.ts index b91f793..aa2a562 100644 --- a/src/group/dtos/add.group.dto.ts +++ b/src/group/dtos/add.group.dto.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { IsNotEmpty, IsString, IsNumberString } from 'class-validator'; +import { IsNotEmpty, IsString, IsArray } from 'class-validator'; export class AddGroupDto { @ApiProperty({ @@ -11,26 +11,10 @@ export class AddGroupDto { public groupName: string; @ApiProperty({ - description: 'homeId', + description: 'deviceUuids', required: true, }) - @IsNumberString() + @IsArray() @IsNotEmpty() - public homeId: string; - - @ApiProperty({ - description: 'productId', - required: true, - }) - @IsString() - @IsNotEmpty() - public productId: string; - - @ApiProperty({ - description: 'The list of up to 20 device IDs, separated with commas (,)', - required: true, - }) - @IsString() - @IsNotEmpty() - public deviceIds: string; + public deviceUuids: [string]; } diff --git a/src/group/dtos/control.group.dto.ts b/src/group/dtos/control.group.dto.ts index 33a6870..e3b48e9 100644 --- a/src/group/dtos/control.group.dto.ts +++ b/src/group/dtos/control.group.dto.ts @@ -1,20 +1,26 @@ import { ApiProperty } from '@nestjs/swagger'; -import { IsNotEmpty, IsObject, IsNumberString } from 'class-validator'; +import { IsNotEmpty, IsString } from 'class-validator'; export class ControlGroupDto { @ApiProperty({ - description: 'groupId', + description: 'groupUuid', required: true, }) - @IsNumberString() + @IsString() @IsNotEmpty() - public groupId: string; + public groupUuid: string; @ApiProperty({ - description: 'example {"switch_1":true,"add_ele":300}', + description: 'code', required: true, }) - @IsObject() + @IsString() @IsNotEmpty() - public properties: object; + public code: string; + @ApiProperty({ + description: 'value', + required: true, + }) + @IsNotEmpty() + public value: any; } diff --git a/src/group/dtos/get.group.dto.ts b/src/group/dtos/get.group.dto.ts deleted file mode 100644 index aad234b..0000000 --- a/src/group/dtos/get.group.dto.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { ApiProperty } from '@nestjs/swagger'; -import { IsNotEmpty, IsNumberString } from 'class-validator'; - -export class GetGroupDto { - @ApiProperty({ - description: 'homeId', - required: true, - }) - @IsNumberString() - @IsNotEmpty() - public homeId: string; - - @ApiProperty({ - description: 'pageSize', - required: true, - }) - @IsNumberString() - @IsNotEmpty() - public pageSize: number; - - @ApiProperty({ - description: 'pageNo', - required: true, - }) - @IsNumberString() - @IsNotEmpty() - public pageNo: number; -} diff --git a/src/group/dtos/rename.group.dto copy.ts b/src/group/dtos/rename.group.dto copy.ts index a85f41b..f2b0c00 100644 --- a/src/group/dtos/rename.group.dto copy.ts +++ b/src/group/dtos/rename.group.dto copy.ts @@ -1,15 +1,7 @@ import { ApiProperty } from '@nestjs/swagger'; -import { IsNotEmpty, IsString, IsNumberString } from 'class-validator'; +import { IsNotEmpty, IsString } from 'class-validator'; export class RenameGroupDto { - @ApiProperty({ - description: 'groupId', - required: true, - }) - @IsNumberString() - @IsNotEmpty() - public groupId: string; - @ApiProperty({ description: 'groupName', required: true, diff --git a/src/group/group.module.ts b/src/group/group.module.ts index 3969d39..61d95ab 100644 --- a/src/group/group.module.ts +++ b/src/group/group.module.ts @@ -2,10 +2,26 @@ import { Module } from '@nestjs/common'; import { GroupService } from './services/group.service'; import { GroupController } from './controllers/group.controller'; import { ConfigModule } from '@nestjs/config'; +import { GroupRepositoryModule } from '@app/common/modules/group/group.repository.module'; +import { GroupRepository } from '@app/common/modules/group/repositories'; +import { GroupDeviceRepositoryModule } from '@app/common/modules/group-device/group.device.repository.module'; +import { GroupDeviceRepository } from '@app/common/modules/group-device/repositories'; +import { DeviceRepositoryModule } from '@app/common/modules/device'; +import { DeviceRepository } from '@app/common/modules/device/repositories'; @Module({ - imports: [ConfigModule], + imports: [ + ConfigModule, + GroupRepositoryModule, + GroupDeviceRepositoryModule, + DeviceRepositoryModule, + ], controllers: [GroupController], - providers: [GroupService], + providers: [ + GroupService, + GroupRepository, + GroupDeviceRepository, + DeviceRepository, + ], exports: [GroupService], }) export class GroupModule {} diff --git a/src/group/interfaces/get.group.interface.ts b/src/group/interfaces/get.group.interface.ts index 970c343..525fa04 100644 --- a/src/group/interfaces/get.group.interface.ts +++ b/src/group/interfaces/get.group.interface.ts @@ -1,25 +1,15 @@ -export class GetGroupDetailsInterface { - result: { - id: string; - name: string; - }; +export interface GetGroupDetailsInterface { + groupUuid: string; + groupName: string; + createdAt: Date; + updatedAt: Date; } -export class GetGroupsInterface { - result: { - count: number; - data_list: []; - }; +export interface GetGroupsBySpaceUuidInterface { + groupUuid: string; + groupName: string; } -export class addGroupInterface { - success: boolean; - msg: string; - result: { - id: string; - }; -} - -export class controlGroupInterface { +export interface controlGroupInterface { success: boolean; result: boolean; msg: string; diff --git a/src/group/services/group.service.ts b/src/group/services/group.service.ts index 07fbacf..63e63e9 100644 --- a/src/group/services/group.service.ts +++ b/src/group/services/group.service.ts @@ -1,21 +1,31 @@ -import { Injectable, HttpException, HttpStatus } from '@nestjs/common'; +import { + Injectable, + HttpException, + HttpStatus, + BadRequestException, +} from '@nestjs/common'; import { TuyaContext } from '@tuya/tuya-connector-nodejs'; import { ConfigService } from '@nestjs/config'; import { AddGroupDto } from '../dtos/add.group.dto'; import { GetGroupDetailsInterface, - GetGroupsInterface, - addGroupInterface, - controlGroupInterface, + GetGroupsBySpaceUuidInterface, } from '../interfaces/get.group.interface'; -import { GetGroupDto } from '../dtos/get.group.dto'; import { ControlGroupDto } from '../dtos/control.group.dto'; import { RenameGroupDto } from '../dtos/rename.group.dto copy'; +import { GroupRepository } from '@app/common/modules/group/repositories'; +import { GroupDeviceRepository } from '@app/common/modules/group-device/repositories'; +import { controlDeviceInterface } from 'src/device/interfaces/get.device.interface'; +import { ControlDeviceDto } from 'src/device/dtos'; @Injectable() export class GroupService { private tuya: TuyaContext; - constructor(private readonly configService: ConfigService) { + constructor( + private readonly configService: ConfigService, + private readonly groupRepository: GroupRepository, + private readonly groupDeviceRepository: GroupDeviceRepository, + ) { const accessKey = this.configService.get('auth-config.ACCESS_KEY'); const secretKey = this.configService.get('auth-config.SECRET_KEY'); // const clientId = this.configService.get('auth-config.CLIENT_ID'); @@ -26,88 +36,100 @@ export class GroupService { }); } - async getGroupsByHomeId(getGroupDto: GetGroupDto) { + async getGroupsBySpaceUuid( + spaceUuid: string, + ): Promise { try { - const response = await this.getGroupsTuya(getGroupDto); - - const groups = response.result.data_list.map((group: any) => ({ - groupId: group.id, - groupName: group.name, - })); - - return { - count: response.result.count, - groups: groups, - }; - } catch (error) { - throw new HttpException( - 'Error fetching groups', - HttpStatus.INTERNAL_SERVER_ERROR, - ); - } - } - - async getGroupsTuya(getGroupDto: GetGroupDto): Promise { - try { - const path = `/v2.0/cloud/thing/group`; - const response = await this.tuya.request({ - method: 'GET', - path, - query: { - space_id: getGroupDto.homeId, - page_size: getGroupDto.pageSize, - page_no: getGroupDto.pageNo, + const groupDevices = await this.groupDeviceRepository.find({ + relations: ['group', 'device'], + where: { + device: { spaceUuid }, + isActive: true, }, }); - return response as unknown as GetGroupsInterface; + + // Extract and return only the group entities + const groups = groupDevices.map((groupDevice) => { + return { + groupUuid: groupDevice.uuid, + groupName: groupDevice.group.groupName, + }; + }); + if (groups.length > 0) { + return groups; + } else { + throw new HttpException( + 'this space has no groups', + HttpStatus.NOT_FOUND, + ); + } } catch (error) { throw new HttpException( - 'Error fetching groups ', - HttpStatus.INTERNAL_SERVER_ERROR, + error.message || 'Error fetching groups', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, ); } } async addGroup(addGroupDto: AddGroupDto) { - const response = await this.addGroupTuya(addGroupDto); - - if (response.success) { - return { - success: true, - groupId: response.result.id, - }; - } else { - throw new HttpException( - response.msg || 'Unknown error', - HttpStatus.BAD_REQUEST, - ); - } - } - async addGroupTuya(addGroupDto: AddGroupDto): Promise { try { - const path = `/v2.0/cloud/thing/group`; - const response = await this.tuya.request({ - method: 'POST', - path, - body: { - space_id: addGroupDto.homeId, - name: addGroupDto.groupName, - product_id: addGroupDto.productId, - device_ids: addGroupDto.deviceIds, - }, + const group = await this.groupRepository.save({ + groupName: addGroupDto.groupName, }); - return response as addGroupInterface; - } catch (error) { + const groupDevicePromises = addGroupDto.deviceUuids.map( + async (deviceUuid) => { + await this.saveGroupDevice(group.uuid, deviceUuid); + }, + ); + + await Promise.all(groupDevicePromises); + } catch (err) { + if (err.code === '23505') { + throw new HttpException( + 'User already belongs to this group', + HttpStatus.BAD_REQUEST, + ); + } throw new HttpException( - 'Error adding group', + err.message || 'Internal Server Error', HttpStatus.INTERNAL_SERVER_ERROR, ); } } - async controlGroup(controlGroupDto: ControlGroupDto) { - const response = await this.controlGroupTuya(controlGroupDto); + private async saveGroupDevice(groupUuid: string, deviceUuid: string) { + try { + await this.groupDeviceRepository.save({ + group: { + uuid: groupUuid, + }, + device: { + uuid: deviceUuid, + }, + }); + } catch (error) { + throw error; + } + } + async getDevicesByGroupUuid(groupUuid: string) { + try { + const devices = await this.groupDeviceRepository.find({ + relations: ['device'], + where: { + group: { + uuid: groupUuid, + }, + isActive: true, + }, + }); + return devices; + } catch (error) { + throw error; + } + } + async controlDevice(controlDeviceDto: ControlDeviceDto) { + const response = await this.controlDeviceTuya(controlDeviceDto); if (response.success) { return response; @@ -118,128 +140,120 @@ export class GroupService { ); } } - async controlGroupTuya( - controlGroupDto: ControlGroupDto, - ): Promise { + async controlDeviceTuya( + controlDeviceDto: ControlDeviceDto, + ): Promise { try { - const path = `/v2.0/cloud/thing/group/properties`; + const path = `/v1.0/iot-03/devices/${controlDeviceDto.deviceId}/commands`; const response = await this.tuya.request({ method: 'POST', path, body: { - group_id: controlGroupDto.groupId, - properties: controlGroupDto.properties, + commands: [ + { code: controlDeviceDto.code, value: controlDeviceDto.value }, + ], }, }); - return response as controlGroupInterface; + return response as controlDeviceInterface; } catch (error) { throw new HttpException( - 'Error control group', + 'Error control device from Tuya', + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + async controlGroup(controlGroupDto: ControlGroupDto) { + const devices = await this.getDevicesByGroupUuid(controlGroupDto.groupUuid); + + try { + await Promise.all( + devices.map(async (device) => { + return this.controlDevice({ + deviceId: device.device.deviceTuyaUuid, + code: controlGroupDto.code, + value: controlGroupDto.value, + }); + }), + ); + } catch (error) { + throw new HttpException( + 'Error controlling devices', HttpStatus.INTERNAL_SERVER_ERROR, ); } } - async renameGroup(renameGroupDto: RenameGroupDto) { - const response = await this.renameGroupTuya(renameGroupDto); - - if (response.success) { - return { - success: response.success, - result: response.result, - msg: response.msg, - }; - } else { - throw new HttpException( - response.msg || 'Unknown error', - HttpStatus.BAD_REQUEST, - ); - } - } - async renameGroupTuya( + async renameGroupByUuid( + groupUuid: string, renameGroupDto: RenameGroupDto, - ): Promise { + ): Promise { try { - const path = `/v2.0/cloud/thing/group/${renameGroupDto.groupId}/${renameGroupDto.groupName}`; - const response = await this.tuya.request({ - method: 'PUT', - path, + await this.groupRepository.update( + { uuid: groupUuid }, + { groupName: renameGroupDto.groupName }, + ); + + // Fetch the updated floor + const updatedGroup = await this.groupRepository.findOneOrFail({ + where: { uuid: groupUuid }, }); - - return response as controlGroupInterface; - } catch (error) { - throw new HttpException( - 'Error rename group', - HttpStatus.INTERNAL_SERVER_ERROR, - ); - } - } - - async deleteGroup(groupId: number) { - const response = await this.deleteGroupTuya(groupId); - - if (response.success) { return { - success: response.success, - result: response.result, - msg: response.msg, - }; - } else { - throw new HttpException( - response.msg || 'Unknown error', - HttpStatus.BAD_REQUEST, - ); - } - } - async deleteGroupTuya(groupId: number): Promise { - try { - const path = `/v2.0/cloud/thing/group/${groupId}`; - const response = await this.tuya.request({ - method: 'DELETE', - path, - }); - - return response as controlGroupInterface; - } catch (error) { - throw new HttpException( - 'Error delete group', - HttpStatus.INTERNAL_SERVER_ERROR, - ); - } - } - - async getGroupsByGroupId(groupId: number) { - try { - const response = await this.getGroupsByGroupIdTuya(groupId); - - return { - groupId: response.result.id, - groupName: response.result.name, + groupUuid: updatedGroup.uuid, + groupName: updatedGroup.groupName, }; + } catch (error) { + throw new HttpException('Group not found', HttpStatus.NOT_FOUND); + } + } + + async deleteGroup(groupUuid: string) { + try { + const group = await this.getGroupsByGroupUuid(groupUuid); + + if (!group) { + throw new HttpException('Group not found', HttpStatus.NOT_FOUND); + } + + await this.groupRepository.update( + { uuid: groupUuid }, + { isActive: false }, + ); + + return { message: 'Group deleted successfully' }; } catch (error) { throw new HttpException( - 'Error fetching group', - HttpStatus.INTERNAL_SERVER_ERROR, + error.message || 'Error deleting group', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, ); } } - async getGroupsByGroupIdTuya( - groupId: number, + async getGroupsByGroupUuid( + groupUuid: string, ): Promise { try { - const path = `/v2.0/cloud/thing/group/${groupId}`; - const response = await this.tuya.request({ - method: 'GET', - path, + const group = await this.groupRepository.findOne({ + where: { + uuid: groupUuid, + isActive: true, + }, }); - return response as GetGroupDetailsInterface; - } catch (error) { - throw new HttpException( - 'Error fetching group ', - HttpStatus.INTERNAL_SERVER_ERROR, - ); + if (!group) { + throw new BadRequestException('Invalid group UUID'); + } + return { + groupUuid: group.uuid, + groupName: group.groupName, + createdAt: group.createdAt, + updatedAt: group.updatedAt, + }; + } catch (err) { + if (err instanceof BadRequestException) { + throw err; // Re-throw BadRequestException + } else { + throw new HttpException('Group not found', HttpStatus.NOT_FOUND); + } } } } diff --git a/src/guards/device.permission.guard.ts b/src/guards/device.permission.guard.ts new file mode 100644 index 0000000..3fc80af --- /dev/null +++ b/src/guards/device.permission.guard.ts @@ -0,0 +1,97 @@ +import { PermissionType } from '@app/common/constants/permission-type.enum'; +import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; +import { DeviceUserTypeRepository } from '@app/common/modules/device/repositories'; +import { PermissionTypeRepository } from '@app/common/modules/permission/repositories'; +import { + Injectable, + CanActivate, + HttpStatus, + ExecutionContext, + BadRequestException, + applyDecorators, + SetMetadata, + UseGuards, +} from '@nestjs/common'; +import { Reflector } from '@nestjs/core'; + +@Injectable() +export class DevicePermissionGuard implements CanActivate { + constructor( + private reflector: Reflector, + private readonly deviceUserTypeRepository: DeviceUserTypeRepository, + private readonly permissionTypeRepository: PermissionTypeRepository, + ) {} + + async canActivate(context: ExecutionContext): Promise { + const req = context.switchToHttp().getRequest(); + try { + const { deviceId } = req.headers; + const userId = req.user.uuid; + + const requirePermission = + this.reflector.getAllAndOverride('permission', [ + context.getHandler(), + context.getClass(), + ]); + + if (!requirePermission) { + return true; + } + await this.checkDevicePermission(deviceId, userId, requirePermission); + + return true; + } catch (error) { + this.handleGuardError(error, context); + return false; + } + } + + async checkDevicePermission( + deviceId: string, + userId: string, + requirePermission, + ) { + const [userPermissionDetails, permissionDetails] = await Promise.all([ + this.deviceUserTypeRepository.findOne({ + where: { deviceUuid: deviceId, userUuid: userId }, + }), + this.permissionTypeRepository.findOne({ + where: { + type: requirePermission, + }, + }), + ]); + if (!userPermissionDetails) { + throw new BadRequestException('User Permission Details Not Found'); + } + if (userPermissionDetails.permissionTypeUuid !== permissionDetails.uuid) { + throw new BadRequestException( + `User Does not have a ${requirePermission}`, + ); + } + } + + private handleGuardError(error: Error, context: ExecutionContext) { + const response = context.switchToHttp().getResponse(); + console.error(error); + + if (error instanceof BadRequestException) { + response + .status(HttpStatus.BAD_REQUEST) + .json({ statusCode: HttpStatus.BAD_REQUEST, message: error.message }); + } else { + response.status(HttpStatus.NOT_FOUND).json({ + statusCode: HttpStatus.NOT_FOUND, + message: 'User Permission not found', + }); + } + } +} + +export function AuthGuardWithRoles(permission?: string) { + return applyDecorators( + SetMetadata('permission', permission), + UseGuards(JwtAuthGuard), + UseGuards(DevicePermissionGuard), + ); +} diff --git a/src/guards/device.product.guard.ts b/src/guards/device.product.guard.ts new file mode 100644 index 0000000..2118401 --- /dev/null +++ b/src/guards/device.product.guard.ts @@ -0,0 +1,71 @@ +import { DeviceRepository } from '@app/common/modules/device/repositories'; +import { + Injectable, + CanActivate, + HttpStatus, + BadRequestException, + ExecutionContext, +} from '@nestjs/common'; + +@Injectable() +export class CheckProductUuidForAllDevicesGuard implements CanActivate { + constructor(private readonly deviceRepository: DeviceRepository) {} + + async canActivate(context: ExecutionContext): Promise { + const req = context.switchToHttp().getRequest(); + + try { + const { deviceUuids } = req.body; + console.log(deviceUuids); + + await this.checkAllDevicesHaveSameProductUuid(deviceUuids); + + return true; + } catch (error) { + this.handleGuardError(error, context); + return false; + } + } + + async checkAllDevicesHaveSameProductUuid(deviceUuids: string[]) { + const firstDevice = await this.deviceRepository.findOne({ + where: { uuid: deviceUuids[0] }, + }); + + if (!firstDevice) { + throw new BadRequestException('First device not found'); + } + + const firstProductUuid = firstDevice.productUuid; + + for (let i = 1; i < deviceUuids.length; i++) { + const device = await this.deviceRepository.findOne({ + where: { uuid: deviceUuids[i] }, + }); + + if (!device) { + throw new BadRequestException(`Device ${deviceUuids[i]} not found`); + } + + if (device.productUuid !== firstProductUuid) { + throw new BadRequestException(`Devices have different product UUIDs`); + } + } + } + + private handleGuardError(error: Error, context: ExecutionContext) { + const response = context.switchToHttp().getResponse(); + console.error(error); + + if (error instanceof BadRequestException) { + response + .status(HttpStatus.BAD_REQUEST) + .json({ statusCode: HttpStatus.BAD_REQUEST, message: error.message }); + } else { + response.status(HttpStatus.NOT_FOUND).json({ + statusCode: HttpStatus.NOT_FOUND, + message: 'Device not found', + }); + } + } +} diff --git a/src/guards/user.building.guard.ts b/src/guards/user.building.guard.ts new file mode 100644 index 0000000..b47124d --- /dev/null +++ b/src/guards/user.building.guard.ts @@ -0,0 +1,70 @@ +import { + CanActivate, + ExecutionContext, + Injectable, + HttpStatus, +} from '@nestjs/common'; +import { SpaceRepository } from '@app/common/modules/space/repositories'; +import { BadRequestException, NotFoundException } from '@nestjs/common'; +import { UserRepository } from '@app/common/modules/user/repositories'; + +@Injectable() +export class CheckUserBuildingGuard implements CanActivate { + constructor( + private readonly spaceRepository: SpaceRepository, + private readonly userRepository: UserRepository, + ) {} + + async canActivate(context: ExecutionContext): Promise { + const req = context.switchToHttp().getRequest(); + + try { + const { userUuid, buildingUuid } = req.body; + + await this.checkUserIsFound(userUuid); + + await this.checkBuildingIsFound(buildingUuid); + + return true; + } catch (error) { + this.handleGuardError(error, context); + return false; + } + } + + private async checkUserIsFound(userUuid: string) { + const userData = await this.userRepository.findOne({ + where: { uuid: userUuid }, + }); + if (!userData) { + throw new NotFoundException('User not found'); + } + } + + private async checkBuildingIsFound(spaceUuid: string) { + const spaceData = await this.spaceRepository.findOne({ + where: { uuid: spaceUuid, spaceType: { type: 'building' } }, + relations: ['spaceType'], + }); + if (!spaceData) { + throw new NotFoundException('Building not found'); + } + } + + private handleGuardError(error: Error, context: ExecutionContext) { + const response = context.switchToHttp().getResponse(); + if ( + error instanceof BadRequestException || + error instanceof NotFoundException + ) { + response + .status(HttpStatus.NOT_FOUND) + .json({ statusCode: HttpStatus.NOT_FOUND, message: error.message }); + } else { + response.status(HttpStatus.BAD_REQUEST).json({ + statusCode: HttpStatus.BAD_REQUEST, + message: 'invalid userUuid or buildingUuid', + }); + } + } +} diff --git a/src/guards/user.community.guard.ts b/src/guards/user.community.guard.ts new file mode 100644 index 0000000..04e08b4 --- /dev/null +++ b/src/guards/user.community.guard.ts @@ -0,0 +1,70 @@ +import { + CanActivate, + ExecutionContext, + Injectable, + HttpStatus, +} from '@nestjs/common'; +import { SpaceRepository } from '@app/common/modules/space/repositories'; +import { BadRequestException, NotFoundException } from '@nestjs/common'; +import { UserRepository } from '@app/common/modules/user/repositories'; + +@Injectable() +export class CheckUserCommunityGuard implements CanActivate { + constructor( + private readonly spaceRepository: SpaceRepository, + private readonly userRepository: UserRepository, + ) {} + + async canActivate(context: ExecutionContext): Promise { + const req = context.switchToHttp().getRequest(); + + try { + const { userUuid, communityUuid } = req.body; + + await this.checkUserIsFound(userUuid); + + await this.checkCommunityIsFound(communityUuid); + + return true; + } catch (error) { + this.handleGuardError(error, context); + return false; + } + } + + private async checkUserIsFound(userUuid: string) { + const userData = await this.userRepository.findOne({ + where: { uuid: userUuid }, + }); + if (!userData) { + throw new NotFoundException('User not found'); + } + } + + private async checkCommunityIsFound(spaceUuid: string) { + const spaceData = await this.spaceRepository.findOne({ + where: { uuid: spaceUuid, spaceType: { type: 'community' } }, + relations: ['spaceType'], + }); + if (!spaceData) { + throw new NotFoundException('Community not found'); + } + } + + private handleGuardError(error: Error, context: ExecutionContext) { + const response = context.switchToHttp().getResponse(); + if ( + error instanceof BadRequestException || + error instanceof NotFoundException + ) { + response + .status(HttpStatus.NOT_FOUND) + .json({ statusCode: HttpStatus.NOT_FOUND, message: error.message }); + } else { + response.status(HttpStatus.BAD_REQUEST).json({ + statusCode: HttpStatus.BAD_REQUEST, + message: 'invalid userUuid or communityUuid', + }); + } + } +} diff --git a/src/guards/user.floor.guard.ts b/src/guards/user.floor.guard.ts new file mode 100644 index 0000000..9235fb8 --- /dev/null +++ b/src/guards/user.floor.guard.ts @@ -0,0 +1,70 @@ +import { + CanActivate, + ExecutionContext, + Injectable, + HttpStatus, +} from '@nestjs/common'; +import { SpaceRepository } from '@app/common/modules/space/repositories'; +import { BadRequestException, NotFoundException } from '@nestjs/common'; +import { UserRepository } from '@app/common/modules/user/repositories'; + +@Injectable() +export class CheckUserFloorGuard implements CanActivate { + constructor( + private readonly spaceRepository: SpaceRepository, + private readonly userRepository: UserRepository, + ) {} + + async canActivate(context: ExecutionContext): Promise { + const req = context.switchToHttp().getRequest(); + + try { + const { userUuid, floorUuid } = req.body; + + await this.checkUserIsFound(userUuid); + + await this.checkFloorIsFound(floorUuid); + + return true; + } catch (error) { + this.handleGuardError(error, context); + return false; + } + } + + private async checkUserIsFound(userUuid: string) { + const userData = await this.userRepository.findOne({ + where: { uuid: userUuid }, + }); + if (!userData) { + throw new NotFoundException('User not found'); + } + } + + private async checkFloorIsFound(spaceUuid: string) { + const spaceData = await this.spaceRepository.findOne({ + where: { uuid: spaceUuid, spaceType: { type: 'floor' } }, + relations: ['spaceType'], + }); + if (!spaceData) { + throw new NotFoundException('Floor not found'); + } + } + + private handleGuardError(error: Error, context: ExecutionContext) { + const response = context.switchToHttp().getResponse(); + if ( + error instanceof BadRequestException || + error instanceof NotFoundException + ) { + response + .status(HttpStatus.NOT_FOUND) + .json({ statusCode: HttpStatus.NOT_FOUND, message: error.message }); + } else { + response.status(HttpStatus.BAD_REQUEST).json({ + statusCode: HttpStatus.BAD_REQUEST, + message: 'invalid userUuid or floorUuid', + }); + } + } +} diff --git a/src/guards/user.room.guard.ts b/src/guards/user.room.guard.ts new file mode 100644 index 0000000..0ecf817 --- /dev/null +++ b/src/guards/user.room.guard.ts @@ -0,0 +1,70 @@ +import { + CanActivate, + ExecutionContext, + Injectable, + HttpStatus, +} from '@nestjs/common'; +import { SpaceRepository } from '@app/common/modules/space/repositories'; +import { BadRequestException, NotFoundException } from '@nestjs/common'; +import { UserRepository } from '@app/common/modules/user/repositories'; + +@Injectable() +export class CheckUserRoomGuard implements CanActivate { + constructor( + private readonly spaceRepository: SpaceRepository, + private readonly userRepository: UserRepository, + ) {} + + async canActivate(context: ExecutionContext): Promise { + const req = context.switchToHttp().getRequest(); + + try { + const { userUuid, roomUuid } = req.body; + + await this.checkUserIsFound(userUuid); + + await this.checkRoomIsFound(roomUuid); + + return true; + } catch (error) { + this.handleGuardError(error, context); + return false; + } + } + + private async checkUserIsFound(userUuid: string) { + const userData = await this.userRepository.findOne({ + where: { uuid: userUuid }, + }); + if (!userData) { + throw new NotFoundException('User not found'); + } + } + + private async checkRoomIsFound(spaceUuid: string) { + const spaceData = await this.spaceRepository.findOne({ + where: { uuid: spaceUuid, spaceType: { type: 'room' } }, + relations: ['spaceType'], + }); + if (!spaceData) { + throw new NotFoundException('Room not found'); + } + } + + private handleGuardError(error: Error, context: ExecutionContext) { + const response = context.switchToHttp().getResponse(); + if ( + error instanceof BadRequestException || + error instanceof NotFoundException + ) { + response + .status(HttpStatus.NOT_FOUND) + .json({ statusCode: HttpStatus.NOT_FOUND, message: error.message }); + } else { + response.status(HttpStatus.BAD_REQUEST).json({ + statusCode: HttpStatus.BAD_REQUEST, + message: 'invalid userUuid or roomUuid', + }); + } + } +} diff --git a/src/guards/user.unit.guard.ts b/src/guards/user.unit.guard.ts new file mode 100644 index 0000000..4d7b1ab --- /dev/null +++ b/src/guards/user.unit.guard.ts @@ -0,0 +1,70 @@ +import { + CanActivate, + ExecutionContext, + Injectable, + HttpStatus, +} from '@nestjs/common'; +import { SpaceRepository } from '@app/common/modules/space/repositories'; +import { BadRequestException, NotFoundException } from '@nestjs/common'; +import { UserRepository } from '@app/common/modules/user/repositories'; + +@Injectable() +export class CheckUserUnitGuard implements CanActivate { + constructor( + private readonly spaceRepository: SpaceRepository, + private readonly userRepository: UserRepository, + ) {} + + async canActivate(context: ExecutionContext): Promise { + const req = context.switchToHttp().getRequest(); + + try { + const { userUuid, unitUuid } = req.body; + + await this.checkUserIsFound(userUuid); + + await this.checkUnitIsFound(unitUuid); + + return true; + } catch (error) { + this.handleGuardError(error, context); + return false; + } + } + + private async checkUserIsFound(userUuid: string) { + const userData = await this.userRepository.findOne({ + where: { uuid: userUuid }, + }); + if (!userData) { + throw new NotFoundException('User not found'); + } + } + + private async checkUnitIsFound(spaceUuid: string) { + const spaceData = await this.spaceRepository.findOne({ + where: { uuid: spaceUuid, spaceType: { type: 'unit' } }, + relations: ['spaceType'], + }); + if (!spaceData) { + throw new NotFoundException('Unit not found'); + } + } + + private handleGuardError(error: Error, context: ExecutionContext) { + const response = context.switchToHttp().getResponse(); + if ( + error instanceof BadRequestException || + error instanceof NotFoundException + ) { + response + .status(HttpStatus.NOT_FOUND) + .json({ statusCode: HttpStatus.NOT_FOUND, message: error.message }); + } else { + response.status(HttpStatus.BAD_REQUEST).json({ + statusCode: HttpStatus.BAD_REQUEST, + message: 'invalid userUuid or unitUuid', + }); + } + } +} diff --git a/src/room/controllers/room.controller.ts b/src/room/controllers/room.controller.ts index b0e4e3f..054bedf 100644 --- a/src/room/controllers/room.controller.ts +++ b/src/room/controllers/room.controller.ts @@ -12,9 +12,10 @@ import { } from '@nestjs/common'; import { ApiTags, ApiBearerAuth } from '@nestjs/swagger'; import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard'; -import { AddRoomDto } from '../dtos/add.room.dto'; +import { AddRoomDto, AddUserRoomDto } from '../dtos/add.room.dto'; import { UpdateRoomNameDto } from '../dtos/update.room.dto'; import { CheckUnitTypeGuard } from 'src/guards/unit.type.guard'; +import { CheckUserRoomGuard } from 'src/guards/user.room.guard'; @ApiTags('Room Module') @Controller({ @@ -68,6 +69,33 @@ export class RoomController { ); } } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard, CheckUserRoomGuard) + @Post('user') + async addUserRoom(@Body() addUserRoomDto: AddUserRoomDto) { + try { + await this.roomService.addUserRoom(addUserRoomDto); + return { message: 'user room added successfully' }; + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Get('user/:userUuid') + async getRoomsByUserId(@Param('userUuid') userUuid: string) { + try { + return await this.roomService.getRoomsByUserId(userUuid); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } @ApiBearerAuth() @UseGuards(JwtAuthGuard) diff --git a/src/room/dtos/add.room.dto.ts b/src/room/dtos/add.room.dto.ts index 69425b1..2718a29 100644 --- a/src/room/dtos/add.room.dto.ts +++ b/src/room/dtos/add.room.dto.ts @@ -21,3 +21,22 @@ export class AddRoomDto { Object.assign(this, dto); } } +export class AddUserRoomDto { + @ApiProperty({ + description: 'roomUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public roomUuid: string; + @ApiProperty({ + description: 'userUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public userUuid: string; + constructor(dto: Partial) { + Object.assign(this, dto); + } +} diff --git a/src/room/interface/room.interface.ts b/src/room/interface/room.interface.ts index 3f1d817..49473a3 100644 --- a/src/room/interface/room.interface.ts +++ b/src/room/interface/room.interface.ts @@ -17,3 +17,8 @@ export interface RenameRoomByUuidInterface { name: string; type: string; } +export interface GetRoomByUserUuidInterface { + uuid: string; + name: string; + type: string; +} diff --git a/src/room/room.module.ts b/src/room/room.module.ts index 8411cd4..2d6d98c 100644 --- a/src/room/room.module.ts +++ b/src/room/room.module.ts @@ -6,11 +6,27 @@ import { SpaceRepositoryModule } from '@app/common/modules/space/space.repositor 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 { UserRepositoryModule } from '@app/common/modules/user/user.repository.module'; +import { UserRepository } from '@app/common/modules/user/repositories'; @Module({ - imports: [ConfigModule, SpaceRepositoryModule, SpaceTypeRepositoryModule], + imports: [ + ConfigModule, + SpaceRepositoryModule, + SpaceTypeRepositoryModule, + UserSpaceRepositoryModule, + UserRepositoryModule, + ], controllers: [RoomController], - providers: [RoomService, SpaceRepository, SpaceTypeRepository], + providers: [ + RoomService, + SpaceRepository, + SpaceTypeRepository, + UserSpaceRepository, + UserRepository, + ], exports: [RoomService], }) export class RoomModule {} diff --git a/src/room/services/room.service.ts b/src/room/services/room.service.ts index d6c8afa..4771c25 100644 --- a/src/room/services/room.service.ts +++ b/src/room/services/room.service.ts @@ -6,19 +6,22 @@ import { BadRequestException, } from '@nestjs/common'; import { SpaceRepository } from '@app/common/modules/space/repositories'; -import { AddRoomDto } from '../dtos'; +import { AddRoomDto, AddUserRoomDto } from '../dtos'; import { RoomParentInterface, GetRoomByUuidInterface, RenameRoomByUuidInterface, + GetRoomByUserUuidInterface, } from '../interface/room.interface'; import { UpdateRoomNameDto } from '../dtos/update.room.dto'; +import { UserSpaceRepository } from '@app/common/modules/user-space/repositories'; @Injectable() export class RoomService { constructor( private readonly spaceRepository: SpaceRepository, private readonly spaceTypeRepository: SpaceTypeRepository, + private readonly userSpaceRepository: UserSpaceRepository, ) {} async addRoom(addRoomDto: AddRoomDto) { @@ -103,6 +106,56 @@ export class RoomService { } } } + + async getRoomsByUserId( + userUuid: string, + ): Promise { + try { + const rooms = await this.userSpaceRepository.find({ + relations: ['space', 'space.spaceType'], + where: { + user: { uuid: userUuid }, + space: { spaceType: { type: 'room' } }, + }, + }); + + if (rooms.length === 0) { + throw new HttpException('this user has no rooms', HttpStatus.NOT_FOUND); + } + const spaces = rooms.map((room) => ({ + uuid: room.space.uuid, + name: room.space.spaceName, + type: room.space.spaceType.type, + })); + + return spaces; + } catch (err) { + if (err instanceof HttpException) { + throw err; + } else { + throw new HttpException('user not found', HttpStatus.NOT_FOUND); + } + } + } + async addUserRoom(addUserRoomDto: AddUserRoomDto) { + try { + await this.userSpaceRepository.save({ + user: { uuid: addUserRoomDto.userUuid }, + space: { uuid: addUserRoomDto.roomUuid }, + }); + } catch (err) { + if (err.code === '23505') { + throw new HttpException( + 'User already belongs to this room', + HttpStatus.BAD_REQUEST, + ); + } + throw new HttpException( + err.message || 'Internal Server Error', + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } async renameRoomByUuid( roomUuid: string, updateRoomNameDto: UpdateRoomNameDto, diff --git a/src/unit/controllers/unit.controller.ts b/src/unit/controllers/unit.controller.ts index f36a510..a3e59e9 100644 --- a/src/unit/controllers/unit.controller.ts +++ b/src/unit/controllers/unit.controller.ts @@ -13,10 +13,11 @@ import { } from '@nestjs/common'; import { ApiTags, ApiBearerAuth } from '@nestjs/swagger'; import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard'; -import { AddUnitDto } from '../dtos/add.unit.dto'; +import { AddUnitDto, AddUserUnitDto } from '../dtos/add.unit.dto'; import { GetUnitChildDto } from '../dtos/get.unit.dto'; import { UpdateUnitNameDto } from '../dtos/update.unit.dto'; import { CheckFloorTypeGuard } from 'src/guards/floor.type.guard'; +import { CheckUserUnitGuard } from 'src/guards/user.unit.guard'; @ApiTags('Unit Module') @Controller({ @@ -87,6 +88,33 @@ export class UnitController { ); } } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard, CheckUserUnitGuard) + @Post('user') + async addUserUnit(@Body() addUserUnitDto: AddUserUnitDto) { + try { + await this.unitService.addUserUnit(addUserUnitDto); + return { message: 'user unit added successfully' }; + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Get('user/:userUuid') + async getUnitsByUserId(@Param('userUuid') userUuid: string) { + try { + return await this.unitService.getUnitsByUserId(userUuid); + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } @ApiBearerAuth() @UseGuards(JwtAuthGuard) diff --git a/src/unit/dtos/add.unit.dto.ts b/src/unit/dtos/add.unit.dto.ts index 40f164a..e42d1bb 100644 --- a/src/unit/dtos/add.unit.dto.ts +++ b/src/unit/dtos/add.unit.dto.ts @@ -21,3 +21,22 @@ export class AddUnitDto { Object.assign(this, dto); } } +export class AddUserUnitDto { + @ApiProperty({ + description: 'unitUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public unitUuid: string; + @ApiProperty({ + description: 'userUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public userUuid: string; + constructor(dto: Partial) { + Object.assign(this, dto); + } +} diff --git a/src/unit/dtos/get.unit.dto.ts b/src/unit/dtos/get.unit.dto.ts index b96147b..82837aa 100644 --- a/src/unit/dtos/get.unit.dto.ts +++ b/src/unit/dtos/get.unit.dto.ts @@ -49,3 +49,12 @@ export class GetUnitChildDto { }) public includeSubSpaces: boolean = false; } +export class GetUnitByUserIdDto { + @ApiProperty({ + description: 'userUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public userUuid: string; +} diff --git a/src/unit/interface/unit.interface.ts b/src/unit/interface/unit.interface.ts index 8502a86..39fac9a 100644 --- a/src/unit/interface/unit.interface.ts +++ b/src/unit/interface/unit.interface.ts @@ -24,3 +24,8 @@ export interface RenameUnitByUuidInterface { name: string; type: string; } +export interface GetUnitByUserUuidInterface { + uuid: string; + name: string; + type: string; +} diff --git a/src/unit/services/unit.service.ts b/src/unit/services/unit.service.ts index e84bc0f..867300c 100644 --- a/src/unit/services/unit.service.ts +++ b/src/unit/services/unit.service.ts @@ -7,21 +7,24 @@ import { BadRequestException, } from '@nestjs/common'; import { SpaceRepository } from '@app/common/modules/space/repositories'; -import { AddUnitDto } from '../dtos'; +import { AddUnitDto, AddUserUnitDto } from '../dtos'; import { UnitChildInterface, UnitParentInterface, GetUnitByUuidInterface, RenameUnitByUuidInterface, + GetUnitByUserUuidInterface, } 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'; @Injectable() export class UnitService { constructor( private readonly spaceRepository: SpaceRepository, private readonly spaceTypeRepository: SpaceTypeRepository, + private readonly userSpaceRepository: UserSpaceRepository, ) {} async addUnit(addUnitDto: AddUnitDto) { @@ -195,7 +198,56 @@ export class UnitService { } } } + async getUnitsByUserId( + userUuid: string, + ): Promise { + try { + const units = await this.userSpaceRepository.find({ + relations: ['space', 'space.spaceType'], + where: { + user: { uuid: userUuid }, + space: { spaceType: { type: 'unit' } }, + }, + }); + if (units.length === 0) { + throw new HttpException('this user has no units', HttpStatus.NOT_FOUND); + } + const spaces = units.map((unit) => ({ + uuid: unit.space.uuid, + name: unit.space.spaceName, + type: unit.space.spaceType.type, + })); + + return spaces; + } catch (err) { + if (err instanceof HttpException) { + throw err; + } else { + throw new HttpException('user not found', HttpStatus.NOT_FOUND); + } + } + } + + async addUserUnit(addUserUnitDto: AddUserUnitDto) { + try { + await this.userSpaceRepository.save({ + user: { uuid: addUserUnitDto.userUuid }, + space: { uuid: addUserUnitDto.unitUuid }, + }); + } catch (err) { + if (err.code === '23505') { + throw new HttpException( + 'User already belongs to this unit', + HttpStatus.BAD_REQUEST, + ); + } + throw new HttpException( + err.message || 'Internal Server Error', + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } async renameUnitByUuid( unitUuid: string, updateUnitNameDto: UpdateUnitNameDto, diff --git a/src/unit/unit.module.ts b/src/unit/unit.module.ts index eaf571f..569ef39 100644 --- a/src/unit/unit.module.ts +++ b/src/unit/unit.module.ts @@ -6,11 +6,27 @@ import { SpaceRepositoryModule } from '@app/common/modules/space/space.repositor 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 { UserRepositoryModule } from '@app/common/modules/user/user.repository.module'; +import { UserRepository } from '@app/common/modules/user/repositories'; @Module({ - imports: [ConfigModule, SpaceRepositoryModule, SpaceTypeRepositoryModule], + imports: [ + ConfigModule, + SpaceRepositoryModule, + SpaceTypeRepositoryModule, + UserSpaceRepositoryModule, + UserRepositoryModule, + ], controllers: [UnitController], - providers: [UnitService, SpaceRepository, SpaceTypeRepository], + providers: [ + UnitService, + SpaceRepository, + SpaceTypeRepository, + UserSpaceRepository, + UserRepository, + ], exports: [UnitService], }) export class UnitModule {} diff --git a/src/user-device-permission/controllers/index.ts b/src/user-device-permission/controllers/index.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/user-device-permission/controllers/user-device-permission.controller.ts b/src/user-device-permission/controllers/user-device-permission.controller.ts new file mode 100644 index 0000000..91d944c --- /dev/null +++ b/src/user-device-permission/controllers/user-device-permission.controller.ts @@ -0,0 +1,87 @@ +import { + Body, + Controller, + Get, + HttpStatus, + Param, + Post, + Put, + UseGuards, +} from '@nestjs/common'; +import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; +import { UserDevicePermissionService } from '../services/user-device-permission.service'; +import { UserDevicePermissionAddDto } from '../dtos/user-device-permission.add.dto'; +import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; +import { UserDevicePermissionEditDto } from '../dtos/user-device-permission.edit.dto'; + +@ApiTags('Device Permission Module') +@Controller({ + version: '1', + path: 'device-permission', +}) +export class UserDevicePermissionController { + constructor( + private readonly userDevicePermissionService: UserDevicePermissionService, + ) {} + + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Post('add') + async addDevicePermission( + @Body() userDevicePermissionDto: UserDevicePermissionAddDto, + ) { + try { + const addDetails = + await this.userDevicePermissionService.addUserPermission( + userDevicePermissionDto, + ); + return { + statusCode: HttpStatus.CREATED, + message: 'User Permission for Devices Added Successfully', + data: addDetails, + }; + } catch (err) { + throw new Error(err); + } + } + + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Put('edit/:userId') + async editDevicePermission( + @Param('userId') userId: string, + @Body() userDevicePermissionEditDto: UserDevicePermissionEditDto, + ) { + try { + await this.userDevicePermissionService.editUserPermission( + userId, + userDevicePermissionEditDto, + ); + return { + statusCode: HttpStatus.OK, + message: 'User Permission for Devices Updated Successfully', + data: {}, + }; + } catch (err) { + throw new Error(err); + } + } + + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Get('list') + async fetchDevicePermission() { + try { + const deviceDetails = + await this.userDevicePermissionService.fetchuserPermission(); + return { + statusCode: HttpStatus.OK, + message: 'Device Details fetched Successfully', + data: deviceDetails, + }; + } catch (err) { + throw new Error(err); + } + } + +} diff --git a/src/user-device-permission/dtos/index.ts b/src/user-device-permission/dtos/index.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/user-device-permission/dtos/user-device-permission.add.dto.ts b/src/user-device-permission/dtos/user-device-permission.add.dto.ts new file mode 100644 index 0000000..c7459df --- /dev/null +++ b/src/user-device-permission/dtos/user-device-permission.add.dto.ts @@ -0,0 +1,28 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsNotEmpty, IsString } from 'class-validator'; + +export class UserDevicePermissionAddDto { + @ApiProperty({ + description: 'user id', + required: true, + }) + @IsString() + @IsNotEmpty() + userId: string; + + @ApiProperty({ + description: 'permission type id', + required: true, + }) + @IsString() + @IsNotEmpty() + permissionTypeId: string; + + @ApiProperty({ + description: 'device id', + required: true, + }) + @IsString() + @IsNotEmpty() + deviceId: string; +} diff --git a/src/user-device-permission/dtos/user-device-permission.edit.dto.ts b/src/user-device-permission/dtos/user-device-permission.edit.dto.ts new file mode 100644 index 0000000..7cc4fce --- /dev/null +++ b/src/user-device-permission/dtos/user-device-permission.edit.dto.ts @@ -0,0 +1,7 @@ +import { OmitType } from '@nestjs/swagger'; +import { UserDevicePermissionAddDto } from './user-device-permission.add.dto'; + +export class UserDevicePermissionEditDto extends OmitType( + UserDevicePermissionAddDto, + ['userId'], +) {} diff --git a/src/user-device-permission/services/index.ts b/src/user-device-permission/services/index.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/user-device-permission/services/user-device-permission.service.ts b/src/user-device-permission/services/user-device-permission.service.ts new file mode 100644 index 0000000..e50d59f --- /dev/null +++ b/src/user-device-permission/services/user-device-permission.service.ts @@ -0,0 +1,36 @@ +import { DeviceUserTypeRepository } from '@app/common/modules/device/repositories'; +import { Injectable } from '@nestjs/common'; +import { UserDevicePermissionAddDto } from '../dtos/user-device-permission.add.dto'; +import { UserDevicePermissionEditDto } from '../dtos/user-device-permission.edit.dto'; + +@Injectable() +export class UserDevicePermissionService { + constructor( + private readonly deviceUserTypeRepository: DeviceUserTypeRepository, + ) {} + + async addUserPermission(userDevicePermissionDto: UserDevicePermissionAddDto) { + return await this.deviceUserTypeRepository.save({ + userUuid: userDevicePermissionDto.userId, + deviceUuid: userDevicePermissionDto.deviceId, + permissionTypeUuid: userDevicePermissionDto.permissionTypeId, + }); + } + + async editUserPermission( + userId: string, + userDevicePermissionEditDto: UserDevicePermissionEditDto, + ) { + return await this.deviceUserTypeRepository.update( + { userUuid: userId }, + { + deviceUuid: userDevicePermissionEditDto.deviceId, + permissionTypeUuid: userDevicePermissionEditDto.permissionTypeId, + }, + ); + } + + async fetchuserPermission() { + return await this.deviceUserTypeRepository.find(); + } +} diff --git a/src/user-device-permission/user-device-permission.module.ts b/src/user-device-permission/user-device-permission.module.ts new file mode 100644 index 0000000..edd9991 --- /dev/null +++ b/src/user-device-permission/user-device-permission.module.ts @@ -0,0 +1,21 @@ +import { DeviceRepositoryModule } from '@app/common/modules/device'; +import { + DeviceRepository, + DeviceUserTypeRepository, +} from '@app/common/modules/device/repositories'; +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'; + +@Module({ + imports: [ConfigModule, DeviceRepositoryModule], + controllers: [UserDevicePermissionController], + providers: [ + DeviceUserTypeRepository, + DeviceRepository, + UserDevicePermissionService, + ], + exports: [UserDevicePermissionService], +}) +export class UserDevicePermissionModule {}