ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-11-27 13:54:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed guards

Browse Source
This commit is contained in:
hannathkadher
2024-10-30 22:47:03 +04:00
parent 1f0cedfd09
commit b0ea7cdc25
5 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,6 @@ import {
BatchFactoryResetDevicesDto,
} from '../dtos/control.device.dto';
import { CheckRoomGuard } from 'src/guards/room.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';
@ -80,7 +78,7 @@ export class DeviceController {
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckUserHavePermission)
@UseGuards(JwtAuthGuard)
@Get(':deviceUuid')
async getDeviceDetailsByDeviceId(
@Param('deviceUuid') deviceUuid: string,
@ -93,7 +91,7 @@ export class DeviceController {
);
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckUserHavePermission)
@UseGuards(JwtAuthGuard)
@Get(':deviceUuid/functions')
async getDeviceInstructionByDeviceId(
@Param('deviceUuid') deviceUuid: string,
@ -101,14 +99,14 @@ export class DeviceController {
return await this.deviceService.getDeviceInstructionByDeviceId(deviceUuid);
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckUserHavePermission)
@UseGuards(JwtAuthGuard)
@Get(':deviceUuid/functions/status')
async getDevicesInstructionStatus(@Param('deviceUuid') deviceUuid: string) {
return await this.deviceService.getDevicesInstructionStatus(deviceUuid);
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, CheckUserHaveControllablePermission)
@UseGuards(JwtAuthGuard)
@Post(':deviceUuid/control')
async controlDevice(
@Body() controlDeviceDto: ControlDeviceDto,

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

@ -569,13 +569,12 @@ export class DeviceService {
async getDeviceInstructionByDeviceId(
deviceUuid: string,
): Promise<DeviceInstructionResponse> {
const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
if (!deviceDetails) {
throw new NotFoundException('Device Not Found');
}
try {
const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
if (!deviceDetails) {
throw new NotFoundException('Device Not Found');
}
const response = await this.getDeviceInstructionByDeviceIdTuya(
deviceDetails.deviceTuyaUuid,
);
@ -614,12 +613,12 @@ export class DeviceService {
}
}
async getDevicesInstructionStatus(deviceUuid: string) {
try {
const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
if (!deviceDetails) {
throw new NotFoundException('Device Not Found');
}
if (!deviceDetails) {
throw new NotFoundException('Device Not Found');
}
try {
const deviceStatus = await this.getDevicesInstructionStatusTuya(
deviceDetails.deviceTuyaUuid,
);
@ -630,6 +629,7 @@ export class DeviceService {
status: deviceStatus.result[0].status,
};
} catch (error) {
console.log(error);
throw new HttpException(
'Error fetching device functions status',
HttpStatus.INTERNAL_SERVER_ERROR,
@ -887,7 +887,6 @@ export class DeviceService {
const spaceHierarchy = await this.getFullSpaceHierarchy(
device?.spaceDevice,
);
console.log(device.spaceDevice.community);
const orderedHierarchy = spaceHierarchy.reverse();
return {
@ -986,7 +985,6 @@ export class DeviceService {
space: SpaceEntity,
): Promise<{ uuid: string; spaceName: string }[]> {
try {
console.log('Fetching hierarchy for space:', space.uuid);
// Fetch only the relevant spaces, starting with the target space
const targetSpace = await this.spaceRepository.findOne({