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

ensure Timer is the category value for CUR2 type (#446)

Browse Source
This commit is contained in:
ZaydSkaff
2025-06-30 15:35:23 +03:00
committed by GitHub
parent 5d4e5ca87e
commit b3f8b92826
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

@ -96,6 +96,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,
);
}
this.ensureProductTypeSupportedForSchedule( this.ensureProductTypeSupportedForSchedule(
deviceDetails.productDevice.prodType as ProductType, deviceDetails.productDevice.prodType as ProductType,
); );
@ -103,6 +113,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(
@ -128,7 +139,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,
@ -159,6 +173,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
this.ensureProductTypeSupportedForSchedule( this.ensureProductTypeSupportedForSchedule(
deviceDetails.productDevice.prodType as ProductType, deviceDetails.productDevice.prodType as ProductType,
@ -167,6 +191,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(
@ -192,6 +217,7 @@ export class ScheduleService {
private async addScheduleDeviceInTuya( private 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);
@ -210,7 +236,10 @@ export class ScheduleService {
...addScheduleDto.function, ...addScheduleDto.function,
}, },
], ],
category: `category_${addScheduleDto.category}`, category:
deviceType == ProductType.CUR_2
? addScheduleDto.category
: `category_${addScheduleDto.category}`,
}, },
}); });
@ -248,6 +277,7 @@ export class ScheduleService {
private async updateScheduleDeviceInTuya( private 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);
@ -268,7 +298,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}`,
}, },
}); });