ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2026-10-25 15:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into SP-197-be-retrieve-devices-in-the-gateway

Browse Source
This commit is contained in:
faris Aljohari
2024-06-11 12:03:30 +03:00
parent cc006ff3c0 21cca2e373
commit 4c729da2a6
85 changed files with 2151 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/device/controllers/device.controller.ts
+46 -47
View File
@@ -10,22 +10,18 @@ import {
HttpStatus,
UseGuards,
Req,
Put,
} from '@nestjs/common';
import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
import {
AddDeviceInGroupDto,
AddDeviceInRoomDto,
} from '../dtos/add.device.dto';
import {
GetDeviceByGroupIdDto,
GetDeviceByRoomUuidDto,
} from '../dtos/get.device.dto';
import { AddDeviceDto, UpdateDeviceInRoomDto } from '../dtos/add.device.dto';
import { GetDeviceByRoomUuidDto } from '../dtos/get.device.dto';
import { ControlDeviceDto } from '../dtos/control.device.dto';
import { CheckRoomGuard } from 'src/guards/room.guard';
import { CheckGroupGuard } from 'src/guards/group.guard';
import { CheckUserHavePermission } from 'src/guards/user.device.permission.guard';
import { CheckUserHaveControllablePermission } from 'src/guards/user.device.controllable.permission.guard';
import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
import { CheckDeviceGuard } from 'src/guards/device.guard';
import { SuperAdminRoleGuard } from 'src/guards/super.admin.role.guard';
@ApiTags('Device Module')
@Controller({
@@ -34,7 +30,39 @@ import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
})
export class DeviceController {
constructor(private readonly deviceService: DeviceService) {}
@ApiBearerAuth()
@UseGuards(SuperAdminRoleGuard, CheckDeviceGuard)
@Post()
async addDeviceUser(@Body() addDeviceDto: AddDeviceDto) {
try {
const device = await this.deviceService.addDeviceUser(addDeviceDto);
return {
statusCode: HttpStatus.CREATED,
success: true,
message: 'device added successfully',
data: device,
};
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@Get('user/:userUuid')
async getDevicesByUser(@Param('userUuid') userUuid: string) {
try {
return await this.deviceService.getDevicesByUser(userUuid);
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckRoomGuard)
@Get('room')
@@ -58,16 +86,19 @@ export class DeviceController {
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckRoomGuard)
@Post('room')
async addDeviceInRoom(@Body() addDeviceInRoomDto: AddDeviceInRoomDto) {
@Put('room')
async updateDeviceInRoom(
@Body() updateDeviceInRoomDto: UpdateDeviceInRoomDto,
) {
try {
const device =
await this.deviceService.addDeviceInRoom(addDeviceInRoomDto);
const device = await this.deviceService.updateDeviceInRoom(
updateDeviceInRoomDto,
);
return {
statusCode: HttpStatus.CREATED,
success: true,
message: 'device added in room successfully',
message: 'device updated in room successfully',
data: device,
};
} catch (error) {
@@ -77,39 +108,7 @@ export class DeviceController {
);
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckGroupGuard)
@Get('group')
async getDevicesByGroupId(
@Query() getDeviceByGroupIdDto: GetDeviceByGroupIdDto,
@Req() req: any,
) {
try {
const userUuid = req.user.uuid;
return await this.deviceService.getDevicesByGroupId(
getDeviceByGroupIdDto,
userUuid,
);
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckGroupGuard)
@Post('group')
async addDeviceInGroup(@Body() addDeviceInGroupDto: AddDeviceInGroupDto) {
try {
return await this.deviceService.addDeviceInGroup(addDeviceInGroupDto);
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckUserHavePermission)
@Get(':deviceUuid')
src/device/device.module.ts
+1 -11
View File
@@ -8,18 +8,10 @@ import { DeviceRepositoryModule } from '@app/common/modules/device';
import { DeviceRepository } from '@app/common/modules/device/repositories';
import { PermissionTypeRepository } from '@app/common/modules/permission/repositories';
import { SpaceRepository } from '@app/common/modules/space/repositories';
import { GroupDeviceRepository } from '@app/common/modules/group-device/repositories';
import { GroupRepository } from '@app/common/modules/group/repositories';
import { GroupRepositoryModule } from '@app/common/modules/group/group.repository.module';
import { DeviceUserPermissionRepository } from '@app/common/modules/device-user-permission/repositories';
import { UserRepository } from '@app/common/modules/user/repositories';
@Module({
imports: [
ConfigModule,
ProductRepositoryModule,
DeviceRepositoryModule,
GroupRepositoryModule,
],
imports: [ConfigModule, ProductRepositoryModule, DeviceRepositoryModule],
controllers: [DeviceController],
providers: [
DeviceService,
@@ -28,8 +20,6 @@ import { UserRepository } from '@app/common/modules/user/repositories';
PermissionTypeRepository,
SpaceRepository,
DeviceRepository,
GroupDeviceRepository,
GroupRepository,
UserRepository,
],
exports: [DeviceService],
src/device/dtos/add.device.dto.ts
+6 -6
View File
@@ -1,7 +1,7 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsString } from 'class-validator';
export class AddDeviceInRoomDto {
export class AddDeviceDto {
@ApiProperty({
description: 'deviceTuyaUuid',
required: true,
@@ -11,14 +11,14 @@ export class AddDeviceInRoomDto {
public deviceTuyaUuid: string;
@ApiProperty({
description: 'roomUuid',
description: 'userUuid',
required: true,
})
@IsString()
@IsNotEmpty()
public roomUuid: string;
public userUuid: string;
}
export class AddDeviceInGroupDto {
export class UpdateDeviceInRoomDto {
@ApiProperty({
description: 'deviceUuid',
required: true,
@@ -28,10 +28,10 @@ export class AddDeviceInGroupDto {
public deviceUuid: string;
@ApiProperty({
description: 'groupUuid',
description: 'roomUuid',
required: true,
})
@IsString()
@IsNotEmpty()
public groupUuid: string;
public roomUuid: string;
}
src/device/dtos/get.device.dto.ts
-9
View File
@@ -10,12 +10,3 @@ export class GetDeviceByRoomUuidDto {
@IsNotEmpty()
public roomUuid: string;
}
export class GetDeviceByGroupIdDto {
@ApiProperty({
description: 'groupUuid',
required: true,
})
@IsString()
@IsNotEmpty()
public groupUuid: string;
}
src/device/services/device.service.ts
+98 -102
View File
@@ -8,10 +8,7 @@ import {
} from '@nestjs/common';
import { TuyaContext } from '@tuya/tuya-connector-nodejs';
import { ConfigService } from '@nestjs/config';
import {
AddDeviceInGroupDto,
AddDeviceInRoomDto,
} from '../dtos/add.device.dto';
import { AddDeviceDto, UpdateDeviceInRoomDto } from '../dtos/add.device.dto';
import {
DeviceInstructionResponse,
GetDeviceDetailsFunctionsInterface,
@@ -20,14 +17,10 @@ import {
controlDeviceInterface,
updateDeviceFirmwareInterface,
} from '../interfaces/get.device.interface';
import {
GetDeviceByGroupIdDto,
GetDeviceByRoomUuidDto,
} from '../dtos/get.device.dto';
import { GetDeviceByRoomUuidDto } from '../dtos/get.device.dto';
import { ControlDeviceDto } from '../dtos/control.device.dto';
import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
import { DeviceRepository } from '@app/common/modules/device/repositories';
import { GroupDeviceRepository } from '@app/common/modules/group-device/repositories';
import { PermissionType } from '@app/common/constants/permission-type.enum';
import { In } from 'typeorm';
import { ProductType } from '@app/common/constants/product-type.enum';
@@ -38,7 +31,6 @@ export class DeviceService {
constructor(
private readonly configService: ConfigService,
private readonly deviceRepository: DeviceRepository,
private readonly groupDeviceRepository: GroupDeviceRepository,
private readonly productRepository: ProductRepository,
) {
const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY');
@@ -60,6 +52,82 @@ export class DeviceService {
...(withProductDevice && { relations: ['productDevice'] }),
});
}
async addDeviceUser(addDeviceDto: AddDeviceDto) {
try {
const device = await this.getDeviceDetailsByDeviceIdTuya(
addDeviceDto.deviceTuyaUuid,
);
if (!device.productUuid) {
throw new Error('Product UUID is missing for the device.');
}
return await this.deviceRepository.save({
deviceTuyaUuid: addDeviceDto.deviceTuyaUuid,
productDevice: { uuid: device.productUuid },
user: {
uuid: addDeviceDto.userUuid,
},
});
} catch (error) {
if (error.code === '23505') {
throw new HttpException(
'Device already exists',
HttpStatus.BAD_REQUEST,
);
} else {
throw new HttpException(
error.message || 'Failed to add device in room',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
async getDevicesByUser(
userUuid: string,
): Promise<GetDeviceDetailsInterface[]> {
try {
const devices = await this.deviceRepository.find({
where: {
user: { uuid: userUuid },
permission: {
userUuid,
permissionType: {
type: In([PermissionType.READ, PermissionType.CONTROLLABLE]),
},
},
},
relations: [
'spaceDevice',
'productDevice',
'permission',
'permission.permissionType',
],
});
const devicesData = await Promise.all(
devices.map(async (device) => {
return {
haveRoom: device.spaceDevice ? true : false,
productUuid: device.productDevice.uuid,
productType: device.productDevice.prodType,
permissionType: device.permission[0].permissionType.type,
...(await this.getDeviceDetailsByDeviceIdTuya(
device.deviceTuyaUuid,
)),
uuid: device.uuid,
} as GetDeviceDetailsInterface;
}),
);
return devicesData;
} catch (error) {
// Handle the error here
throw new HttpException(
'User does not have any devices',
HttpStatus.NOT_FOUND,
);
}
}
async getDevicesByRoomId(
getDeviceByRoomUuidDto: GetDeviceByRoomUuidDto,
userUuid: string,
@@ -85,13 +153,14 @@ export class DeviceService {
const devicesData = await Promise.all(
devices.map(async (device) => {
return {
haveRoom: device.spaceDevice ? true : false,
productUuid: device.productDevice.uuid,
productType: device.productDevice.prodType,
permissionType: device.permission[0].permissionType.type,
...(await this.getDeviceDetailsByDeviceIdTuya(
device.deviceTuyaUuid,
)),
uuid: device.uuid,
productUuid: device.productDevice.uuid,
productType: device.productDevice.prodType,
permissionType: device.permission[0].permissionType.type,
} as GetDeviceDetailsInterface;
}),
);
@@ -105,104 +174,31 @@ export class DeviceService {
);
}
}
async getDevicesByGroupId(
getDeviceByGroupIdDto: GetDeviceByGroupIdDto,
userUuid: string,
) {
async updateDeviceInRoom(updateDeviceInRoomDto: UpdateDeviceInRoomDto) {
try {
const groupDevices = await this.groupDeviceRepository.find({
where: {
group: { uuid: getDeviceByGroupIdDto.groupUuid },
device: {
permission: {
userUuid,
permissionType: {
type: PermissionType.READ || PermissionType.CONTROLLABLE,
},
},
},
await this.deviceRepository.update(
{ uuid: updateDeviceInRoomDto.deviceUuid },
{
spaceDevice: { uuid: updateDeviceInRoomDto.roomUuid },
},
relations: [
'device',
'device.productDevice',
'device.permission',
'device.permission.permissionType',
],
});
const devicesData = await Promise.all(
groupDevices.map(async (device) => {
return {
...(await this.getDeviceDetailsByDeviceIdTuya(
device.device.deviceTuyaUuid,
)),
uuid: device.device.uuid,
productUuid: device.device.productDevice.uuid,
productType: device.device.productDevice.prodType,
permissionType: device.device.permission[0].permissionType.type,
} as GetDeviceDetailsInterface;
}),
);
return devicesData;
const device = await this.deviceRepository.findOne({
where: {
uuid: updateDeviceInRoomDto.deviceUuid,
},
relations: ['spaceDevice'],
});
return {
uuid: device.uuid,
roomUuid: device.spaceDevice.uuid,
};
} catch (error) {
throw new HttpException(
'Error fetching devices by group',
'Failed to add device in room',
HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
async addDeviceInRoom(addDeviceInRoomDto: AddDeviceInRoomDto) {
try {
const device = await this.getDeviceDetailsByDeviceIdTuya(
addDeviceInRoomDto.deviceTuyaUuid,
);
if (!device.productUuid) {
throw new Error('Product UUID is missing for the device.');
}
return await this.deviceRepository.save({
deviceTuyaUuid: addDeviceInRoomDto.deviceTuyaUuid,
spaceDevice: { uuid: addDeviceInRoomDto.roomUuid },
productDevice: { uuid: device.productUuid },
});
} catch (error) {
if (error.code === '23505') {
throw new HttpException(
'Device already exists in the room',
HttpStatus.BAD_REQUEST,
);
} else {
throw new HttpException(
'Failed to add device in room',
HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
async addDeviceInGroup(addDeviceInGroupDto: AddDeviceInGroupDto) {
try {
await this.groupDeviceRepository.save({
device: { uuid: addDeviceInGroupDto.deviceUuid },
group: { uuid: addDeviceInGroupDto.groupUuid },
});
return { message: 'device added in group successfully' };
} catch (error) {
if (error.code === '23505') {
throw new HttpException(
'Device already exists in the group',
HttpStatus.BAD_REQUEST,
);
} else {
throw new HttpException(
'Failed to add device in group',
HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
async controlDevice(controlDeviceDto: ControlDeviceDto, deviceUuid: string) {
try {