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

Merge pull request #117 from SyncrowIOT/fix-getall-devices-issue

Browse Source 
resolve battery issue
This commit is contained in:
faris Aljohari
2024-10-08 15:19:08 -05:00
committed by GitHub
parent 1ae9e1e932 8e4f98957b
commit a157444897
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ import { SpaceRepository } from '@app/common/modules/space/repositories';
import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service'; import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
import { DeviceStatuses } from '@app/common/constants/device-status.enum'; import { DeviceStatuses } from '@app/common/constants/device-status.enum';
import { CommonErrorCodes } from '@app/common/constants/error-codes.enum'; import { CommonErrorCodes } from '@app/common/constants/error-codes.enum';
import { BatteryStatus } from '@app/common/constants/battery-status.enum';
@Injectable() @Injectable()
export class DeviceService { export class DeviceService {
@ -64,7 +65,6 @@ export class DeviceService {
return await this.deviceRepository.findOne({ return await this.deviceRepository.findOne({
where: { where: {
uuid: deviceUuid, uuid: deviceUuid,
isActive: true,
}, },
...(withProductDevice && { relations: ['productDevice'] }), ...(withProductDevice && { relations: ['productDevice'] }),
}); });
@ -73,7 +73,6 @@ export class DeviceService {
return await this.deviceRepository.findOne({ return await this.deviceRepository.findOne({
where: { where: {
deviceTuyaUuid, deviceTuyaUuid,
isActive: true,
}, },
relations: ['productDevice'], relations: ['productDevice'],
}); });
@ -227,7 +226,6 @@ export class DeviceService {
const device = await this.deviceRepository.findOne({ const device = await this.deviceRepository.findOne({
where: { where: {
uuid: updateDeviceInRoomDto.deviceUuid, uuid: updateDeviceInRoomDto.deviceUuid,
isActive: true,
}, },
relations: ['spaceDevice', 'spaceDevice.parent'], relations: ['spaceDevice', 'spaceDevice.parent'],
}); });
@ -655,7 +653,6 @@ export class DeviceService {
const device = await this.deviceRepository.findOne({ const device = await this.deviceRepository.findOne({
where: { where: {
uuid: deviceUuid, uuid: deviceUuid,
isActive: true,
permission: { permission: {
userUuid: userUuid, userUuid: userUuid,
}, },
@ -843,7 +840,7 @@ export class DeviceService {
const batteryStatus: any = doorLockInstructionsStatus.status.find( const batteryStatus: any = doorLockInstructionsStatus.status.find(
(status: any) => (status: any) =>
status.code === batteryStatus.RESIDUAL_ELECTRICITY, status.code === BatteryStatus.RESIDUAL_ELECTRICITY,
); );
if (batteryStatus) { if (batteryStatus) {
@ -856,7 +853,7 @@ export class DeviceService {
await this.getDevicesInstructionStatus(device.uuid); await this.getDevicesInstructionStatus(device.uuid);
const batteryStatus: any = doorSensorInstructionsStatus.status.find( const batteryStatus: any = doorSensorInstructionsStatus.status.find(
(status: any) => status.code === batteryStatus.BATTERY_PERCENTAGE, (status: any) => status.code === BatteryStatus.BATTERY_PERCENTAGE,
); );
if (batteryStatus) { if (batteryStatus) {
@ -869,7 +866,7 @@ export class DeviceService {
await this.getDevicesInstructionStatus(device.uuid); await this.getDevicesInstructionStatus(device.uuid);
const batteryStatus: any = doorSensorInstructionsStatus.status.find( const batteryStatus: any = doorSensorInstructionsStatus.status.find(
(status: any) => status.code === batteryStatus.BATTERY_PERCENTAGE, (status: any) => status.code === BatteryStatus.BATTERY_PERCENTAGE,
); );
if (batteryStatus) { if (batteryStatus) {