Merge pull request #1221 from travis-ci/bug-fix-cycle-5

Bugfix cycle 5

Author: travis-architect

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

@@ -2,7 +2,7 @@ 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, :user_license_credits_consumed, :started_at,
-                :finished_at, :created_at, :updated_at
+                :finished_at, :created_at, :updated_at, :sender_login, :repo_slug, :repo_owner_name
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')
@@ -23,6 +23,21 @@ def initialize(attributes = {})
       @finished_at = attributes.fetch('finished_at')
       @created_at = attributes.fetch('created_at')
       @updated_at = attributes.fetch('updated_at')
+      @sender_login = nil
+      @repo_slug = nil
+      @repo_owner_name = nil
+    end
+
+    def sender_login=(sender_login)
+      @sender_login = sender_login
+    end
+
+    def repo_slug=(repo_slug)
+      @repo_slug = repo_slug
+    end
+
+    def repo_owner_name=(repo_owner_name)
+      @repo_owner_name = repo_owner_name
     end
   end
 end

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

@@ -1,13 +1,14 @@
 module Travis::API::V3
   class Models::Invoice
-    attr_reader :id, :created_at, :status, :url, :amount_due
+    attr_reader :id, :created_at, :status, :url, :amount_due, :cc_last_digits
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')
       @created_at = attributes.fetch('created_at') && DateTime.parse(attributes.fetch('created_at'))
       @status = attributes.fetch('status')
       @url = attributes.fetch('url')
       @amount_due = attributes.fetch('amount_due')
+      @cc_last_digits = attributes.fetch('cc_last_digits')
     end
   end
 end

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

@@ -1,8 +1,8 @@
 module Travis::API::V3
   class Renderer::Execution < ModelRenderer
     representation :minimal, :id, :os, :instance_size, :arch, :virtualization_type, :queue, :job_id,
-                   :repository_id, :owner_id, :owner_type, :plan_id, :sender_id, :credits_consumed,
-                   :user_license_credits_consumed, :started_at, :finished_at, :created_at, :updated_at
+                   :repository_id, :owner_id, :owner_type, :plan_id, :sender_id, :credits_consumed, :started_at,
+                   :user_license_credits_consumed, :finished_at, :created_at, :updated_at, :sender_login, :repo_slug, :repo_owner_name
     representation :standard, *representations[:minimal]
   end
 end

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

@@ -1,5 +1,5 @@
 module Travis::API::V3
   class Renderer::Invoice < ModelRenderer
-    representation(:standard, :id, :created_at, :status, :url, :amount_due)
+    representation(:standard, :id, :created_at, :status, :url, :amount_due, :cc_last_digits)
   end
 end

lib/travis/api/v3/services/executions/for_owner.rb

@@ -12,8 +12,23 @@ 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'] || 0,
+      results = query(:executions).for_owner(owner, access_control.user.id, params['page'] || 0,
                                           params['per_page'] || 0, params['from'], params['to'])
+      result presented_results(results)
+    end
+
+    def presented_results(results)
+      senders = Travis::API::V3::Models::User.where(id: results.map(&:sender_id)).index_by(&:id)
+      repositories = Travis::API::V3::Models::Repository.where(id: results.map(&:repository_id)).index_by(&:id)
+      
+      results.map do |execution|
+        execution.sender_login = senders[execution.sender_id]&.login || 'Unknown Sender'
+        repo = repositories[execution.repository_id]
+        execution.repo_slug = repo&.slug || 'Unknown Repository'
+        execution.repo_owner_name = repo&.owner_name || 'Unknown Repository Owner'
+
+        execution
+      end
     end
   end
 end

lib/travis/services/find_caches.rb

@@ -154,7 +154,7 @@ def fetch_s3(cache_objects, options)
         def fetch_gcs(cache_objects, options)
           config = cache_options[:gcs]
           storage     = ::Google::Apis::StorageV1::StorageService.new
