Merge pull request #1213 from travis-ci/fix_executions_csv_am

Fix executions CSV export

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/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/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

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