[fix] TariffMapper: fix to properly map day-night and three-rate tariffs

ryanw-mobile · Nov 21, 2024 · 417a89e · 417a89e
1 parent 50814b9
commit 417a89e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/composeApp/src/commonMain/kotlin/com/rwmobi/kunigami/data/repository/mapper/TariffMapper.kt b/composeApp/src/commonMain/kotlin/com/rwmobi/kunigami/data/repository/mapper/TariffMapper.kt
@@ -25,7 +25,11 @@ fun SingleEnergyProductQuery.EnergyProduct.toTariff(
     tariffCode: String,
 ): Tariff? {
     val tariffNode = tariffs?.edges
-        ?.firstOrNull { it?.node?.onStandardTariff?.tariffCode == tariffCode }
+        ?.firstOrNull {
+            it?.node?.onStandardTariff?.tariffCode == tariffCode ||
+                it?.node?.onDayNightTariff?.tariffCode == tariffCode ||
+                it?.node?.onThreeRateTariff?.tariffCode == tariffCode
+        }
         ?.node
 
     if (tariffNode == null) {