Group time to 5min intervals

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/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,

spec/lib/flux/extractor_spec.rb

@@ -5,10 +5,11 @@
   subject(:extractor) { described_class.new(config:) }
 
   let(:config) { Config.new(ENV) }
-  let(:day) { Date.yesterday }
 
   describe '#records', vcr: 'extractor' do
-    let(:time) { day.to_time.change(hour: 9, minute: 42).to_i }
+    subject(:day_records) { extractor.records(day) }
+
+    let(:time) { day.to_time.change(hour: 9, min: 42) }
 
     before do
       records = [
@@ -38,20 +39,42 @@
 
     after { flux_delete_all }
 
-    it 'returns transformed data' do
-      records = extractor.records(day)
+    context 'when day is in the past' do
+      let(:day) { Date.yesterday }
+
+      it 'returns transformed data' do
+        expect(day_records).to be_an(Array).and all(be_a(Hash)).and all(
+                      include(
+                        'time',
+                        'grid_power_plus',
+                        'house_power',
+                        'wallbox_charge_power',
+                        'power',
+                      ),
+                    )
+
+        expect(day_records.length).to eq(1440) # 24 hours * 60 records per hour (1m intervals)
+      end
+    end
+
+    context 'when day is today' do
+      let(:day) { Date.new(2024, 8, 28) }
+
+      before { travel_to(time) }
 
-      expect(records).to be_an(Array).and all(be_a(Hash)).and all(
-                    include(
-                      'time',
-                      'grid_power_plus',
-                      'house_power',
-                      'wallbox_charge_power',
-                      'power',
-                    ),
-                  )
+      it 'returns transformed data' do
+        expect(day_records).to be_an(Array).and all(be_a(Hash)).and all(
+                      include(
+                        'time',
+                        'grid_power_plus',
+                        'house_power',
+                        'wallbox_charge_power',
+                        'power',
+                      ),
+                    )
 
-      expect(records.length).to eq(1440) # 24 hours * 60 records per hour (1m intervals)
+        expect(day_records.length).to eq(1440) # 24 hours * 60 records per hour (1m intervals)
+      end
     end
   end
 end

spec/support/time_helpers.rb

@@ -0,0 +1,3 @@
+require 'active_support/testing/time_helpers'
+
+RSpec.configure { |config| config.include ActiveSupport::Testing::TimeHelpers }