Merge pull request #1169 from travis-ci/epic-pricing-rc2

Shairyar Baig · web-flow · commit 597bb9dc8c1e · 2020-12-15T14:10:12.000+05:00
Billing milestone 2
diff --git a/lib/travis/api/enqueue/services/restart_model.rb b/lib/travis/api/enqueue/services/restart_model.rb
@@ -78,7 +78,15 @@ def target
         private
 
         def permission?
-          current_user && current_user.permission?(required_role, repository_id: target.repository_id) && !abusive?
+          current_user && current_user.permission?(required_role, repository_id: target.repository_id) && !abusive? && build_permission?
+        end
+
+        def build_permission?
+          # nil value is considered true
+          return false if repository.permissions.find_by(user_id: current_user.id).build == false
+          return false if repository.owner_type == 'Organization' && repository.owner.memberships.find_by(user_id: current_user.id)&.build_permission == false
+
+          true
         end
 
         def abusive?
diff --git a/lib/travis/api/v3/queries/build_permissions.rb b/lib/travis/api/v3/queries/build_permissions.rb
@@ -1,11 +1,11 @@
 module Travis::API::V3
   class Queries::BuildPermissions < Query
     def find_for_repo(repository)
-      Models::Repository.find(repository.id).permissions.includes(:user)
+      Models::Repository.find(repository.id).permissions.joins(:user).includes(:user)
     end
 
     def find_for_organization(organization)
-      Models::Membership.where(organization_id: organization.id).includes(:user)
+      Models::Membership.where(organization_id: organization.id).joins(:user).includes(:user)
     end
 
     def update_for_organization(organization, user_ids, permission)
diff --git a/lib/travis/api/v3/renderer/execution_per_repo.rb b/lib/travis/api/v3/renderer/execution_per_repo.rb
@@ -0,0 +1,6 @@
+module Travis::API::V3
+  class Renderer::ExecutionPerRepo < ModelRenderer
+    representation :minimal, :repository_id, :os, :credits_consumed, :minutes_consumed, :repository
+    representation :standard, *representations[:minimal]
+  end
+end
diff --git a/lib/travis/api/v3/renderer/execution_per_sender.rb b/lib/travis/api/v3/renderer/execution_per_sender.rb
@@ -0,0 +1,6 @@
+module Travis::API::V3
+  class Renderer::ExecutionPerSender < ModelRenderer
+    representation :minimal, :credits_consumed, :minutes_consumed, :sender_id, :sender
+    representation :standard, *representations[:minimal]
+  end
+end
diff --git a/lib/travis/api/v3/renderer/executions_per_repo.rb b/lib/travis/api/v3/renderer/executions_per_repo.rb
@@ -0,0 +1,6 @@
+module Travis::API::V3
+  class Renderer::ExecutionsPerRepo < CollectionRenderer
+    type           :executionsperrepo
+    collection_key :executionsperrepo
+  end
+end
diff --git a/lib/travis/api/v3/renderer/executions_per_sender.rb b/lib/travis/api/v3/renderer/executions_per_sender.rb
@@ -0,0 +1,6 @@
+module Travis::API::V3
+  class Renderer::ExecutionsPerSender < CollectionRenderer
+    type           :executionspersender
+    collection_key :executionspersender
+  end
+end
diff --git a/lib/travis/api/v3/renderer/user.rb b/lib/travis/api/v3/renderer/user.rb
@@ -6,11 +6,11 @@ class Renderer::User < Renderer::Owner
     representation(:additional, :emails)
 
     def email
-      @model.email if current_user?
+      @model.email if show_emails?
     end
 
     def emails
-      current_user? ? @model.emails.map(&:email) : []
+      show_emails? ? @model.emails.map(&:email) : []
     end
 
     def secure_user_hash
@@ -20,6 +20,10 @@ def secure_user_hash
 
     private
 
+    def show_emails?
+      current_user? || options[:show_email] == true
+    end
+
     def current_user?
       access_control.class == Travis::API::V3::AccessControl::LegacyToken && access_control.user.id == @model.id
     end
diff --git a/lib/travis/api/v3/routes.rb b/lib/travis/api/v3/routes.rb
@@ -132,6 +132,16 @@ module Routes
         route '/executions'
         get :for_owner
       end
+
+      resource :executions do
+        route '/executions_per_repo'
+        get :for_owner_per_repo
+      end
+
+      resource :executions do
+        route '/executions_per_sender'
+        get :for_owner_per_sender
+      end
     end
 
     resource :repositories do
diff --git a/lib/travis/api/v3/services/executions/for_owner.rb b/lib/travis/api/v3/services/executions/for_owner.rb
@@ -12,8 +12,8 @@ def run!
       raise NotFound unless owner
       raise InsufficientAccess unless access_control.visible?(owner)
 
