From 5b14252ecdd271f1e8baa0548198b44456a1a5b3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 17 Apr 2023 16:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=B4=A1=E7=8C=AE?= =?UTF-8?q?=E8=80=85=E4=BB=A3=E7=A0=81=E8=A1=8C=E6=A0=B9=E6=8D=AEscore?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user.rb | 6 +++--- app/views/api/v1/projects/contributors/stat.json.jbuilder | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index c67858032..3f74df9f4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -877,10 +877,10 @@ class User < Owner end end - def self.develop_score(user_id=User.current.id) + def self.develop_score(commit_count, user_id=User.current.id) user_date_statistic_key = "v2-user-statistic:#{user_id}" follow_count = $redis_cache.hget(user_date_statistic_key, "follow-count") || 0 - pullrequest_count = $redis_cache.hget(user_date_statistic_key, "pullrequest-count") || 0 + pullrequest_count = $redis_cache.hget(user_date_statistic_key, "pullrequest-count").to_i || 0 issues_count = $redis_cache.hget(user_date_statistic_key, "issue-count") || 0 project_count = $redis_cache.hget(user_date_statistic_key, "project-count") || 0 fork_count = $redis_cache.hget(user_date_statistic_key, "fork-count") || 0 @@ -888,7 +888,7 @@ class User < Owner project_praises_count = $redis_cache.hget(user_date_statistic_key, "project-praise-count") || 0 project_language = $redis_cache.hget(user_date_statistic_key, "project-language") project_languages_count = project_language.nil? || project_language == "{}" ? 0 : JSON.parse(project_language).length - + pullrequest_count += commit_count influence = (60.0 + follow_count.to_i / (follow_count.to_i + 20.0) * 40.0).to_i contribution = (60.0 + pullrequest_count.to_i / (pullrequest_count.to_i + 20.0) * 40.0).to_i activity = (60.0 + issues_count.to_i / (issues_count.to_i + 80.0) * 40.0).to_i diff --git a/app/views/api/v1/projects/contributors/stat.json.jbuilder b/app/views/api/v1/projects/contributors/stat.json.jbuilder index 44bdbbeae..f0e91225a 100644 --- a/app/views/api/v1/projects/contributors/stat.json.jbuilder +++ b/app/views/api/v1/projects/contributors/stat.json.jbuilder @@ -1,8 +1,10 @@ json.total_count @result_object[:total_data].to_i -json.contributors @result_object[:data].each do |contributor| +result_arr = @result_object[:data] +result_arr = result_arr.sort_by!{|c| User.develop_score(c["commits"])}.reverse +json.contributors result_arr.each do |contributor| user = $redis_cache.hgetall("v2-owner-common:#{contributor["name"]}-#{contributor["email"]}") if user.blank? - json.score 300 + json.score User.develop_score(contributor["commits"]) json.contributions contributor["commits"] json.additions contributor["additions"] json.deletions contributor["deletions"] @@ -13,7 +15,7 @@ json.contributors @result_object[:data].each do |contributor| json.name contributor["name"] json.image_url User::Avatar.get_letter_avatar_url(contributor["name"]) else - json.score User.develop_score(user["id"]) + json.score User.develop_score(contributor["commits"]) json.contributions contributor["commits"] json.additions contributor["additions"] json.deletions contributor["deletions"]