resolve conflicts

2025-11-27 17:04:55 +00:00 · 2024-10-08 10:59:31 +03:00
parent 9a868c5757 972e1423f5
commit 11759d8112
53 changed files with 1009 additions and 1535 deletions
--- a/libs/common/src/firebase/devices-status/services/devices-status.service.ts
+++ b/libs/common/src/firebase/devices-status/services/devices-status.service.ts
@ -85,6 +85,7 @@ export class DeviceStatusFirebaseService {
    return await this.deviceRepository.findOne({
      where: {
        deviceTuyaUuid,
+        isActive: true,
      },
      relations: ['productDevice'],
    });
@ -139,6 +140,7 @@ export class DeviceStatusFirebaseService {
    return await this.deviceRepository.findOne({
      where: {
        uuid: deviceUuid,
+        isActive: true,
      },
      ...(withProductDevice && { relations: ['productDevice'] }),
    });