killbill-aviate 2.5.0.pre.1 → 2.6.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bee60163cbf0ca265183dedb23b84706b33b861fb9930388011d26624a31b203
-  data.tar.gz: d2e489be4421c15c412cf41f4e38936f56b4c13f0cbbd7f40423d159e4c4f701
+  metadata.gz: a62b8480ef36de4d4b7b940fe459b21f8558d709ca383d166f7646db74fbcc0f
+  data.tar.gz: 687a487132071980ab83a7fa071eedd743b03278426f91741a5f0b779c362bd7
 SHA512:
-  metadata.gz: 99e627e23ceada4b4f3869da12191f00df3679438216387f99e84e15f5d0bd91f8ce1ae559f62fc981bce01cacd650fe3ebe275a21717f5fa5222652cc6a4d2b
-  data.tar.gz: 9528968cc7255029e32303f73133cb2d896d39bf516f179293b9262b857b1ddf4e6d941d52c97d66e70dff66bc87e991892d6f817bc548669d171f4ccb601d64
+  metadata.gz: 4e35b059d90bd65d1b894d219694a79ea2b6c16ae232c781eb4e7e76306da5911739e4879758d51c6a504920a57ce0dc062a5a50666a8d8a8688737135c7a026
+  data.tar.gz: dd2ff55665575f2f1fb4e1e60f92866d555d72250015cfdb22da0c77b9a25958091c3f91d5bd2b5bda7b004c42beb98a6ab8dc54d3e2dc18c3ea4bfa331f85ef

data/app/controllers/aviate/usage_controller.rb

@@ -57,7 +57,13 @@ module Aviate
 
     def billing_period(subscription)
       today = Time.zone.today
-      ctd = parse_kb_date(subscription.charged_through_date)
+      # A usage subscription has no charged_through_date until its first invoice: anchor the
+      # period on its (billing) start date, not on today, so usage recorded between the start
+      # date and today still falls inside the displayed period (technical-support#302).
+      ctd = parse_kb_date(subscription.charged_through_date) ||
+            parse_kb_date(subscription.billing_start_date) ||
+            parse_kb_date(subscription.start_date) ||
+            today
       bcd = subscription.bill_cycle_day_local
 
       if ctd > today
@@ -70,11 +76,11 @@ module Aviate
     end
 
     def parse_kb_date(date_str)
-      return Time.zone.today if date_str.blank?
+      return nil if date_str.blank?
 
       Date.parse(date_str.to_s)
     rescue ArgumentError
-      Time.zone.today
+      nil
     end
 
     def compute_next_bcd(start_date, bill_cycle_day_local)
@@ -171,8 +177,8 @@ module Aviate
 
       return samples_by_unit if unit_types.empty?
 
-      # rubocop:disable-next ThreadSafety/NewThread -- fetching samples for each unit type in parallel is intentional
       threads = unit_types.map do |unit_type|
+        # rubocop:disable-next ThreadSafety/NewThread -- fetching samples for each unit type in parallel is intentional
         Thread.new do
           samples = Killbill::Aviate::AviateClient.host_samples(
             subscription_id, unit_type, from, to, cached_options

data/lib/aviate/client.rb

@@ -136,7 +136,7 @@ module Killbill
 
           request_options = build_request_options(options)
           response = KillBillClient::API.get path, query_params, request_options
-          parse_csv_response(response.body)
+          parse_csv_response(response.body, subscription_id, sample_kind)
         rescue KillBillClient::API::ResponseError
           []
         end
@@ -168,7 +168,7 @@ module Killbill
           account_id.present? ? { accountId: account_id } : {}
         end
 
-        def parse_csv_response(body)
+        def parse_csv_response(body, expected_category = nil, expected_sample_kind = nil)
           return [] if body.nil? || body.strip.empty?
 
           # The host_samples endpoint returns a JSON array. Each element has a
@@ -180,6 +180,12 @@ module Killbill
 
           result = []
           parsed.each do |entry|
+            # Ignore entries for other categories/sample kinds: some plugin versions return
+            # unfiltered data when the requested subscription has no samples yet
+            # (technical-support#301).
+            next if expected_category.present? && entry['eventCategory'] != expected_category
+            next if expected_sample_kind.present? && entry['sampleKind'] != expected_sample_kind
+
             samples_str = entry['samples']
             next if samples_str.nil? || samples_str.strip.empty?
 
@@ -195,7 +201,9 @@ module Killbill
             end
           end
 
-          result
+          # Samples may span multiple entries (e.g. one per node): keep them chronological
+          # for the cumulative chart computation.
+          result.sort_by { |s| s[:date] }
         rescue StandardError
           []
         end

data/lib/aviate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aviate
-  VERSION = '2.5.0.pre.1'
+  VERSION = '2.6.0.pre.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-aviate
 version: !ruby/object:Gem::Version
-  version: 2.5.0.pre.1
+  version: 2.6.0.pre.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-25 00:00:00.000000000 Z
+date: 2026-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
 description: Rails UI plugin for the Aviate plugin.
 email: killbilling-users@googlegroups.com
 executables: []