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

Add SuperAdminRoleGuard to DeviceController and include haveRoom property in devicesData

Browse Source
This commit is contained in:
faris Aljohari
2024-05-30 15:01:49 +03:00
parent aacf842659
commit 1e29a59fa3
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/device/controllers/device.controller.ts
View File

@ -29,6 +29,7 @@ import { CheckUserHavePermission } from 'src/guards/user.device.permission.guard
import { CheckUserHaveControllablePermission } from 'src/guards/user.device.controllable.permission.guard'; import { CheckUserHaveControllablePermission } from 'src/guards/user.device.controllable.permission.guard';
import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
import { CheckDeviceGuard } from 'src/guards/device.guard'; import { CheckDeviceGuard } from 'src/guards/device.guard';
import { SuperAdminRoleGuard } from 'src/guards/super.admin.role.guard';
@ApiTags('Device Module') @ApiTags('Device Module')
@Controller({ @Controller({
@ -38,7 +39,7 @@ import { CheckDeviceGuard } from 'src/guards/device.guard';
export class DeviceController { export class DeviceController {
constructor(private readonly deviceService: DeviceService) {} constructor(private readonly deviceService: DeviceService) {}
@ApiBearerAuth() @ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckDeviceGuard) @UseGuards(SuperAdminRoleGuard, CheckDeviceGuard)
@Post() @Post()
async addDeviceUser(@Body() addDeviceDto: AddDeviceDto) { async addDeviceUser(@Body() addDeviceDto: AddDeviceDto) {
try { try {

14
src/device/services/device.service.ts
View File

@ -103,13 +103,14 @@ export class DeviceService {
const devicesData = await Promise.all( const devicesData = await Promise.all(
devices.map(async (device) => { devices.map(async (device) => {
return { return {
...(await this.getDeviceDetailsByDeviceIdTuya(
device.deviceTuyaUuid,
)),
uuid: device.uuid, uuid: device.uuid,
haveRoom: device.spaceDevice ? true : false,
productUuid: device.productDevice.uuid, productUuid: device.productDevice.uuid,
productType: device.productDevice.prodType, productType: device.productDevice.prodType,
permissionType: device.permission[0].permissionType.type, permissionType: device.permission[0].permissionType.type,
...(await this.getDeviceDetailsByDeviceIdTuya(
device.deviceTuyaUuid,
)),
} as GetDeviceDetailsInterface; } as GetDeviceDetailsInterface;
}), }),
); );
@ -148,13 +149,14 @@ export class DeviceService {
const devicesData = await Promise.all( const devicesData = await Promise.all(
devices.map(async (device) => { devices.map(async (device) => {
return { return {
...(await this.getDeviceDetailsByDeviceIdTuya(
device.deviceTuyaUuid,
)),
uuid: device.uuid, uuid: device.uuid,
haveRoom: device.spaceDevice ? true : false,
productUuid: device.productDevice.uuid, productUuid: device.productDevice.uuid,
productType: device.productDevice.prodType, productType: device.productDevice.prodType,
permissionType: device.permission[0].permissionType.type, permissionType: device.permission[0].permissionType.type,
...(await this.getDeviceDetailsByDeviceIdTuya(
device.deviceTuyaUuid,
)),
} as GetDeviceDetailsInterface; } as GetDeviceDetailsInterface;
}), }),
); );