From 9df1acb7d07a9b56ee5db45011105e95de6dd4a2 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 11 Feb 2023 18:19:58 -0600
Subject: [PATCH] Combine energy and water api calls to reduce overhead

---
 src/data/energy.ts | 45 ++++++++++-----------------------------------
 1 file changed, 10 insertions(+), 35 deletions(-)

diff --git a/src/data/energy.ts b/src/data/energy.ts
index 1584d385c5..ceec264e8b 100644
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -405,30 +405,18 @@ const getEnergyData = async (
     volume: lengthUnit === "km" ? "L" : "gal",
   };
 
-  const stats = {
-    ...(energyStatIds.length
+  const stats =
+    energyStatIds.length || waterStatIds.length
       ? await fetchStatistics(
           hass!,
           startMinHour,
           end,
-          energyStatIds,
+          [...energyStatIds, ...waterStatIds],
           period,
-          energyUnits,
+          { ...energyUnits, ...waterUnits },
           ["sum"]
         )
-      : {}),
-    ...(waterStatIds.length
-      ? await fetchStatistics(
-          hass!,
-          startMinHour,
-          end,
-          waterStatIds,
-          period,
-          waterUnits,
-          ["sum"]
-        )
-      : {}),
-  };
+      : {};
 
   let statsCompare;
   let startCompare;
@@ -444,32 +432,19 @@ const getEnergyData = async (
     const compareStartMinHour = addHours(startCompare, -1);
     endCompare = addMilliseconds(start, -1);
 
-    statsCompare = {
-      ...(energyStatIds.length
+    statsCompare =
+      energyStatIds.length || waterStatIds.length
         ? await fetchStatistics(
             hass!,
             compareStartMinHour,
             endCompare,
-            energyStatIds,
+            [...energyStatIds, ...waterStatIds],
             period,
-            energyUnits,
+            { ...energyUnits, ...waterUnits },
             ["sum"]
           )
-        : {}),
-      ...(waterStatIds.length
-        ? await fetchStatistics(
-            hass!,
-            compareStartMinHour,
-            endCompare,
-            waterStatIds,
-            period,
-            waterUnits,
-            ["sum"]
-          )
-        : {}),
-    };
+        : {};
   }
-
   let fossilEnergyConsumption: FossilEnergyConsumption | undefined;
   let fossilEnergyConsumptionCompare: FossilEnergyConsumption | undefined;