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

add cur2 checks to schedule

Browse Source
This commit is contained in:
Mhd Zayd Skaff
2025-06-30 14:09:32 +03:00
parent 2b2772e4ca
commit 5bf44a18e1
1 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/schedule/services/schedule.service.ts
View File

@ -162,6 +162,16 @@ export class ScheduleService {
throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND); throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
} }
if (
deviceDetails.productDevice.prodType == ProductType.CUR_2 &&
addScheduleDto.category != 'Timer'
) {
throw new HttpException(
'Invalid category for CUR_2 devices',
HttpStatus.BAD_REQUEST,
);
}
// Corrected condition for supported device types // Corrected condition for supported device types
if ( if (
deviceDetails.productDevice.prodType !== ProductType.THREE_G && deviceDetails.productDevice.prodType !== ProductType.THREE_G &&
@ -182,6 +192,7 @@ export class ScheduleService {
await this.addScheduleDeviceInTuya( await this.addScheduleDeviceInTuya(
deviceDetails.deviceTuyaUuid, deviceDetails.deviceTuyaUuid,
addScheduleDto, addScheduleDto,
deviceDetails.productDevice.prodType as ProductType,
); );
} catch (error) { } catch (error) {
throw new HttpException( throw new HttpException(
@ -193,6 +204,7 @@ export class ScheduleService {
async addScheduleDeviceInTuya( async addScheduleDeviceInTuya(
deviceId: string, deviceId: string,
addScheduleDto: AddScheduleDto, addScheduleDto: AddScheduleDto,
deviceType: ProductType,
): Promise<addScheduleDeviceInterface> { ): Promise<addScheduleDeviceInterface> {
try { try {
const convertedTime = convertTimestampToDubaiTime(addScheduleDto.time); const convertedTime = convertTimestampToDubaiTime(addScheduleDto.time);
@ -212,7 +224,10 @@ export class ScheduleService {
value: addScheduleDto.function.value, value: addScheduleDto.function.value,
}, },
], ],
category: `category_${addScheduleDto.category}`, category:
deviceType == ProductType.CUR_2
? addScheduleDto.category
: `category_${addScheduleDto.category}`,
}, },
}); });
@ -254,7 +269,10 @@ export class ScheduleService {
); );
const result = schedules.result.map((schedule: any) => { const result = schedules.result.map((schedule: any) => {
return { return {
category: schedule.category.replace('category_', ''), category:
deviceDetails.productDevice.prodType == ProductType.CUR_2
? schedule.category
: schedule.category.replace('category_', ''),
enable: schedule.enable, enable: schedule.enable,
function: { function: {
code: schedule.functions[0].code, code: schedule.functions[0].code,
@ -318,6 +336,16 @@ export class ScheduleService {
throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND); throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
} }
if (
deviceDetails.productDevice.prodType == ProductType.CUR_2 &&
updateScheduleDto.category != 'Timer'
) {
throw new HttpException(
'Invalid category for CUR_2 devices',
HttpStatus.BAD_REQUEST,
);
}
// Corrected condition for supported device types // Corrected condition for supported device types
if ( if (
deviceDetails.productDevice.prodType !== ProductType.THREE_G && deviceDetails.productDevice.prodType !== ProductType.THREE_G &&
@ -338,6 +366,7 @@ export class ScheduleService {
await this.updateScheduleDeviceInTuya( await this.updateScheduleDeviceInTuya(
deviceDetails.deviceTuyaUuid, deviceDetails.deviceTuyaUuid,
updateScheduleDto, updateScheduleDto,
deviceDetails.productDevice.prodType as ProductType,
); );
} catch (error) { } catch (error) {
throw new HttpException( throw new HttpException(
@ -349,6 +378,7 @@ export class ScheduleService {
async updateScheduleDeviceInTuya( async updateScheduleDeviceInTuya(
deviceId: string, deviceId: string,
updateScheduleDto: UpdateScheduleDto, updateScheduleDto: UpdateScheduleDto,
deviceType: ProductType,
): Promise<addScheduleDeviceInterface> { ): Promise<addScheduleDeviceInterface> {
try { try {
const convertedTime = convertTimestampToDubaiTime(updateScheduleDto.time); const convertedTime = convertTimestampToDubaiTime(updateScheduleDto.time);
@ -369,7 +399,10 @@ export class ScheduleService {
value: updateScheduleDto.function.value, value: updateScheduleDto.function.value,
}, },
], ],
category: `category_${updateScheduleDto.category}`, category:
deviceType == ProductType.CUR_2
? updateScheduleDto.category
: `category_${updateScheduleDto.category.replace('category_', '')}`,
}, },
}); });