-      result query(:executions).for_owner(owner, access_control.user.id, params['page'], params['per_page'],
-                                          params['from'], params['to'])
+      result query(:executions).for_owner(owner, access_control.user.id, params['page'] || 0,
+                                          params['per_page'] || 0, params['from'], params['to'])
     end
   end
 end
diff --git a/lib/travis/api/v3/services/executions/for_owner_per_repo.rb b/lib/travis/api/v3/services/executions/for_owner_per_repo.rb
@@ -0,0 +1,48 @@
+module Travis::API::V3
+  class Services::Executions::ForOwnerPerRepo < Service
+    params :from, :to
+    result_type :executions_per_repo
+
+    def run!
+      raise MethodNotAllowed if Travis.config.org?
+      raise LoginRequired unless access_control.logged_in?
+
+      owner = query(:owner).find
+
+      raise NotFound unless owner
+      raise InsufficientAccess unless access_control.visible?(owner)
+
+      results = query(:executions).for_owner(owner, access_control.user.id, 0, 0,
+                                             params['from'], params['to'])
+      result recuce_by_repo(results)
+    end
+
+    def recuce_by_repo(results) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      reduced = []
+      results.each do |item|
+        minutes_consumed = calculate_minutes(item.started_at, item.finished_at)
+        obj = reduced.find { |one| one[:repository_id] == item.repository_id && one[:os] == item.os }
+        if obj
+          obj[:credits_consumed] += item.credits_consumed
+          obj[:minutes_consumed] += minutes_consumed
+        else
+          repo = Travis::API::V3::Models::Repository.find(item.repository_id)
+          reduced << {
+            repository_id: item.repository_id,
+            os: item.os,
+            credits_consumed: item.credits_consumed,
+            minutes_consumed: minutes_consumed,
+            repository: Renderer.render_model(repo, mode: :standard)
+          }
+        end
+      end
+      reduced
+    end
+
+    def calculate_minutes(start, finish)
+      return 0 if start.to_s.empty? || finish.to_s.empty?
+
+      ((Time.parse(finish.to_s) - Time.parse(start.to_s)) / 60.to_f).ceil
+    end
+  end
+end
diff --git a/lib/travis/api/v3/services/executions/for_owner_per_sender.rb b/lib/travis/api/v3/services/executions/for_owner_per_sender.rb
@@ -0,0 +1,47 @@
+module Travis::API::V3
+  class Services::Executions::ForOwnerPerSender < Service
+    params :from, :to
+    result_type :executions_per_sender
+
+    def run!
+      raise MethodNotAllowed if Travis.config.org?
+      raise LoginRequired unless access_control.logged_in?
+
+      owner = query(:owner).find
+
+      raise NotFound unless owner
+      raise InsufficientAccess unless access_control.visible?(owner)
+
+      results = query(:executions).for_owner(owner, access_control.user.id, 0, 0,
+                                             params['from'], params['to'])
+      result recuce_by_sender(results)
+    end
+
+    def recuce_by_sender(results) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      reduced = []
+      results.each do |item|
+        minutes_consumed = calculate_minutes(item.started_at, item.finished_at)
+        obj = reduced.find { |one| one[:sender_id] == item.sender_id }
+        if obj
+          obj[:credits_consumed] += item.credits_consumed
+          obj[:minutes_consumed] += minutes_consumed
+        else
+          sender = Travis::API::V3::Models::User.find(item.sender_id)
+          reduced << {
+            credits_consumed: item.credits_consumed,
+            minutes_consumed: minutes_consumed,
+            sender_id: item.sender_id,
+            sender: Renderer.render_model(sender, mode: :standard, show_email: true)
+          }
+        end
+      end
+      reduced
+    end
+
+    def calculate_minutes(start, finish)
+      return 0 if start.to_s.empty? || finish.to_s.empty?
+
+      ((Time.parse(finish.to_s) - Time.parse(start.to_s)) / 60.to_f).ceil
+    end
+  end
+end
diff --git a/spec/lib/travis/api/enqueue/services/restart_model_spec.rb b/spec/lib/travis/api/enqueue/services/restart_model_spec.rb
@@ -0,0 +1,92 @@
+describe Travis::Enqueue::Services::RestartModel do
+  let(:owner) { FactoryBot.create(:user) }
+  let(:repository) { FactoryBot.create(:repository, owner: owner) }
+  let(:job) { FactoryBot.create(:job, repository: repository, state: 'canceled') }
+  let(:user) { FactoryBot.create(:user) }
+
+  let(:service) { Travis::Enqueue::Services::RestartModel.new(user, { job_id: job.id }) }
+
+  before do
+    Travis.config.billing.url = 'http://localhost:9292/'
+    Travis.config.billing.auth_key = 'secret'
+
+    stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
+      body: MultiJson.dump(allowed: true, rejection_code: nil)
+    )
+  end
+
+  after do
+    Travis.config.billing.url = nil
+    Travis.config.billing.auth_key = nil
+  end
+
+  describe 'push' do
+    let(:payload) { { id: job.id, user_id: user.id } }
+
+    subject { service.push('job:restart', payload) }
+
+    shared_examples 'restarts the job' do
+      it do
+        expect(subject.value).to eq({ id: job.id, user_id: user.id })
+        expect(subject.error).to eq(nil)
+      end
+    end
+
+    shared_examples 'does not restart the job' do
+      it do
+        expect(subject.value).to eq(nil)
+        expect(subject.error).to eq('restart failed')
+      end
+    end
+
+    context 'build permissions' do
+      context 'when owner is a user' do
+        context 'on repo level' do
+          context 'when value is nil' do
+            before { repository.permissions.create(user: user, build: nil) }
+
+            include_examples 'restarts the job'
+          end
+
+          context 'when value is true' do
+            before { repository.permissions.create(user: user, build: true) }
+
+            include_examples 'restarts the job'
+          end
+
+          context 'when value is false' do
+            before { repository.permissions.create(user: user, build: false) }
+
+            include_examples 'does not restart the job'
+          end
+        end
+      end
+
+      context 'when owner is an organization' do
+        let(:owner) { FactoryBot.create(:org) }
+
+        before { repository.permissions.create(user: user, build: true) }
+
+        context 'on organization level' do
+          context 'when value is nil' do
+            before { owner.memberships.create(user: user, build_permission: nil) }
+
+            include_examples 'restarts the job'
+          end
+
+          context 'when value is true' do
+            before { owner.memberships.create(user: user, build_permission: true) }
+
+            include_examples 'restarts the job'
+          end
+
+          context 'when value is false' do
+            before { owner.memberships.create(user: user, build_permission: false) }
+
+            include_examples 'does not restart the job'
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/billing_spec_helper.rb b/spec/support/billing_spec_helper.rb
@@ -272,14 +272,14 @@ def billing_executions_response_body(attributes = {})
         'virtualization_type' => 'vm',
         'queue' => 'builds.gce-oss',
         'job_id' => 123,
