killbill-aviate 2.4.1 → 2.5.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a33431ff2c1c0efc68d19edb2dcc2092c9878c2619ecb8410f558d84270af4
-  data.tar.gz: 2a308d08c413a6f4ea1859f7288b79c443d71a8f26c44a13301bff2e0a059a14
+  metadata.gz: bee60163cbf0ca265183dedb23b84706b33b861fb9930388011d26624a31b203
+  data.tar.gz: d2e489be4421c15c412cf41f4e38936f56b4c13f0cbbd7f40423d159e4c4f701
 SHA512:
-  metadata.gz: 58290f3c42df826a37e111fef3e8180a991c7e940d90b33cce5b67e29edcdab98848e17df27d0ebc1ad086dc54bf9cc198850b3082f3007b4338a23da9f6c5ac
-  data.tar.gz: 703365aecb29e25bd43d0c818975795a5d371a77e730a9912bf4173fd811984a8a099c03ea9c94f11e040654c79e59b0074bfd5c50b8d648fbea22e7f1abc309
+  metadata.gz: 99e627e23ceada4b4f3869da12191f00df3679438216387f99e84e15f5d0bd91f8ce1ae559f62fc981bce01cacd650fe3ebe275a21717f5fa5222652cc6a4d2b
+  data.tar.gz: 9528968cc7255029e32303f73133cb2d896d39bf516f179293b9262b857b1ddf4e6d941d52c97d66e70dff66bc87e991892d6f817bc548669d171f4ccb601d64

data/app/controllers/aviate/usage_controller.rb

@@ -35,6 +35,7 @@ module Aviate
 
       # Step 3: Retrieve unit types from catalog
       unit_types = fetch_unit_types(@subscription, start_date, cached_options)
+      @unit_types = unit_types
 
       # Step 4: Fetch daily usage time-series in parallel
       samples_by_unit = fetch_all_samples(subscription_id, unit_types, start_date, end_date, cached_options)
@@ -55,9 +56,17 @@ module Aviate
     private
 
     def billing_period(subscription)
-      start_date = parse_kb_date(subscription.charged_through_date)
-      end_date = compute_next_bcd(start_date, subscription.bill_cycle_day_local)
-      [start_date, end_date]
+      today = Time.zone.today
+      ctd = parse_kb_date(subscription.charged_through_date)
+      bcd = subscription.bill_cycle_day_local
+
+      if ctd > today
+        # CTD is the end of the current open billing period; find its start.
+        [compute_prev_bcd(ctd, bcd), ctd]
+      else
+        # CTD marks the start of the next open period.
+        [ctd, compute_next_bcd(ctd, bcd)]
+      end
     end
 
     def parse_kb_date(date_str)
@@ -88,6 +97,20 @@ module Aviate
       start_date + 30
     end
 
+    def compute_prev_bcd(date, bill_cycle_day_local)
+      return date - 30 if bill_cycle_day_local.blank?
+
+      bcd = bill_cycle_day_local.to_i
+      bcd = 28 if bcd > 28
+      bcd = 1 if bcd < 1
+
+      prev_month = date.prev_month
+      last_day = [bcd, Date.new(prev_month.year, prev_month.month, -1).day].min
+      Date.new(prev_month.year, prev_month.month, last_day)
+    rescue ArgumentError
+      date - 30
+    end
+
     def fetch_unit_types(subscription, start_date, cached_options)
       if Killbill::Aviate::AviateClient.aviate_catalog?(subscription.account_id, cached_options)
         fetch_billing_meter_codes(subscription, cached_options)
@@ -148,7 +171,7 @@ module Aviate
 
       return samples_by_unit if unit_types.empty?
 
-      # rubocop:disable ThreadSafety/NewThread -- fetching samples for each unit type in parallel is intentional
+      # rubocop:disable-next ThreadSafety/NewThread -- fetching samples for each unit type in parallel is intentional
       threads = unit_types.map do |unit_type|
         Thread.new do
           samples = Killbill::Aviate::AviateClient.host_samples(
@@ -160,7 +183,6 @@ module Aviate
           [unit_type, []]
         end
       end
-      # rubocop:enable ThreadSafety/NewThread
 
       threads.each do |t|
         unit_type, samples = t.value

data/app/views/aviate/usage/show.html.erb

@@ -16,15 +16,13 @@
         </p>
       </div>
 
-      <% if @chart_json.present? || @accrued_cost.present? || @wallet_balance.present? %>
+      <% if @unit_types.present? || @accrued_cost.present? || @wallet_balance.present? %>
         <div class="usage-stats d-flex gap-4 mb-4">
-          <% if @chart_data.any? %>
-            <% @chart_data.each do |unit_type, values| %>
-              <div class="stat-card card p-3">
-                <div class="stat-label text-muted small">Units Consumed (<%= unit_type %>)</div>
-                <div class="stat-value h4"><%= values.last&.dig('y') || 0 %></div>
-              </div>
-            <% end %>
+          <% @unit_types.each do |unit_type| %>
+            <div class="stat-card card p-3">
+              <div class="stat-label text-muted small">Units Consumed (<%= unit_type %>)</div>
+              <div class="stat-value h4"><%= @chart_data[unit_type]&.last&.dig('y') || 0 %></div>
+            </div>
           <% end %>
 
           <% if @accrued_cost.present? %>

data/lib/aviate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-aviate
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0.pre.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-19 00:00:00.000000000 Z
+date: 2026-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui
@@ -125,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: