Merge branch 'pre_trustie_server' into trustie_server

This commit is contained in:
2023-04-17 16:56:25 +08:00
2 changed files with 8 additions and 6 deletions

View File

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