bchydro: Add additional columns

BC Hydro data exports now include energy inflow and outflows (among
other things). This commit adjusts the namedtuple that is used when
importing the data to take those new columns into account.

Note that after this change, the net consumption (e.g. inflows minus
outflows) is stored in the database.

bchydro/bchydro-db.py

@@ -33,8 +33,12 @@
     (
         "user",
         "accId",
+        "meterNum",
         "timestamp",
-        "usage",
+        "timeOfDayPeriod",
+        "inflow",
+        "outflow",
+        "netConsumption",
         "demand",
         "powerFactor",
         "estUsage",
@@ -89,11 +93,11 @@ def _saveHourlyUsageToDb(self) -> None:
         self.logger.info("Saving hourly data")
         for row in self.data:
             try:
-                usage = float(row.usage)
+                usage = float(row.netConsumption)
             except ValueError:
                 self.logger.error(
                     "Unable to convert usage to float, got %s, " "skipping %s",
-                    row.usage,
+                    row.netConsumption,
                     row.timestamp,
                 )
                 continue