Merge pull request #1136 from AndriiMysko/v2-select-plan-am

Changes for V2 Plan summary and upgrade pages

Author: AndriiMysko

lib/travis/api/v3/billing_client.rb

@@ -115,6 +115,18 @@ def update_v2_subscription(subscription_id, plan_data)
       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)
+      end
+    end
+
+    def v2_plans_for_user
+      connection.get('/v2/plans_for/user').body.map do |plan_data|
+        Travis::API::V3::Models::V2PlanConfig.new(plan_data)
+      end
+    end
+
     def cancel_subscription(id, reason_data)
       response = connection.post("/subscriptions/#{id}/cancel", reason_data)
       handle_subscription_response(response)
@@ -127,7 +139,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_addon.rb

@@ -0,0 +1,12 @@
+module Travis::API::V3
+  class Models::V2Addon
+    attr_reader :id, :name, :type, :current_usage
+
+    def initialize(attrs)
+      @id = attrs.fetch('id')
+      @name = attrs.fetch('name')
+      @type = attrs.fetch('type')
+      @current_usage = attrs['current_usage'] && Models::V2AddonUsage.new(attrs['current_usage'])
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Travis::API::V3
+  class Models::V2AddonUsage
+    attr_reader :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :active
+
+    def initialize(attrs)
+      @id = attrs.fetch('id')
+      @addon_id = attrs.fetch('addon_id')
+      @addon_quantity = attrs.fetch('addon_quantity')
+      @addon_usage = attrs.fetch('addon_usage')
+      @remaining = attrs.fetch('remaining')
+      @active = attrs.fetch('active')
+    end
+  end
+end

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

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

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

@@ -2,19 +2,50 @@ module Travis::API::V3
   class Models::V2Subscription
     include Models::Owner
 
-    attr_reader :id, :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 = attributes['plan_config'] && Models::V2PlanConfig.new(attributes['plan_config'])
       @permissions = Models::BillingPermissions.new(attributes.fetch('permissions'))
-      @status = attributes.fetch('status')
       @source = attributes.fetch('source')
-      @billing_info = attributes['billing_info'] && Models::BillingInfo.new(@id, attributes['billing_info'])
-      @credit_card_info = attributes['credit_card_info'] && Models::CreditCardInfo.new(@id, attributes['credit_card_info'])
+      @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'))
-      @addons = attributes.fetch('addons')
+      @client_secret = attributes.fetch('client_secret')
+      @addons = attributes['addons'].select { |addon| addon['current_usage']['status'] != 'expired' }.map { |addon| Models::V2Addon.new(addon) }
       @created_at = attributes.fetch('created_at')
     end
   end
+
+  class Models::V2BillingInfo
+    attr_reader :id, :address, :address2, :billing_email, :city, :company, :country, :first_name, :last_name, :state, :vat_id, :zip_code
+
+    def initialize(id, attrs)
+      @id = id
+      @address = attrs.fetch('address')
+      @address2 = attrs.fetch('address2')
+      @billing_email = attrs.fetch('billing_email')
+      @city = attrs.fetch('city')
+      @company = attrs.fetch('company')
+      @country = attrs.fetch('country')
+      @first_name = attrs.fetch('first_name')
+      @last_name = attrs.fetch('last_name')
+      @state = attrs.fetch('state')
+      @vat_id = attrs.fetch('vat_id')
+      @zip_code = attrs.fetch('zip_code')
+    end
+  end
+
+  class Models::V2CreditCardInfo
+    attr_reader :id, :card_owner, :expiration_date, :last_digits
+
+    def initialize(id, attrs)
+      @id = id
+      @card_owner = attrs.fetch('card_owner')
+      @expiration_date = attrs.fetch('expiration_date')
+      @last_digits = attrs.fetch('last_digits')
+    end
+  end
 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_plans.rb

@@ -0,0 +1,12 @@
+module Travis::API::V3
+  class Queries::V2Plans < Query
+    def all(user_id)
+      client = BillingClient.new(user_id)
+      if params['organization.id']
+        client.v2_plans_for_organization(params['organization.id'])
+      else
+        client.v2_plans_for_user
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Travis::API::V3
+  class Queries::V2Subscription < Query
+    def update_address(user_id)
+      address_data = params.dup.tap { |h| h.delete('subscription.id') }
+      client = BillingClient.new(user_id)
+      client.update_v2_address(params['subscription.id'], address_data)
+    end
+
+    def update_creditcard(user_id)
+      client = BillingClient.new(user_id)
+      client.update_v2_creditcard(params['subscription.id'], params['token'])
+    end
+
+    def update_plan(user_id)
+      plan_data = params.dup.tap { |h| h.delete('subscription.id') }
+      client = BillingClient.new(user_id)
+      client.update_v2_subscription(params['subscription.id'], plan_data)
+    end
+
+    def invoices(user_id)
+      client = BillingClient.new(user_id)
+      client.get_invoices_for_v2_subscription(params['subscription.id'])
+    end
+
+    def pay(user_id)
+      client = BillingClient.new(user_id)
+      client.pay_v2(params['subscription.id'])
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Travis::API::V3
+  class Queries::V2Subscriptions < Query
+    params :plan, :coupon, :organization_id, :client_secret
+    params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email, prefix: :billing_info
+    params :token, prefix: :credit_card_info
+
+    def all(user_id)
+      client = BillingClient.new(user_id)
+      client.all_v2
+    end
+
+    def create(user_id)
+      client = BillingClient.new(user_id)
+      client.create_v2_subscription(
+        :plan => params['plan'],
+        :client_secret => params['client_secret'],
+        :coupon => params['coupon'],
+        :organization_id => params['organization_id'],
+        :billing_info => billing_info_params,
+        :credit_card_info => credit_card_info_params
+      )
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Travis::API::V3
+  class Renderer::V2Addon < ModelRenderer
+    representation(:standard, :id, :name, :type, :current_usage)
+    representation(:minimal, :id, :name, :type, :current_usage)
+
+    def current_usage
+      Renderer.render_model(model.current_usage, mode: :standard) unless model.current_usage.nil?
+    end
+  end
+end