-          json_key_io = StringIO.new(config.to_h[:json_key])
+          json_key_io = StringIO.new(JSON.dump(config.to_h[:json_key]))
           bucket_name = config[:bucket_name]
 
           storage.authorization = ::Google::Auth::ServiceAccountCredentials.make_creds(

spec/lib/services/find_caches_spec.rb

@@ -71,7 +71,7 @@
     end
 
     context 'with GCS configuration' do
-      let(:cache_options) { { gcs: { bucket_name: '', json_key: '' } } }
+      let(:cache_options) { { gcs: { bucket_name: '', json_key: { type: 'service_account', project_id: 'test-project-id' } } } }
       its(:size) { is_expected.to eq 0 }
     end
   end

spec/v3/billing_client_spec.rb

@@ -52,10 +52,11 @@
 
     it 'returns a list of invoices' do
       stub_billing_request(:get, "/subscriptions/#{subscription_id}/invoices", auth_key: auth_key, user_id: user_id)
-        .to_return(body: JSON.dump([{'id' => invoice_id, 'created_at' => Time.now, 'url' => 'https://billing-test.travis-ci.com/invoices/111.pdf', amount_due: 999, status: 'paid' }]))
+        .to_return(body: JSON.dump([{'id' => invoice_id, 'created_at' => Time.now, 'url' => 'https://billing-test.travis-ci.com/invoices/111.pdf', amount_due: 999, status: 'paid', cc_last_digits: '4242' }]))
       expect(subject.first).to be_a(Travis::API::V3::Models::Invoice)
       expect(subject.first.id).to eq(invoice_id)
       expect(subject.first.amount_due).to eq(999)
+      expect(subject.first.cc_last_digits).to eq('4242')
     end
 
     it 'returns an empty list if there are no invoices' do
@@ -71,10 +72,11 @@
 
     it 'returns a list of invoices' do
       stub_billing_request(:get, "/v2/subscriptions/#{subscription_id}/invoices", auth_key: auth_key, user_id: user_id)
-        .to_return(body: JSON.dump([{'id' => invoice_id, 'created_at' => Time.now, 'url' => 'https://billing-test.travis-ci.com/invoices/111.pdf', amount_due: 999, status: 'paid' }]))
+        .to_return(body: JSON.dump([{'id' => invoice_id, 'created_at' => Time.now, 'url' => 'https://billing-test.travis-ci.com/invoices/111.pdf', amount_due: 999, status: 'paid', cc_last_digits: '4242' }]))
       expect(subject.first).to be_a(Travis::API::V3::Models::Invoice)
       expect(subject.first.id).to eq(invoice_id)
       expect(subject.first.amount_due).to eq(999)
+      expect(subject.first.cc_last_digits).to eq('4242')
     end
 
     it 'returns an empty list if there are no invoices' do

spec/v3/services/subscription/invoices_spec.rb

@@ -27,9 +27,10 @@
     let(:amount_due) { 100 }
     let(:status) { 'paid' }
     let(:subscription_id) { rand(999) }
+    let(:cc_last_digits) { '4242' }
     before do
       stub_billing_request(:get, "/subscriptions/#{subscription_id}/invoices", auth_key: billing_auth_key, user_id: user.id)
-        .to_return(status: 200, body: JSON.dump([{'id' => invoice_id, 'created_at' => created_at, 'url' => url, 'amount_due' => amount_due, 'status' => status }]))
+        .to_return(status: 200, body: JSON.dump([{'id' => invoice_id, 'created_at' => created_at, 'url' => url, 'amount_due' => amount_due, 'status' => status, 'cc_last_digits' => cc_last_digits }]))
     end
 
     it 'responds with list of subscriptions' do
@@ -47,7 +48,8 @@
           'created_at' => created_at,
           'url' => url,
           'amount_due' => amount_due,
-          'status' => status
+          'status' => status,
+          'cc_last_digits' => cc_last_digits
         }]
       })
     end

spec/v3/services/v2_subscription/executions_spec.rb

@@ -69,7 +69,10 @@
           'started_at' => Time.now.to_s,
           'finished_at' => (Time.now + 10.minutes).to_s,
           'created_at' => Time.now.to_s,
-          'updated_at' => Time.now.to_s
+          'updated_at' => Time.now.to_s,
+          'repo_owner_name' => "svenfuchs",
+          'repo_slug' => "svenfuchs/minimal",
+          'sender_login' => "svenfuchs"
         }]
       })
     end