Updates for separate addons purchase (#1141)

Author: pavel-d

lib/travis/api/v3/billing_client.rb

@@ -120,6 +120,11 @@ def update_v2_subscription(subscription_id, plan_data)
       handle_v2_subscription_response(response)
     end
 
+    def purchase_addon(subscription_id, addon_config_id)
+      response = connection.patch("/v2/subscriptions/#{subscription_id}/addon", { addon: addon_config_id })
+      handle_v2_subscription_response(response)
+    end
+
     def v2_plans_for_organization(organization_id)
       connection.get("/v2/plans_for/organization/#{organization_id}").body.map do |plan_data|
         Travis::API::V3::Models::V2PlanConfig.new(plan_data)

lib/travis/api/v3/models/v2_plan_config.rb

@@ -1,7 +1,7 @@
 module Travis::API::V3
   class Models::V2PlanConfig
     attr_reader :id, :name, :private_repos, :starting_price, :starting_users, :private_credits, :public_credits,
-                :addon_configs
+                :addon_configs, :available_standalone_addons
 
     def initialize(attrs)
       @id = attrs.fetch('id')
@@ -12,6 +12,7 @@ def initialize(attrs)
       @private_credits = attrs.fetch('private_credits')
       @public_credits = attrs.fetch('public_credits')
       @addon_configs = attrs.fetch('addon_configs')
+      @available_standalone_addons = attrs.fetch('available_standalone_addons')
     end
   end
 end

lib/travis/api/v3/models/v2_subscription.rb

@@ -2,7 +2,7 @@ module Travis::API::V3
   class Models::V2Subscription
     include Models::Owner
 
-    attr_reader :id, :plan, :permissions, :source, :billing_info, :credit_card_info, :owner, :client_secret, :payment_intent, :addons, :created_at
+    attr_reader :id, :plan, :permissions, :source, :billing_info, :credit_card_info, :owner, :client_secret, :payment_intent, :addons, :available_standalone_addons, :created_at
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')

lib/travis/api/v3/queries/v2_subscription.rb

@@ -23,6 +23,11 @@ def update_plan(user_id)
       client.update_v2_subscription(params['subscription.id'], plan_data)
     end
 
+    def buy_addon(user_id)
+      client = BillingClient.new(user_id)
+      client.purchase_addon(params['subscription.id'], params['addon.id'])
+    end
+
     def invoices(user_id)
       client = BillingClient.new(user_id)
       client.get_invoices_for_v2_subscription(params['subscription.id'])

lib/travis/api/v3/renderer/v2_addon_config.rb

@@ -0,0 +1,6 @@
+module Travis::API::V3
+  class Renderer::V2AddonConfig < ModelRenderer
+    representation(:standard, :id, :name, :price, :quantity, :type)
+    representation(:minimal, :id, :name, :price, :quantity, :type)
+  end
+end

lib/travis/api/v3/renderer/v2_plan_config.rb

@@ -1,7 +1,7 @@
 module Travis::API::V3
   class Renderer::V2PlanConfig < ModelRenderer
     representation(:standard, :id, :name, :private_repos, :starting_price, :starting_users, :private_credits,
-                   :public_credits, :addon_configs)
+                   :public_credits, :addon_configs, :available_standalone_addons)
     representation(:minimal, :id, :name, :private_repos, :starting_price, :starting_users, :private_credits,
                    :public_credits, :addon_configs)
   end

lib/travis/api/v3/routes.rb

@@ -320,6 +320,7 @@ module Routes
       patch :changetofree, '/changetofree'
       patch :update_plan, '/plan'
       post :pay, '/pay'
+      post :buy_addon, '/addon/{addon.id}'
       get :invoices, '/invoices'
     end
 

lib/travis/api/v3/services/v2_subscription/buy_addon.rb

@@ -0,0 +1,11 @@
+module Travis::API::V3
+  class Services::V2Subscription::BuyAddon < Service
+    params :plan
+
+    def run!
+      raise LoginRequired unless access_control.full_access_or_logged_in?
+      query.buy_addon(access_control.user.id)
+      no_content
+    end
+  end
+end

spec/support/billing_spec_helper.rb

@@ -55,6 +55,22 @@ def billing_v2_subscription_response_body(attributes={})
           'starting_users' => 10000,
           'private_credits' => 500000,
           'public_credits' => 40000,
+          'available_standalone_addons' => [
+            {
+              'id' => 'credits_25k',
+              'name' => '25 000 credits (2,5k Linux build minutes)',
+              'price' => 1500,
+              'quantity' => 25000,
+              'type' => 'credit_private'
+            },
+            {
+              'id' => 'credits_500k',
+              'name' => '500 000 credits (50k Linux build minutes)',
+              'price' => 30000,
+              'quantity' => 500000,
+              'type' => 'credit_private'
+            }
+          ],
           'addon_configs' => {
             'free_tier_credits' => {
               'name' => 'Free 10 000 credits (renewed monthly)',

spec/v3/billing_client_spec.rb

@@ -260,6 +260,19 @@
     end
   end
 
+  describe '#purchase_addon' do
+    let(:addon_config_id) { 'credits_500k' }
+    subject { billing.purchase_addon(subscription_id, addon_config_id) }
+
+    it 'requests the update' do
+      stubbed_request = stub_billing_request(:patch, "/v2/subscriptions/#{subscription_id}/addon", auth_key: auth_key, user_id: user_id)
+        .with(body: JSON.dump(addon: addon_config_id))
+        .to_return(status: 204)
+
+        expect { subject }.to_not raise_error
+    end
+  end
+
   describe '#pay' do
     subject { billing.pay(subscription_id) }