Use models for v2 addons and usages

Author: AndriiMysko

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

@@ -0,0 +1,11 @@
+module Travis::API::V3
+  class Models::V2Addon
+    attr_reader :id, :type, :current_usage
+
+    def initialize(attrs)
+      @id = attrs.fetch('id')
+      @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_subscription.rb

@@ -6,16 +6,15 @@ class Models::V2Subscription
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')
-      plan_data = attributes.fetch('plan_config')
-      @plan = plan_data && Models::V2PlanConfig.new(plan_data)
+      @plan = attributes['plan_config'] && Models::V2PlanConfig.new(attributes['plan_config'])
       @permissions = Models::BillingPermissions.new(attributes.fetch('permissions'))
       @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')
+      @addons = attributes['addons'].select { |addon| addon['current_usage']['status'] != 'expired' }.map { |addon| Models::V2Addon.new(addon) }
       @created_at = attributes.fetch('created_at')
     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, :type, :current_usage)
+    representation(:minimal, :id, :type, :current_usage)
+
+    def current_usage
+      Renderer.render_model(model.current_usage, mode: :standard) unless model.current_usage.nil?
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+module Travis::API::V3
+  class Renderer::V2AddonUsage < ModelRenderer
+    representation(:standard, :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :active)
+    representation(:minimal, :id, :addon_id, :addon_quantity, :addon_usage, :remaining, :active)
+  end
+end

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

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