-        'repository_id' => 123,
+        'repository_id' => 1,
         'owner_id' => 1,
         'owner_type' => 'User',
         'plan_id' => 2,
         'sender_id' => 1,
         'credits_consumed' => 5,
         'started_at' => Time.now,
-        'finished_at' => Time.now,
+        'finished_at' => Time.now + 10.minutes,
         'created_at' => Time.now,
         'updated_at' => Time.now
       }.deep_merge(attributes)
diff --git a/spec/v3/queries/build_permissions_spec.rb b/spec/v3/queries/build_permissions_spec.rb
@@ -5,28 +5,45 @@
 
   describe '#find_for_repo' do
     let(:repo) { FactoryBot.create(:repository) }
-
-    before { repo.permissions.create(build: true, user: user) }
+    let!(:permission) { repo.permissions.create(build: true, user: user) }
 
     it 'returns permissions for repo' do
       perms = subject.find_for_repo(repo)
 
       expect(perms.first.build).to eq(true)
       expect(perms.first.user.id).to eq(user.id)
     end
+
+    context 'when permission has user_id: nil' do
+      let!(:permission) { repo.permissions.create(build: true, user_id: nil) }
+
+      it 'filters it out' do
+        perms = subject.find_for_repo(repo)
+        expect(perms.length).to eq(0)
+      end
+    end
   end
 
   describe '#find_for_organization' do
     let(:organization) { FactoryBot.create(:org) }
 
-    before { organization.memberships.create(user: user, role: 'admin', build_permission: true) }
+    let!(:membership) { organization.memberships.create(user: user, role: 'admin', build_permission: true) }
 
     it 'returns build memberships for organization' do
       perms = subject.find_for_organization(organization)
 
       expect(perms.first.build_permission).to eq(true)
       expect(perms.first.user.id).to eq(user.id)
     end
+
+    context 'when membership has user_id: nil' do
+      let!(:membership) { organization.memberships.create(user_id: nil, role: 'admin', build_permission: true) }
+
+      it 'filters it out' do
+        perms = subject.find_for_organization(organization)
+        expect(perms.length).to eq(0)
+      end
+    end
   end
 
   describe '#update_for_repo' do
diff --git a/spec/v3/services/v2_subscription/executions_spec.rb b/spec/v3/services/v2_subscription/executions_spec.rb
