From ef9f8677e65b4b791550daad4ebff8ae50c2f0d2 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 31 Oct 2014 12:08:45 +0200
Subject: [PATCH] Expose author username in project events API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 doc/api/projects.md                | 3 +++
 lib/api/entities.rb                | 6 ++++++
 spec/requests/api/projects_spec.rb | 1 +
 3 files changed, 10 insertions(+)

diff --git a/doc/api/projects.md b/doc/api/projects.md
index dfe3502b6e46..0055e2e476f9 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -186,6 +186,7 @@ Parameters:
     "target_id": 830,
     "target_type": "Issue",
     "author_id": 1,
+    "author_username": "john",
     "data": null,
     "target_title": "Public project search field"
   },
@@ -196,6 +197,7 @@ Parameters:
     "target_id": null,
     "target_type": null,
     "author_id": 1,
+    "author_username": "john",
     "data": {
       "before": "50d4420237a9de7be1304607147aec22e4a14af7",
       "after": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
@@ -231,6 +233,7 @@ Parameters:
     "target_id": 840,
     "target_type": "Issue",
     "author_id": 1,
+    "author_username": "john",
     "data": null,
     "target_title": "Finish & merge Code search PR"
   }
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index d19caf5b23aa..4e7b1c91c4e5 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -183,6 +183,12 @@ class Event < Grape::Entity
       expose :target_id, :target_type, :author_id
       expose :data, :target_title
       expose :created_at
+
+      expose :author_username do |event, options|
+        if event.author
+          event.author.username
+        end
+      end
     end
 
     class Namespace < Grape::Entity
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index ba7ec7b2be90..cb7a27055736 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -339,6 +339,7 @@
 
       json_event['action_name'].should == 'joined'
       json_event['project_id'].to_i.should == project.id
+      json_event['author_username'].should == user.username
     end
 
     it "should return a 404 error if not found" do