WIP - refactored events to use build serializer, related spec passing

1 files changed, 10 insertions, 4 deletions

diff --git a/app/serializers/analytics_build_entity.rb b/app/serializers/analytics_build_entity.rb
index 7ed89f1f347..a07f0beccd4 100644
--- a/app/serializers/analytics_build_entity.rb
+++ b/app/serializers/analytics_build_entity.rb
@@ -2,17 +2,23 @@ class AnalyticsBuildEntity < Grape::Entity
   include RequestAwareEntity
 
   expose :name
+  expose :id
   expose :ref, as: :branch
   expose :short_sha
   expose :started_at, as: :date
   expose :duration, as: :total_time
+  expose :author, using: UserEntity
 
-  expose :url do |build|
-    url_to(:namespace_project_build, build)
+  expose :branch do
+    expose :ref, as: :name
+
+    expose :url do |build|
+      url_to(:namespace_project_tree, build, build.ref)
+    end
   end
 
-  expose :branch_url do |build|
-    url_to(:namespace_project_tree, build, build.ref)
+  expose :url do |build|
+    url_to(:namespace_project_build, build)
   end
 
   expose :commit_url do |build|