Merge branch 'master' into fix_executions_csv_am

Author: AndriiMysko

lib/travis/api/v3/billing_client.rb

@@ -42,6 +42,19 @@ def executions(owner_type, owner_id, page, per_page, from, to)
       executions
     end
 
+    def calculate_credits(users, executions)
+      response = connection.post("/usage/credits_calculator", users: users, executions: executions)
+      response.body.map do |calculator_data|
+        Travis::API::V3::Models::CreditsResult.new(calculator_data)
+      end
+    end
+
+    def credits_calculator_default_config
+      response = connection.get('/usage/credits_calculator/default_config')
+
+      Travis::API::V3::Models::CreditsCalculatorConfig.new(response.body)
+    end
+
     def all
       data = connection.get('/subscriptions').body
       subscriptions = data.fetch('subscriptions').map do |subscription_data|
@@ -210,11 +223,21 @@ def create_auto_refill(plan_id, is_enabled)
       handle_errors_and_respond(response)
     end
 
+    def update_auto_refill(addon_id, threshold, amount)
+      response = connection.patch('/auto_refill', {id: addon_id, threshold: threshold, amount: amount})
+      handle_errors_and_respond(response)
+    end
+
     def get_auto_refill(plan_id)
       response = connection.get("/auto_refill?plan_id=#{plan_id}")
       handle_errors_and_respond(response) { |r| Travis::API::V3::Models::AutoRefill.new(r) }
     end
 
+    def cancel_v2_subscription(id, reason_data)
+      response = connection.post("/v2/subscriptions/#{id}/cancel", reason_data)
+      handle_subscription_response(response)
+    end
+
     private
 
     def handle_subscription_response(response)

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

@@ -1,8 +1,9 @@
 module Travis::API::V3
   class Models::AutoRefill
 
-    attr_reader :enabled, :threshold, :amount
+    attr_reader :addon_id, :enabled, :threshold, :amount
     def initialize(attributes = {})
+      @addon_id = attributes.fetch('addon_id', nil) || attributes.fetch('id', nil)
       @enabled = attributes.key?('enabled') ? attributes.fetch('enabled') : true
       @threshold = attributes.key?('refill_threshold') ? attributes.fetch('refill_threshold') : 25000
       @amount = attributes.key?('refill_amount') ? attributes.fetch('refill_amount'): 10000

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

@@ -0,0 +1,11 @@
+module Travis::API::V3
+  class Models::CreditsCalculatorConfig
+    ATTRS = %w[users minutes os instance_size]
+
+    attr_accessor *ATTRS
+
+    def initialize(attrs)
+      ATTRS.each { |key| send("#{key}=", attrs[key]) }
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Travis::API::V3
+  class Models::CreditsResult
+    ATTRS = %w[users minutes os instance_size credits price]
+
+    attr_accessor *ATTRS
+
+    def initialize(attrs)
+      ATTRS.each { |key| send("#{key}=", attrs[key]) }
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ class Models::EnvVar < Travis::Settings::Model
     validates :name, presence: true
     validates_each :id, :name do |record, attr, value|
       others = record.repository.env_vars.select { |ev| ev.id != record.id }
-      record.errors.add(:base, :duplicate_resource) if others.find { |ev| ev.send(attr) == record.send(attr) }
+      record.errors.add(:base, :duplicate_resource) if others.find { |ev| ev.send(attr) == record.send(attr) && ev.send(:branch) == record.send(:branch) }
     end
 
     def repository

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

@@ -1,8 +1,8 @@
 module Travis::API::V3
   class Models::Execution
     attr_reader :id, :os, :instance_size, :arch, :virtualization_type, :queue, :job_id, :repository_id, :owner_id,
-                :owner_type, :plan_id, :sender_id, :credits_consumed, :started_at, :finished_at, :created_at,
-                :updated_at, :sender_login, :repo_slug, :repo_owner_name
+                :owner_type, :plan_id, :sender_id, :credits_consumed, :user_license_credits_consumed, :started_at,
+                :finished_at, :created_at, :updated_at, :sender_login, :repo_slug, :repo_owner_name
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')
@@ -18,6 +18,7 @@ def initialize(attributes = {})
       @plan_id = attributes.fetch('plan_id')
       @sender_id = attributes.fetch('sender_id')
       @credits_consumed = attributes.fetch('credits_consumed')
+      @user_license_credits_consumed = attributes.fetch('user_license_credits_consumed')
       @started_at = attributes.fetch('started_at')
       @finished_at = attributes.fetch('finished_at')
       @created_at = attributes.fetch('created_at')

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

@@ -1,12 +1,13 @@
 module Travis::API::V3
   class Models::V2Addon
-    attr_reader :id, :name, :type, :current_usage
+    attr_reader :id, :name, :type, :current_usage, :recurring
 
     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'])
+      @recurring = attrs['recurring']
     end
   end
 end

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

@@ -1,7 +1,8 @@
 module Travis::API::V3
   class Models::V2PlanConfig
     attr_reader :id, :name, :private_repos, :starting_price, :starting_users, :plan_type,
-                :private_credits, :public_credits, :addon_configs, :concurrency_limit, :available_standalone_addons, :auto_refill_enabled, :trial_plan
+                :private_credits, :public_credits, :addon_configs, :concurrency_limit, :available_standalone_addons, :auto_refill_enabled, :trial_plan,
+                :annual, :auto_refill_thresholds, :auto_refill_amounts
 
     def initialize(attrs)
       @id = attrs.fetch('id')
@@ -15,6 +16,9 @@ def initialize(attrs)
       @plan_type = attrs.fetch('plan_type')
       @concurrency_limit = attrs.fetch('concurrency_limit')
       @available_standalone_addons = attrs.fetch('available_standalone_addons')
+      @annual = attrs.fetch('annual')
+      @auto_refill_thresholds = attrs.fetch('auto_refill_thresholds')
+      @auto_refill_amounts = attrs.fetch('auto_refill_amounts')
       @trial_plan = attrs.fetch('trial_plan', false)
     end
   end

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

@@ -3,7 +3,7 @@ class Models::V2Subscription
     include Models::Owner
 
     attr_reader :id, :plan, :permissions, :source, :billing_info, :credit_card_info, :owner, :status, :valid_to, :canceled_at,
-                :client_secret, :payment_intent, :addons, :auto_refill, :available_standalone_addons, :created_at
+                :client_secret, :payment_intent, :addons, :auto_refill, :available_standalone_addons, :created_at, :scheduled_plan_name
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')
@@ -30,6 +30,7 @@ def initialize(attributes = {})
       @status = attributes.fetch('status')
       @valid_to = attributes.fetch('valid_to')
       @canceled_at = attributes.fetch('canceled_at')
+      @scheduled_plan_name = attributes.fetch('scheduled_plan')
     end
   end
 

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

@@ -0,0 +1,15 @@
+module Travis::API::V3
+  class Queries::CreditsCalculator < Query
+    params :users, :executions
+
+    def calculate(user_id)
+      client = BillingClient.new(user_id)
+      client.calculate_credits(params['users'], params['executions'])
+    end
+
+    def default_config(user_id)
+      client = BillingClient.new(user_id)
+      client.credits_calculator_default_config
+    end
+  end
+end