fix: Thermostat will have multiple states not multiple traits

Yonomi · Jan 20, 2022 · 36b323b · 36b323b
1 parent 5bfa5e3
commit 36b323b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/lib/providers/thermostat_provider.dart b/lib/providers/thermostat_provider.dart
@@ -25,12 +25,6 @@ class ThermostatProvider extends DeviceProvider {
         as ThermostatTrait?;
   }
 
-  List<ThermostatTrait> getThermostatTraits() {
-    return deviceDetail?.traits
-            .whereType<ThermostatTrait>()
-            .toList(growable: false) ??
-        <ThermostatTrait>[];
-  }
   Future<void> setPointAction(String deviceId, double temperature,
       {SetPointActionFunction setPoint =
           ThermostatRepository.setPointThermostat}) async {
@@ -46,11 +40,7 @@ class ThermostatProvider extends DeviceProvider {
         () => setMode(_request, deviceId, mode));
   }
 
-  double get targetTemperature => getThermostatTraits()
-      .firstWhere((trait) => trait.state is TargetTemperature,
-          orElse: () => ThermostatTrait(TargetTemperature(0.0)))
-      .state
-      .value;
+  double get targetTemperature => (getThermostatTrait()?.state as TargetTemperature).value ?? 0.0;
 
   @override
   String get displayName => deviceDetail?.displayName ?? _DEFAULT_DISPLAY_NAME;

diff --git a/test/providers/thermostat_provider_test.dart b/test/providers/thermostat_provider_test.dart
@@ -84,24 +84,6 @@ void main() {
         .called(2);
   });
 
-  test(
-      'Calling getThermostatTraits without traits on device returns empty list',
-      () async {
-    Request request = Request('', {});
-    final mockGetThermostatDetailsFunction = MockGetThermostatDetails();
-
-    when(mockGetThermostatDetailsFunction.call(any, any))
-        .thenAnswer((_) async => Future.value(_getDevice()));
-
-    ThermostatProvider thermostatProvider = ThermostatProvider(
-        request, 'deviceId',
-        getDetails: mockGetThermostatDetailsFunction);
-    expect(
-        thermostatProvider.getThermostatTraits(), equals(<ThermostatTrait>[]));
-
-    expect(thermostatProvider.targetTemperature, equals(0.0));
-  });
-
   test('Device data is set using DeviceRepository\'s return values', () async {
     Request request = Request('', {});