Honnor committers/users mapping in repository statistics (#13487).

git-svn-id: http://svn.redmine.org/redmine/trunk@13353 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3e5174d2af117511ae01193d496bdc7061e0bb83..55cdb6d882b65bf5bd29c89d763f3230347a0749 100644 (file)
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -421,9 +421,10 @@ class Repository < ActiveRecord::Base
     h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
 
     commits_by_author.inject({}) do |hash, (name, commits_count)|
-      hash[name] = {}
-      hash[name][:commits_count] = commits_count
-      hash[name][:changes_count] = h[name] || 0
+      mapped_name = (find_committer_user(name) || name).to_s
+      hash[mapped_name] ||= { :commits_count => 0, :changes_count => 0 }
+      hash[mapped_name][:commits_count] += commits_count
+      hash[mapped_name][:changes_count] += h[name] || 0
       hash
     end
   end

diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index c23fbccbe55cf4117ae9751e92f2e889f3fcb452..2de4972dcb726d49f2e4db9edd18b4e5042cb23b 100644 (file)
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -399,7 +399,7 @@ class RepositoryTest < ActiveSupport::TestCase
   def test_stats_by_author_reflect_changesets_and_changes
     repository = Repository.find(10)
 
-    expected = {"dlopper"=>{:commits_count=>10, :changes_count=>3}}
+    expected = {"Dave Lopper"=>{:commits_count=>10, :changes_count=>3}}
     assert_equal expected, repository.stats_by_author
 
     set = Changeset.create!(
@@ -411,7 +411,53 @@ class RepositoryTest < ActiveSupport::TestCase
     )
     Change.create!(:changeset => set, :action => 'A', :path => '/path/to/file1')
     Change.create!(:changeset => set, :action => 'A', :path => '/path/to/file2')
-    expected = {"dlopper"=>{:commits_count=>11, :changes_count=>5}}
+    expected = {"Dave Lopper"=>{:commits_count=>11, :changes_count=>5}}
+    assert_equal expected, repository.stats_by_author
+  end
+
+  def test_stats_by_author_honnor_committers
+    # in fact it is really tested above, but let's have a dedicated test
+    # to ensure things are dynamically linked to Users
+    User.find_by_login("dlopper").update_attribute(:firstname, "Dave's")
+    repository = Repository.find(10)
+    expected = {"Dave's Lopper"=>{:commits_count=>10, :changes_count=>3}}
+    assert_equal expected, repository.stats_by_author
+  end
+
+  def test_stats_by_author_doesnt_drop_unmapped_users
+    repository = Repository.find(10)
+    Changeset.create!(
+      :repository => repository,
+      :committer => 'unnamed <foo@bar.net>',
+      :committed_on => Time.now,
+      :revision => 101,
+      :comments => 'Another commit by foo.'
+    )
+
+    assert repository.stats_by_author.has_key?("unnamed <foo@bar.net>")
+  end
+
+  def test_stats_by_author_merge_correctly
+    # as we honnor users->committer map and it's not injective,
+    # we must be sure merges happen correctly and stats are not
+    # wiped out when two source counts map to the same user.
+    #
+    # Here we have Changeset's with committer="dlopper" and others
+    # with committer="dlopper <dlopper@somefoo.net>"
+    repository = Repository.find(10)
+
+    expected = {"Dave Lopper"=>{:commits_count=>10, :changes_count=>3}}
+    assert_equal expected, repository.stats_by_author
+
+    set = Changeset.create!(
+      :repository => repository,
+      :committer => 'dlopper <dlopper@somefoo.net>',
+      :committed_on => Time.now,
+      :revision => 101,
+      :comments => 'Another commit by foo.'
+    )
+
+    expected = {"Dave Lopper"=>{:commits_count=>11, :changes_count=>3}}
     assert_equal expected, repository.stats_by_author
   end
 end