Merge branch 'release/0.5.0'

.env.example

@@ -1,14 +1,16 @@
 ##### Timezone
 TZ=Europe/Berlin
 
+# Options
+POWER_SPLITTER_INTERVAL=3600
+
 ##### InfluxDB credentials
 INFLUX_HOST=localhost
 INFLUX_SCHEMA=http
 INFLUX_PORT=8086
 INFLUX_TOKEN=my-token # With permissions to read AND write to the bucket
 INFLUX_ORG=my-org
 INFLUX_BUCKET=my-bucket
-INFLUX_INTERVAL=3600
 
 #### Sensor mapping: Map to Measurement/Field in InfluxDB
 

.env.test

@@ -1,14 +1,16 @@
 # Timezone
 TZ=Europe/Berlin
 
+# Options
+POWER_SPLITTER_INTERVAL=300
+
 ##### InfluxDB credentials
 INFLUX_HOST=localhost
 INFLUX_SCHEMA=http
 INFLUX_PORT=8086
 INFLUX_TOKEN=my-token
 INFLUX_ORG=my-org
 INFLUX_BUCKET=my-bucket
-INFLUX_INTERVAL=5
 
 ##### Redis
 REDIS_URL=redis://localhost:6379/1

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.4)
+    activesupport (7.1.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -126,7 +126,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -161,4 +161,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.5.17
+   2.5.18

lib/config.rb

@@ -10,7 +10,7 @@ class Config # rubocop:disable Metrics/ClassLength
                 :influx_token,
                 :influx_org,
                 :influx_bucket,
-                :influx_interval,
+                :interval,
                 :redis_url,
                 :time_zone
 
@@ -24,7 +24,7 @@ def initialize(env, logger: NullLogger.new)
     @influx_token = env.fetch('INFLUX_TOKEN')
     @influx_org = env.fetch('INFLUX_ORG')
     @influx_bucket = env.fetch('INFLUX_BUCKET')
-    @influx_interval = [env.fetch('INFLUX_INTERVAL', '3600').to_i, 300].max
+    @interval = [env.fetch('POWER_SPLITTER_INTERVAL', '3600').to_i, 300].max
     validate_url!(influx_url)
     logger.info "Accessing InfluxDB at #{influx_url}, bucket #{influx_bucket}"
 

lib/flux/extractor.rb

@@ -3,8 +3,6 @@
 module Flux
   class Extractor < Flux::Reader
     def records(day)
-      return [] if day.today? && Time.current.hour.zero?
-
       query_string = <<~FLUX
         #{from_bucket}
         |> #{day_range(day)}
@@ -20,13 +18,17 @@ def records(day)
     private
 
     def day_range(day)
-      range(
-        start: day.beginning_of_day,
-        stop: [
-          day.beginning_of_day + 1.day,
-          Time.current.beginning_of_hour,
-        ].min,
-      )
+      start = day.beginning_of_day
+
+      stop =
+        if day.today?
+          current_time = Time.current
+          current_time.beginning_of_minute - (current_time.min % 5).minutes
+        else
+          start + 1.day
+        end
+
+      range(start:, stop:)
     end
 
     def extract_and_transform_data(flux_tables)

lib/loop.rb

@@ -84,8 +84,8 @@ def process_current_data
       count += 1
       break if max_count && count >= max_count
 
-      config.logger.info "  Sleeping for #{config.influx_interval} seconds...\n\n"
-      sleep(config.influx_interval)
+      config.logger.info "  Sleeping for #{config.interval} seconds...\n\n"
+      sleep(config.interval)
     end
   end
 

lib/processor.rb

@@ -45,7 +45,7 @@ def group_by_5min(splitted)
       .group_by { |item| (item[:time].to_i - 1.minute) / 5.minutes }
       .map do |_interval, items|
         {
-          time: items.first[:time].beginning_of_minute,
+          time: items.last[:time],
           house_power_grid: sum(items, :house_power_grid),
           wallbox_power_grid:
             wallbox_present ? sum(items, :wallbox_power_grid) : nil,