killbill-aviate 2.4.0 → 2.4.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adcf4012c2b8055a67f0724c1b537e51c20f41456375f35d5670d2b232abbf5
-  data.tar.gz: 190802f0514736ee87c8740ede305175254fe51d09bf1263e7f004e7f848b191
+  metadata.gz: a03c9fbf0ae747d2accce4e819edb24433676609f46680b890223ce3cd89246f
+  data.tar.gz: 37970b56d1c29958a87006f0e7b62a9d665bcca49f585dca71780ca0173728e7
 SHA512:
-  metadata.gz: 79e74b08be7e317e4d4f96a7dbae76019b1420f906da3cff97b39bfc4cad3a87e10ec36b0d961336eec9bbb20eb6bd73b8684998cf7245da5578693c1b8702a1
-  data.tar.gz: e778000ade2913989a6e2b3e9038d129bbd6e5364d7fd9e97a4273b0536968246d26f939e1abc1b9261284e62d0a7af61878fd373dd5838478e64d27dbfb8655
+  metadata.gz: bdee42559069177e241a5617bfedb9ce15c9e2315d17c9e757a48b51da4649ed149e1cdcdd80a8b57600698097579a2f3bb3f63d4ffc3dbdc0852c986a97625f
+  data.tar.gz: 032f003efb1423053ed5185ff5bc614cf6b391351d8aae9040cf43809aad2e1fceaf913805da184bae7d873e4dedc488f51ddae281567f7d221c7c646bd5a9eb

data/app/assets/config/aviate_manifest.js

@@ -1,3 +1,2 @@
-//= link_tree ../images
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css

data/app/controllers/aviate/usage_controller.rb

@@ -89,6 +89,23 @@ module Aviate
     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)
+      else
+        fetch_catalog_phase_unit_types(subscription, start_date, cached_options)
+      end
+    end
+
+    # Aviate catalogs record usage against a billing meter code, resolved via the Aviate plugin's
+    # own (JWT-authenticated) Catalog API, rather than a standard catalog unit type.
+    def fetch_billing_meter_codes(subscription, cached_options)
+      Killbill::Aviate::AviateClient.billing_meter_codes_for_plan(subscription.plan_name, subscription.account_id, cached_options)
+    rescue StandardError => e
+      Rails.logger.warn("Failed to fetch Aviate billing meter codes: #{e.message}")
+      []
+    end
+
+    def fetch_catalog_phase_unit_types(subscription, start_date, cached_options)
       # NOTE: KillBillClient::Model::Catalog.get_catalog_phase parses the response as a
       # Catalog object by default, but the API actually returns a Phase-shaped payload
       # (it has no `usages` accessor otherwise) - request it as a Phase explicitly.

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

@@ -1,5 +1,10 @@
 <div class="kaui-container usage-show">
-  <%= render "kaui/components/breadcrumb/breadcrumb" %>
+  <%= render "kaui/components/breadcrumb/breadcrumb", breadcrumbs: [
+    { label: 'Accounts', href: '/accounts' },
+    { label: @account.name.presence || "Account #{@account_id}", href: "/accounts/#{@account_id}" },
+    { label: 'Usage', href: "/aviate/accounts/#{@account_id}/usage" },
+    { label: 'Usage Detail' }
+  ] %>
   <div class="d-flex" style="gap: 4rem;">
     <%= render :template => 'kaui/layouts/kaui_account_sidebar' %>
     <div class="usage-content" style="max-width: 67.5rem; width: 100%;">

data/lib/aviate/client.rb

@@ -5,6 +5,8 @@ module Killbill
     class AviateClient < KillBillClient::Model::Resource
       KILLBILL_AVIATE_PREFIX = '/plugins/aviate-plugin/v1'
 
+      CATALOG_STATE_AVIATE = 'CATALOG_STATE_AVIATE'
+
       class << self
         def aviate_plugin_available?(options = nil)
           path = "#{KILLBILL_AVIATE_PREFIX}/health/data"
@@ -17,6 +19,47 @@ module Killbill
           [false, e.message.to_s]
         end
 
+        # Returns true if the account/subscription is billed via an Aviate catalog (as opposed to a
+        # standard XML one). Any error (plugin not installed, missing/invalid JWT, network issue, etc.)
+        # is treated as "not Aviate" so callers can safely fall back to the standard catalog behavior.
+        def aviate_catalog?(account_id, options = nil)
+          path = "#{KILLBILL_AVIATE_PREFIX}/catalog/info"
+          request_options = build_request_options(options)
+
+          response = KillBillClient::API.get path, catalog_params(account_id), request_options
+          JSON.parse(response.body)['state'] == CATALOG_STATE_AVIATE
+        rescue StandardError
+          false
+        end
+
+        # Returns the list of billing meter codes configured on the given plan's usage phases.
+        # Aviate catalogs record usage against a billing meter code rather than a standard
+        # catalog unit type, so this must be used instead of the plain KillBillClient catalog/phase
+        # lookup whenever `aviate_catalog?` is true.
+        def billing_meter_codes_for_plan(plan_name, account_id, options = nil)
+          return [] if plan_name.blank?
+
+          path = "#{KILLBILL_AVIATE_PREFIX}/catalog/#{plan_name}/plan"
+          request_options = build_request_options(options)
+
+          response = KillBillClient::API.get path, catalog_params(account_id), request_options
+          plan = JSON.parse(response.body)
+
+          codes = []
+          Array(plan['phases']).each do |phase|
+            Array(phase['usages']).each do |usage|
+              Array(usage['tiers']).each do |tier|
+                Array(tier['blocks']).each do |block|
+                  codes << block['billingMeterCode'] if block['billingMeterCode'].present?
+                end
+              end
+            end
+          end
+          codes.uniq
+        rescue StandardError
+          []
+        end
+
         def aviate_plugin_installed(options = nil)
           nodes_info = KillBillClient::Model::NodesInfo.nodes_info(options) || []
           plugins_info = nodes_info.empty? ? [] : (nodes_info.first.plugins_info || [])
@@ -117,6 +160,10 @@ module Killbill
 
         private
 
+        def catalog_params(account_id)
+          account_id.present? ? { accountId: account_id } : {}
+        end
+
         def parse_csv_response(body)
           return [] if body.nil? || body.strip.empty?
 

data/lib/aviate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-aviate
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1.pre.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-05 00:00:00.000000000 Z
+date: 2026-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui
@@ -76,6 +76,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/aviate_manifest.js
+- app/assets/images/aviate/.keep
 - app/assets/javascripts/aviate/aviate.js
 - app/assets/javascripts/aviate/kiddo/axes.js
 - app/assets/javascripts/aviate/kiddo/charts/line_chart.js
@@ -124,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: