Spec tests and some changes for v2 billing

Author: AndriiMysko

lib/travis/api/v3/billing_client.rb

@@ -111,7 +111,7 @@ def v2_plans_for_organization(organization_id)
     end
 
     def v2_plans_for_user
-      connection.get("/v2/plans_for/user").body.map do |plan_data|
+      connection.get('/v2/plans_for/user').body.map do |plan_data|
         Travis::API::V3::Models::V2PlanConfig.new(plan_data)
       end
     end
@@ -128,7 +128,7 @@ def plans_for_organization(organization_id)
     end
 
     def plans_for_user
-      connection.get("/plans_for/user").body.map do |plan_data|
+      connection.get('/plans_for/user').body.map do |plan_data|
         Travis::API::V3::Models::Plan.new(plan_data)
       end
     end

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

@@ -2,19 +2,19 @@ module Travis::API::V3
   class Models::V2Subscription
     include Models::Owner
 
-    attr_reader :id, :plan, :permissions, :status, :source, :billing_info, :credit_card_info, :owner, :payment_intent, :addons, :created_at
+    attr_reader :id, :plan, :permissions, :source, :billing_info, :credit_card_info, :owner, :client_secret, :payment_intent, :addons, :created_at
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')
       plan_data = attributes.fetch('plan_config')
       @plan = plan_data && Models::V2PlanConfig.new(plan_data)
       @permissions = Models::BillingPermissions.new(attributes.fetch('permissions'))
-      @status = 'subscribed'
       @source = attributes.fetch('source')
       @billing_info = attributes['billing_info'] && Models::V2BillingInfo.new(@id, attributes['billing_info'])
       @credit_card_info = attributes['credit_card_info'] && Models::V2CreditCardInfo.new(@id, attributes['credit_card_info'])
       @payment_intent = attributes['payment_intent'] && Models::PaymentIntent.new(attributes['payment_intent'])
       @owner = fetch_owner(attributes.fetch('owner'))
+      @client_secret = attributes.fetch('client_secret')
       @addons = attributes.fetch('addons')
       @created_at = attributes.fetch('created_at')
     end

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

@@ -0,0 +1,8 @@
+module Travis::API::V3
+  class Queries::V2Invoices < Query
+    def all(user_id)
+      client = BillingClient.new(user_id)
+      client.get_invoices_for_v2_subscription(params['subscription.id'])
+    end
+  end
+end

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

@@ -6,12 +6,6 @@ def update_address(user_id)
       client.update_v2_address(params['subscription.id'], address_data)
     end
 
-    def cancel(user_id)
-      reason_data = params.dup.tap { |h| h.delete('subscription.id') }
-      client = BillingClient.new(user_id)
-      client.cancel_subscription(params['subscription.id'], reason_data)
-    end
-
     def update_creditcard(user_id)
       client = BillingClient.new(user_id)
       client.update_v2_creditcard(params['subscription.id'], params['token'])
@@ -23,24 +17,14 @@ def update_plan(user_id)
       client.update_v2_subscription(params['subscription.id'], plan_data)
     end
 
-    def resubscribe(user_id)
-      client = BillingClient.new(user_id)
-      client.resubscribe(params['subscription.id'])
-    end
-
     def invoices(user_id)
       client = BillingClient.new(user_id)
-      client.get_invoices_for_subscription(params['subscription.id'])
-    end
-
-    def trial(user_id)
-      client = BillingClient.new(user_id)
-      client.get_trial_info_for_subscription(params['subscription.id'])
+      client.get_invoices_for_v2_subscription(params['subscription.id'])
     end
 
     def pay(user_id)
       client = BillingClient.new(user_id)
-      client.pay(params['subscription.id'])
+      client.pay_v2(params['subscription.id'])
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Renderer::V2Subscription < ModelRenderer
-    representation(:standard, :id, :plan, :addons, :status, :source, :owner, :billing_info, :credit_card_info, :payment_intent, :created_at)
+    representation(:standard, :id, :plan, :addons, :source, :owner, :client_secret, :billing_info, :credit_card_info, :payment_intent, :created_at)
 
     def billing_info
       Renderer.render_model(model.billing_info, mode: :standard) unless model.billing_info.nil?

lib/travis/api/v3/routes.rb

@@ -318,8 +318,6 @@ module Routes
       patch :update_address, '/address'
       patch :update_creditcard, '/creditcard'
       patch :update_plan, '/plan'
-      patch :resubscribe, '/resubscribe'
-      post :cancel, '/cancel'
       post :pay, '/pay'
       get :invoices, '/invoices'
     end

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

@@ -4,7 +4,7 @@ class Services::V2Subscription::Invoices < Service
 
     def run!
       raise LoginRequired unless access_control.full_access_or_logged_in?
-      result query(:invoices).all(access_control.user.id)
+      result query(:v2_invoices).all(access_control.user.id)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Services::V2Subscription::Pay < Service
-    result_type :subscription
+    result_type :v2_subscription
 
     def run!
       raise LoginRequired unless access_control.full_access_or_logged_in?