From f9bb74aba46b372caef21f8c596f0d1b13c07ee6 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 25 Oct 2021 16:57:11 +0800 Subject: [PATCH 01/41] add: cache service --- app/helpers/avatar_helper.rb | 26 +++ app/jobs/cache_async_reset_job.rb | 16 ++ app/jobs/cache_async_set_job.rb | 16 ++ app/services/cache/v2/owner_common_service.rb | 89 ++++++++ .../cache/v2/platform_statistic_service.rb | 182 +++++++++++++++ .../cache/v2/project_common_service.rb | 211 ++++++++++++++++++ .../cache/v2/project_date_rank_service.rb | 50 +++++ app/services/cache/v2/project_rank_service.rb | 71 ++++++ .../cache/v2/user_statistic_service.rb | 183 +++++++++++++++ 9 files changed, 844 insertions(+) create mode 100644 app/helpers/avatar_helper.rb create mode 100644 app/jobs/cache_async_reset_job.rb create mode 100644 app/jobs/cache_async_set_job.rb create mode 100644 app/services/cache/v2/owner_common_service.rb create mode 100644 app/services/cache/v2/platform_statistic_service.rb create mode 100644 app/services/cache/v2/project_common_service.rb create mode 100644 app/services/cache/v2/project_date_rank_service.rb create mode 100644 app/services/cache/v2/project_rank_service.rb create mode 100644 app/services/cache/v2/user_statistic_service.rb diff --git a/app/helpers/avatar_helper.rb b/app/helpers/avatar_helper.rb new file mode 100644 index 000000000..b703e1b4e --- /dev/null +++ b/app/helpers/avatar_helper.rb @@ -0,0 +1,26 @@ +module AvatarHelper + def relative_path + "avatars" + end + + def storage_path + File.join(Rails.root, "public", "images", relative_path) + end + + def disk_filename(source_type,source_id,image_file=nil) + File.join(storage_path, "#{source_type}", "#{source_id}") + end + + def url_to_avatar(source) + if File.exist?(disk_filename(source&.class, source&.id)) + ctime = File.ctime(disk_filename(source.class, source.id)).to_i + if %w(User Organization).include?(source.class.to_s) + File.join("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}" + else + File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}" + end + elsif source.class.to_s == 'User' + source.get_letter_avatar_url + end + end +end \ No newline at end of file diff --git a/app/jobs/cache_async_reset_job.rb b/app/jobs/cache_async_reset_job.rb new file mode 100644 index 000000000..a7da3f80e --- /dev/null +++ b/app/jobs/cache_async_reset_job.rb @@ -0,0 +1,16 @@ +class CacheAsyncResetJob < ApplicationJob + queue_as :cache + + def perform(type, id, params={}) + case type + when "owner_common_service" + Cache::V2::OwnerCommonService.new(id).reset + when "platform_statistic_service" + Cache::V2::PlatformStatisticService.new.reset + when "project_common_service" + Cache::V2::ProjectCommonService.new(id).reset + when "user_statistic_service" + Cache::V2::PlatformStatisticService.new(id).reset + end + end +end \ No newline at end of file diff --git a/app/jobs/cache_async_set_job.rb b/app/jobs/cache_async_set_job.rb new file mode 100644 index 000000000..d4f641e19 --- /dev/null +++ b/app/jobs/cache_async_set_job.rb @@ -0,0 +1,16 @@ +class CacheAsyncResetJob < ApplicationJob + queue_as :cache + + def perform(type, id, params={}) + case type + when "owner_common_service" + Cache::V2::OwnerCommonService.new(id, params).call + when "platform_statistic_service" + Cache::V2::PlatformStatisticService.new(params).call + when "project_common_service" + Cache::V2::ProjectCommonService.new(id, params).call + when "user_statistic_service" + Cache::V2::PlatformStatisticService.new(id, params).call + end + end +end \ No newline at end of file diff --git a/app/services/cache/v2/owner_common_service.rb b/app/services/cache/v2/owner_common_service.rb new file mode 100644 index 000000000..d65a60749 --- /dev/null +++ b/app/services/cache/v2/owner_common_service.rb @@ -0,0 +1,89 @@ +class Cache::V2::OwnerCommonService < ApplicationService + include AvatarHelper + attr_reader :owner_id, :login, :name, :avatar_url, :email + attr_accessor :owner + + def initialize(owner_id, params={}) + @owner_id = owner_id + @name = params[:name] + @email = params[:email] + end + + def read + owner_common + end + + def call + load_owner + set_owner_common + end + + def reset + reset_owner_common + end + + private + def load_owner + @owner = User.find_by_id(@owner_id) + end + + def owner_common_key + "v2-owner-common:#{@owner_id}" + end + + def owner_common + $redis_cache.hgetall(owner_common_key).blank? ? reset_owner_common : $redis_cache.hgetall(owner_common_key) + end + + def set_owner_common + if $redis_cache.hgetall(owner_common_key).blank? + reset_owner_common + return + end + if @name.present? + if $redis_cache.hget(owner_common_key, "name").nil? + reset_owner_name + else + $redis_cache.hset(owner_common_key, "name", @name) + $redis_cache.hset(owner_common_key, "avatar_url", url_to_avatar(owner)) + end + end + if @email.present? + if $redis_cache.hget(owner_common_key, "email").nil? + reset_owner_email + else + $redis_cache.hset(owner_common_key, "email", @email) + end + end + + $redis_cache.hgetall(owner_common_key) + end + + def reset_owner_type + $redis_cache.hset(owner_common_key, "type", owner&.type) + end + + def reset_owner_login + $redis_cache.hset(owner_common_key, "login", owner&.login) + end + + def reset_owner_email + $redis_cache.hset(owner_common_key, "email", owner&.mail) + end + + def reset_owner_name + $redis_cache.hset(owner_common_key, "name", owner&.real_name) + $redis_cache.hset(owner_common_key, "avatar_url", url_to_avatar(owner)) + end + + def reset_owner_common + load_owner + $redis_cache.del(owner_common_key) + reset_owner_type + reset_owner_login + reset_owner_email + reset_owner_name + + $redis_cache.hgetall(owner_common_key) + end +end \ No newline at end of file diff --git a/app/services/cache/v2/platform_statistic_service.rb b/app/services/cache/v2/platform_statistic_service.rb new file mode 100644 index 000000000..bc6621a38 --- /dev/null +++ b/app/services/cache/v2/platform_statistic_service.rb @@ -0,0 +1,182 @@ +class Cache::V2::PlatformStatisticService < ApplicationService + attr_reader :follow_count, :fork_count, :issue_count, :project_count, :project_language_count_key, :project_language_count, :project_praise_count, :project_watcher_count, :pullrequest_count + + def initialize(params={}) + @follow_count = params[:follow_count] + @fork_count = params[:fork_count] + @issue_count = params[:issue_count] + @project_count = params[:project_count] + @project_language_count_key = params[:project_language_count_key] + @project_language_count = params[:project_language_count] + @project_praise_count = params[:project_praise_count] + @project_watcher_count = params[:project_watcher_count] + @pullrequest_count = params[:pullrequest_count] + end + + def read + platform_statistic + end + + def call + set_platform_statistic + end + + def reset + reset_platform_statistic + end + + private + + def platform_statistic_key + "v2-platform-statistic" + end + + def follow_count_key + "follow-count" + end + + def fork_count_key + "fork-count" + end + + def issue_count_key + "issue-count" + end + + def project_count_key + "project-count" + end + + def project_language_key + "project-language" + end + + def project_praise_count_key + "project-praise-count" + end + + def project_watcher_count_key + "project-watcher-count" + end + + def pullrequest_count_key + "pullrequest-count" + end + + def platform_statistic + $redis_cache.hgetall(platform_statistic_key).blank? ? reset_platform_statistic : $redis_cache.hgetall(platform_statistic_key) + end + + def set_platform_statistic + if $redis_cache.hgetall(platform_statistic_key).blank? + reset_platform_statistic + return + end + if @follow_count.present? + if $redis_cache.hget(platform_statistic_key, follow_count_key).nil? + reset_platform_follow_count + else + $redis_cache.hincrby(platform_statistic_key, follow_count_key, @follow_count) + end + end + if @fork_count.present? + if $redis_cache.hget(platform_statistic_key, fork_count_key).nil? + reset_platform_fork_count + else + $redis_cache.hincrby(platform_statistic_key, fork_count_key, @fork_count) + end + end + if @issue_count.present? + if $redis_cache.hget(platform_statistic_key, issue_count_key).nil? + reset_platform_issue_count + else + $redis_cache.hincrby(platform_statistic_key, issue_count_key, @issue_count) + end + end + if @project_count.present? + if $redis_cache.hget(platform_statistic_key, project_count_key).nil? + reset_platform_project_count + else + $redis_cache.hincrby(platform_statistic_key, project_count_key, @project_count) + end + end + if @project_language_count_key.present? && project_language_count.present? + if $redis_cache.hget(platform_statistic_key, project_language_key).nil? + reset_platform_project_language + else + result = JSON.parse($redis_cache.hget(platform_statistic_key, project_language_key)) + result[@project_language_count_key] ||= 0 + result[@project_language_count_key] += project_language_count.to_i + $redis_cache.hset(platform_statistic_key, project_language_key, result.to_json) + end + end + if @project_praise_count.present? + if $redis_cache.hget(platform_statistic_key, project_praise_count_key).nil? + reset_platform_project_praise_count + else + $redis_cache.hincrby(platform_statistic_key, project_praise_count_key, @project_praise_count) + end + end + if @project_watcher_count.present? + if $redis_cache.hget(platform_statistic_key, project_watcher_count_key).nil? + reset_platform_project_watcher_count + else + $redis_cache.hincrby(platform_statistic_key, project_watcher_count_key, @project_watcher_count) + end + end + if @pullrequest_count.present? + if $redis_cache.hget(platform_statistic_key, pullrequest_count_key).nil? + reset_platform_pullrequest_count + else + $redis_cache.hincrby(platform_statistic_key, pullrequest_count_key, @pullrequest_count) + end + end + $redis_cache.hgetall(platform_statistic_key) + end + + def reset_platform_follow_count + $redis_cache.hset(platform_statistic_key, follow_count_key, Watcher.where(watchable_type: 'User').count) + end + + def reset_platform_fork_count + $redis_cache.hset(platform_statistic_key, fork_count_key, ForkUser.count) + end + + def reset_platform_issue_count + $redis_cache.hset(platform_statistic_key, issue_count_key, Issue.count) + end + + def reset_platform_project_count + $redis_cache.hset(platform_statistic_key, project_count_key, Project.count) + end + + def reset_platform_project_language + $redis_cache.hset(platform_statistic_key, project_language_key, ProjectLanguage.where.not(projects_count: 0).group("project_languages.name").sum(:projects_count).to_json) + end + + def reset_platform_project_praise_count + $redis_cache.hset(platform_statistic_key, project_praise_count_key, PraiseTread.where(praise_tread_object_type: "Project").count) + end + + def reset_platform_project_watcher_count + $redis_cache.hset(platform_statistic_key, project_watcher_count_key, Watcher.where(watchable_type: 'Project').count) + end + + def reset_platform_pullrequest_count + $redis_cache.hset(platform_statistic_key, pullrequest_count_key, PullRequest.count) + end + + def reset_platform_statistic + $redis_cache.del(platform_statistic_key) + reset_platform_follow_count + reset_platform_fork_count + reset_platform_issue_count + reset_platform_project_count + reset_platform_project_language + reset_platform_project_praise_count + reset_platform_project_watcher_count + reset_platform_pullrequest_count + + $redis_cache.hgetall(platform_statistic_key) + end +end \ No newline at end of file diff --git a/app/services/cache/v2/project_common_service.rb b/app/services/cache/v2/project_common_service.rb new file mode 100644 index 000000000..365f07a6e --- /dev/null +++ b/app/services/cache/v2/project_common_service.rb @@ -0,0 +1,211 @@ +class Cache::V2::ProjectCommonService < ApplicationService + attr_reader :project_id, :owner_id, :name, :identifier, :visits, :watchers, :praises, :forks, :issues, :pullrequests + attr_accessor :project + + def initialize(project_id, params={}) + @project_id = project_id + @owner_id = params[:owner_id] + @name = params[:name] + @identifier = params[:identifier] + @visits = params[:visits] + @watchers = params[:watchers] + @praises = params[:praises] + @forks = params[:forks] + @issues = params[:issues] + @pullrequests = params[:pullrequests] + end + + def read + project_common + end + + def call + set_project_common + end + + def reset + reset_project_common + end + + private + def load_project + @project = Project.find_by_id(project_id) + end + + def project_common_key + "v2-project-common:#{@project_id}" + end + + def owner_id_key + "owner_id" + end + + def name_key + "name" + end + + def identifier_key + "identifier" + end + + def visits_key + "visits" + end + + def watchers_key + "watchers" + end + + def praises_key + "praises" + end + + def forks_key + "forks" + end + + def issues_key + "issues" + end + + def pullrequests_key + "pullrequests" + end + + def project_common + $redis_cache.hgetall(project_common_key).blank? ? reset_project_common : $redis_cache.hgetall(project_common_key) + end + + def set_project_common + if $redis_cache.hgetall(project_common_key).blank? + reset_project_common + return + end + if @owner_id.present? + if $redis_cache.hget(project_common_key, owner_id_key).nil? + reset_project_owner_id + else + $redis_cache.hset(project_common_key, owner_id_key, @owner_id) + end + end + if @name.present? + if $redis_cache.hget(project_common_key, name_key).nil? + reset_project_name + else + $redis_cache.hset(project_common_key, name_key, @name) + end + end + if @identifier.present? + if $redis_cache.hget(project_common_key, identifier_key).nil? + reset_project_identifier + else + $redis_cache.hset(project_common_key, identifier_key, @identifier) + end + end + if @visits.present? + if $redis_cache.hget(project_common_key, visits_key).nil? + reset_project_visits + else + $redis_cache.hincrby(project_common_key, visits_key, @visits) + Cache::V2::ProjectRankService.call(@project_id, {visits: @visits}) + Cache::V2::ProjectDateRankService.call(@project_id, {visits: @visits}) + end + end + if @watchers.present? + if $redis_cache.hget(project_common_key, watchers_key).nil? + reset_project_watchers + else + $redis_cache.hincrby(project_common_key, watchers_key, @watchers) + end + end + if @praises.present? + if $redis_cache.hget(project_common_key, praises_key).nil? + reset_project_praises + else + $redis_cache.hincrby(project_common_key, praises_key, @praises) + Cache::V2::ProjectRankService.call(@project_id, {praises: @praises}) + Cache::V2::ProjectDateRankService.call(@project_id, {praises: @praises}) + end + end + if @forks.present? + if $redis_cache.hget(project_common_key, forks_key).nil? + reset_project_forks + else + $redis_cache.hincrby(project_common_key, forks_key, @forks) + Cache::V2::ProjectRankService.call(@project_id, {forks: @forks}) + Cache::V2::ProjectDateRankService.call(@project_id, {forks: @forks}) + end + end + if @issues.present? + if $redis_cache.hget(project_common_key, issues_key).nil? + reset_project_issues + else + $redis_cache.hincrby(project_common_key, issues_key, @issues) + Cache::V2::ProjectRankService.call(@project_id, {issues: @issues}) + Cache::V2::ProjectDateRankService.call(@project_id, {issues: @issues}) + end + end + if @pullrequests.present? + if $redis_cache.hget(project_common_key, pullrequests_key).nil? + reset_project_pullrequests + else + $redis_cache.hincrby(project_common_key, pullrequests_key, @pullrequests) + Cache::V2::ProjectRankService.call(@project_id, {pullrequests: @pullrequests}) + Cache::V2::ProjectDateRankService.call(@project_id, {pullrequests: @pullrequests}) + end + end + $redis_cache.hgetall(project_common_key) + end + + def reset_project_owner_id + $redis_cache.hset(project_common_key, owner_id_key, @project&.user_id) + end + + def reset_project_name + $redis_cache.hset(project_common_key, name_key, @project&.name) + end + + def reset_project_identifier + $redis_cache.hset(project_common_key, identifier_key, @project&.identifier) + end + + def reset_project_visits + $redis_cache.hset(project_common_key, visits_key, @project&.visits) + end + + def reset_project_watchers + $redis_cache.hset(project_common_key, watchers_key, Watcher.where(watchable_type: 'Project', watchable_id: @project_id).count) + end + + def reset_project_praises + $redis_cache.hset(project_common_key, praises_key, PraiseTread.where(praise_tread_object_type: 'Project', praise_tread_object_id: @project_id).count) + end + + def reset_project_forks + $redis_cache.hset(project_common_key, forks_key, ForkUser.where(project_id: @project_id).count) + end + + def reset_project_issues + $redis_cache.hset(project_common_key, issues_key, Issue.where(project_id: @project_id).count) + end + + def reset_project_pullrequests + $redis_cache.hset(project_common_key, pullrequests_key, PullRequest.where(project_id: @project_id).count) + end + + def reset_project_common + load_project + $redis_cache.del(project_common_key) + reset_project_owner_id + reset_project_name + reset_project_identifier + reset_project_visits + reset_project_watchers + reset_project_praises + reset_project_forks + reset_project_issues + reset_project_pullrequests + + $redis_cache.hgetall(project_common_key) + end +end \ No newline at end of file diff --git a/app/services/cache/v2/project_date_rank_service.rb b/app/services/cache/v2/project_date_rank_service.rb new file mode 100644 index 000000000..38c11c9b9 --- /dev/null +++ b/app/services/cache/v2/project_date_rank_service.rb @@ -0,0 +1,50 @@ +class Cache::V2::ProjectDateRankService < ApplicationService + attr_reader :project_id, :rank_date, :visits, :praises, :forks, :issues, :pullrequests + attr_accessor :project_common + + def initialize(project_id, rank_date=Date.today, params={}) + @project_id = project_id + @visits = params[:visits] + @praises = params[:praises] + @forks = params[:forks] + @issues = params[:issues] + @pullrequests = params[:pullrequests] + end + + def read + project_rank + end + + def call + set_project_rank + end + + private + def project_rank_key + "v2-project-rank-#{rank_date.to_s}" + end + + def project_rank + $redis_cache.zscore(project_rank_key, @project_id) + end + + def set_project_rank + if @visits.present? + $redis_cache.zincrby(project_rank_key, @visits.to_i * 1, @project_id) + end + if @praises.present? + $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) + end + if @forks.present? + $redis_cache.zincrby(project_rank_key, @forks.to_i * 5, @project_id) + end + if @issues.present? + $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) + end + if @pullrequests.present? + $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) + end + + $redis_cache.zscore(project_rank_key, @project_id) + end +end \ No newline at end of file diff --git a/app/services/cache/v2/project_rank_service.rb b/app/services/cache/v2/project_rank_service.rb new file mode 100644 index 000000000..089258d96 --- /dev/null +++ b/app/services/cache/v2/project_rank_service.rb @@ -0,0 +1,71 @@ +class Cache::V2::ProjectRankService < ApplicationService + attr_reader :project_id, :visits, :praises, :forks, :issues, :pullrequests + attr_accessor :project_common + + def initialize(project_id, params={}) + @project_id = project_id + @visits = params[:visits] + @praises = params[:praises] + @forks = params[:forks] + @issues = params[:issues] + @pullrequests = params[:pullrequests] + end + + def read + project_rank + end + + def call + set_project_rank + end + + def reset + reset_project_rank + end + + private + def load_project_common + @project_common = Cache::V2::ProjectCommonService.new(@project_id).read + end + + def project_rank_key + "v2-project-rank" + end + + def project_rank + $redis_cache.zscore(project_rank_key, @project_id).blank? ? reset_project_rank : $redis_cache.zscore(project_rank_key, @project_id) + end + + def set_project_rank + if $redis_cache.zscore(project_rank_key, @project_id).blank? + reset_project_rank + return + end + if @visits.present? + $redis_cache.zincrby(project_rank_key, @visits.to_i * 1, @project_id) + end + if @praises.present? + $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) + end + if @forks.present? + $redis_cache.zincrby(project_rank_key, @forks.to_i * 5, @project_id) + end + if @issues.present? + $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) + end + if @pullrequests.present? + $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) + end + + $redis_cache.zscore(project_rank_key, @project_id) + end + + def reset_project_rank + load_project_common + $redis_cache.zrem(project_rank_key, @project_id) + score = @project_common["visits"].to_i * 1 + @project_common["praises"].to_i * 5 + @project_common["forks"].to_i * 5 + @project_common["issues"].to_i * 10 + @project_common["pullrequests"].to_i * 10 + $redis_cache.zincrby(project_rank_key, score, @project_id) + + $redis_cache.zscore(project_rank_key, @project_id) + end +end \ No newline at end of file diff --git a/app/services/cache/v2/user_statistic_service.rb b/app/services/cache/v2/user_statistic_service.rb new file mode 100644 index 000000000..0df49c8ae --- /dev/null +++ b/app/services/cache/v2/user_statistic_service.rb @@ -0,0 +1,183 @@ +class Cache::V2::UserStatisticService < ApplicationService + attr_reader :user_id, :follow_count, :fork_count, :issue_count, :project_count, :project_language_count_key, :project_language_count, :project_praise_count, :project_watcher_count, :pullrequest_count + + def initialize(user_id, params={}) + @user_id = user_id + @follow_count = params[:follow_count] + @fork_count = params[:fork_count] + @issue_count = params[:issue_count] + @project_count = params[:project_count] + @project_language_count_key = params[:project_language_count_key] + @project_language_count = params[:project_language_count] + @project_praise_count = params[:project_praise_count] + @project_watcher_count = params[:project_watcher_count] + @pullrequest_count = params[:pullrequest_count] + end + + def read + user_statistic + end + + def call + set_user_statistic + end + + def reset + reset_user_statistic + end + + private + + def user_statistic_key + "v2-user-statistic:#{@user_id}" + end + + def follow_count_key + "follow-count" + end + + def fork_count_key + "fork-count" + end + + def issue_count_key + "issue-count" + end + + def project_count_key + "project-count" + end + + def project_language_key + "project-language" + end + + def project_praise_count_key + "project-praise-count" + end + + def project_watcher_count_key + "project-watcher-count" + end + + def pullrequest_count_key + "pullrequest-count" + end + + def user_statistic + $redis_cache.hgetall(user_statistic_key).blank? ? reset_user_statistic : $redis_cache.hgetall(user_statistic_key) + end + + def set_user_statistic + if $redis_cache.hgetall(user_statistic_key).blank? + reset_user_statistic + return + end + if @follow_count.present? + if $redis_cache.hget(user_statistic_key, follow_count_key).nil? + reset_user_follow_count + else + $redis_cache.hincrby(user_statistic_key, follow_count_key, @follow_count) + end + end + if @fork_count.present? + if $redis_cache.hget(user_statistic_key, fork_count_key).nil? + reset_user_fork_count + else + $redis_cache.hincrby(user_statistic_key, fork_count_key, @fork_count) + end + end + if @issue_count.present? + if $redis_cache.hget(user_statistic_key, issue_count_key).nil? + reset_user_issue_count + else + $redis_cache.hincrby(user_statistic_key, issue_count_key, @issue_count) + end + end + if @project_count.present? + if $redis_cache.hget(user_statistic_key, project_count_key).nil? + reset_user_project_count + else + $redis_cache.hincrby(user_statistic_key, project_count_key, @project_count) + end + end + if @project_language_count_key.present? && project_language_count.present? + if $redis_cache.hget(user_statistic_key, project_language_key).nil? + reset_user_project_language + else + result = JSON.parse($redis_cache.hget(user_statistic_key, project_language_key)) + result[@project_language_count_key] ||= 0 + result[@project_language_count_key] += project_language_count.to_i + $redis_cache.hset(user_statistic_key, project_language_key, result.to_json) + end + end + if @project_praise_count.present? + if $redis_cache.hget(user_statistic_key, project_praise_count_key).nil? + reset_user_project_praise_count + else + $redis_cache.hincrby(user_statistic_key, project_praise_count_key, @project_praise_count) + end + end + if @project_watcher_count.present? + if $redis_cache.hget(user_statistic_key, project_watcher_count_key).nil? + reset_user_project_watcher_count + else + $redis_cache.hincrby(user_statistic_key, project_watcher_count_key, @project_watcher_count) + end + end + if @pullrequest_count.present? + if $redis_cache.hget(user_statistic_key, pullrequest_count_key).nil? + reset_user_pullrequest_count + else + $redis_cache.hincrby(user_statistic_key, pullrequest_count_key, @pullrequest_count) + end + end + $redis_cache.hgetall(user_statistic_key) + end + + def reset_user_follow_count + $redis_cache.hset(user_statistic_key, follow_count_key, Watcher.where(watchable_type: 'User', watchable_id: @user_id).count) + end + + def reset_user_fork_count + $redis_cache.hset(user_statistic_key, fork_count_key, ForkUser.joins(:project).where(projects: {user_id: @user_id}).count) + end + + def reset_user_issue_count + $redis_cache.hset(user_statistic_key, issue_count_key, Issue.where(author_id: @user_id).count) + end + + def reset_user_project_count + $redis_cache.hset(user_statistic_key, project_count_key, Project.where(user_id: @user_id).count) + end + + def reset_user_project_language + $redis_cache.hset(user_statistic_key, project_language_key, Project.where(user_id: @user_id).joins(:project_language).group("project_languages.name").count.to_json) + end + + def reset_user_project_praise_count + $redis_cache.hset(user_statistic_key, project_praise_count_key, PraiseTread.where(praise_tread_object_type: 'Project', praise_tread_object_id: Project.where(user_id: @user_id)).count) + end + + def reset_user_project_watcher_count + $redis_cache.hset(user_statistic_key, project_watcher_count_key, Watcher.where(watchable_type: 'Project', watchable_id: Project.where(user_id: @user_id)).count) + end + + def reset_user_pullrequest_count + $redis_cache.hset(user_statistic_key, pullrequest_count_key, PullRequest.where(user_id: @user_id).count) + end + + def reset_user_statistic + $redis_cache.del(user_statistic_key) + reset_user_follow_count + reset_user_fork_count + reset_user_issue_count + reset_user_project_count + reset_user_project_language + reset_user_project_praise_count + reset_user_project_watcher_count + reset_user_pullrequest_count + + $redis_cache.hgetall(user_statistic_key) + end +end \ No newline at end of file From fa476732e500ddbb37d9396c62e23faa6df037fe Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 25 Oct 2021 17:23:17 +0800 Subject: [PATCH 02/41] add: user common info cache service --- app/controllers/users_controller.rb | 2 ++ app/jobs/cache_async_reset_job.rb | 4 +--- app/jobs/cache_async_set_job.rb | 2 -- app/services/cache/v2/owner_common_service.rb | 14 +++++++++----- app/views/users/_cache_simple_user.json.jbuilder | 16 ++++++++++++++++ 5 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 app/views/users/_cache_simple_user.json.jbuilder diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b80827efa..697835b0e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -51,6 +51,8 @@ class UsersController < ApplicationController @projects_common_count = user_projects.common.size @projects_mirrior_count = user_projects.mirror.size @projects_sync_mirrior_count = user_projects.sync_mirror.size + # 为了缓存活跃用户的基本信息，后续删除 + Cache::V2::OwnerCommonService.new(@user.login, @user.mail).read end def watch_users diff --git a/app/jobs/cache_async_reset_job.rb b/app/jobs/cache_async_reset_job.rb index a7da3f80e..3b7810918 100644 --- a/app/jobs/cache_async_reset_job.rb +++ b/app/jobs/cache_async_reset_job.rb @@ -1,10 +1,8 @@ class CacheAsyncResetJob < ApplicationJob queue_as :cache - def perform(type, id, params={}) + def perform(type, id) case type - when "owner_common_service" - Cache::V2::OwnerCommonService.new(id).reset when "platform_statistic_service" Cache::V2::PlatformStatisticService.new.reset when "project_common_service" diff --git a/app/jobs/cache_async_set_job.rb b/app/jobs/cache_async_set_job.rb index d4f641e19..5a0eb4d83 100644 --- a/app/jobs/cache_async_set_job.rb +++ b/app/jobs/cache_async_set_job.rb @@ -3,8 +3,6 @@ class CacheAsyncResetJob < ApplicationJob def perform(type, id, params={}) case type - when "owner_common_service" - Cache::V2::OwnerCommonService.new(id, params).call when "platform_statistic_service" Cache::V2::PlatformStatisticService.new(params).call when "project_common_service" diff --git a/app/services/cache/v2/owner_common_service.rb b/app/services/cache/v2/owner_common_service.rb index d65a60749..07183f811 100644 --- a/app/services/cache/v2/owner_common_service.rb +++ b/app/services/cache/v2/owner_common_service.rb @@ -3,10 +3,10 @@ class Cache::V2::OwnerCommonService < ApplicationService attr_reader :owner_id, :login, :name, :avatar_url, :email attr_accessor :owner - def initialize(owner_id, params={}) - @owner_id = owner_id + def initialize(login, email, params={}) + @login = login + @email = email @name = params[:name] - @email = params[:email] end def read @@ -24,11 +24,11 @@ class Cache::V2::OwnerCommonService < ApplicationService private def load_owner - @owner = User.find_by_id(@owner_id) + @owner = User.find_by(login: @login) end def owner_common_key - "v2-owner-common:#{@owner_id}" + "v2-owner-common:#{@login}-#{@email.to_s}" end def owner_common @@ -58,6 +58,9 @@ class Cache::V2::OwnerCommonService < ApplicationService $redis_cache.hgetall(owner_common_key) end + def reset_owner_id + $redis_cache.hset(owner_common_key, "id", owner&.id) + end def reset_owner_type $redis_cache.hset(owner_common_key, "type", owner&.type) @@ -79,6 +82,7 @@ class Cache::V2::OwnerCommonService < ApplicationService def reset_owner_common load_owner $redis_cache.del(owner_common_key) + reset_owner_id reset_owner_type reset_owner_login reset_owner_email diff --git a/app/views/users/_cache_simple_user.json.jbuilder b/app/views/users/_cache_simple_user.json.jbuilder new file mode 100644 index 000000000..60536e071 --- /dev/null +++ b/app/views/users/_cache_simple_user.json.jbuilder @@ -0,0 +1,16 @@ +user = $redis_cache.hgetall("v2-owner-common:#{name}-#{email}") +if user.blank? + json.id nil + json.type nil + json.login name + json.name name + json.email email + json.image_url User::Avatar.get_letter_avatar_url(name) +else + json.id user["id"] + json.type user["type"] + json.login user["login"] + json.name user["name"] + json.email user["email"] + json.image_url user["avatar_url"] +end \ No newline at end of file From 9cd54b0ccb81ee903174340b2e5af4afaa68c12c Mon Sep 17 00:00:00 2001 From: jasder Date: Mon, 25 Oct 2021 17:24:28 +0800 Subject: [PATCH 03/41] =?UTF-8?q?FIX=20=E8=A7=A3=E5=86=B3=E8=80=81?= =?UTF-8?q?=E7=89=88=E6=9C=ACtrustie=E9=A1=B9=E7=9B=AE=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b80827efa..8aef28333 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -191,7 +191,7 @@ class UsersController < ApplicationController def trustie_related_projects projects = Project.includes(:owner, :members, :project_score).where(id: params[:ids]).order("updated_on desc") projects_json = [] - domain_url = EduSetting.get('host_name') + '/projects' + domain_url = EduSetting.get('host_name') if projects.present? projects.each do |p| project_url = "/#{p.owner.login}/#{p.identifier}" From 91f1f4090f173c95231e9a77c4ddcd8c6a228a09 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 25 Oct 2021 18:03:56 +0800 Subject: [PATCH 04/41] fix: old cache --- .../users/statistics_controller.rb | 34 +++++++++-------- app/jobs/cache_async_reset_job.rb | 4 +- app/jobs/cache_async_set_job.rb | 4 +- app/models/application_record.rb | 8 ---- app/models/fork_user.rb | 4 +- app/models/issue.rb | 4 +- app/models/praise_tread.rb | 38 +++++++++---------- app/models/project.rb | 7 ++-- app/models/pull_request.rb | 4 +- app/models/watcher.rb | 6 +-- 10 files changed, 53 insertions(+), 60 deletions(-) diff --git a/app/controllers/users/statistics_controller.rb b/app/controllers/users/statistics_controller.rb index 592a8be94..dffd3f607 100644 --- a/app/controllers/users/statistics_controller.rb +++ b/app/controllers/users/statistics_controller.rb @@ -188,30 +188,32 @@ class Users::StatisticsController < Users::BaseController @project_languages_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').joins(:project_language).group("project_languages.name").count @platform_project_languages_count = time_filter(Project, 'created_on').joins(:project_language).group("project_languages.name").count else + @platform_result = Cache::V2::PlatformStatisticService.new.read + @user_result = Cache::V2::UserStatisticService.new(observed_user.id).read # 用户被follow数量 - @follow_count = Cache::UserFollowCountService.call(observed_user) - @platform_follow_count = Cache::PlatformFollowCountService.call + @follow_count = @user_result["follow-count"].to_i + @platform_follow_count = @platform_result["follow-count"].to_i # 用户pr数量 - @pullrequest_count = Cache::UserPullrequestCountService.call(observed_user) - @platform_pullrequest_count = Cache::PlatformPullrequestCountService.call + @pullrequest_count = @user_result["pullrequest-count"].to_i + @platform_pullrequest_count = @platform_result["pullrequest-count"].to_i # 用户issue数量 - @issues_count = Cache::UserIssueCountService.call(observed_user) - @platform_issues_count = Cache::PlatformIssueCountService.call + @issues_count = @user_result["issue-count"].to_i + @platform_issues_count = @platform_result["issue-count"].to_i # 用户总项目数 - @project_count = Cache::UserProjectCountService.call(observed_user) - @platform_project_count = Cache::PlatformProjectCountService.call + @project_count = @user_result["project-count"].to_i + @platform_project_count = @platform_result["project-count"].to_i # 用户项目被fork数量 - @fork_count = Cache::UserProjectForkCountService.call(observed_user) - @platform_fork_count = Cache::PlatformProjectForkCountService.call + @fork_count = @user_result["fork-count"].to_i + @platform_fork_count = @platform_result["fork-count"].to_i # 用户项目关注数 - @project_watchers_count = Cache::UserProjectWatchersCountService.call(observed_user) - @platform_project_watchers_count = Cache::PlatformProjectWatchersCountService.call + @project_watchers_count = @user_result["project-watcher-count"].to_i + @platform_project_watchers_count = @platform_result["project-watcher-count"].to_i # 用户项目点赞数 - @project_praises_count = Cache::UserProjectPraisesCountService.call(observed_user) - @platform_project_praises_count = Cache::PlatformProjectPraisesCountService.call + @project_praises_count = @user_result["project-praise-count"].to_i + @platform_project_praises_count = @platform_result["project-praise-count"].to_i # 用户不同语言项目数量 - @project_languages_count = Cache::UserProjectLanguagesCountService.call(observed_user) - @platform_project_languages_count = Cache::PlatformProjectLanguagesCountService.call + @project_languages_count = JSON.parse(@user_result["project-language"]) + @platform_project_languages_count = JSON.parse(@platform_result["project-language"]) end end end \ No newline at end of file diff --git a/app/jobs/cache_async_reset_job.rb b/app/jobs/cache_async_reset_job.rb index 3b7810918..da3f01168 100644 --- a/app/jobs/cache_async_reset_job.rb +++ b/app/jobs/cache_async_reset_job.rb @@ -1,14 +1,14 @@ class CacheAsyncResetJob < ApplicationJob queue_as :cache - def perform(type, id) + def perform(type, id=nil) case type when "platform_statistic_service" Cache::V2::PlatformStatisticService.new.reset when "project_common_service" Cache::V2::ProjectCommonService.new(id).reset when "user_statistic_service" - Cache::V2::PlatformStatisticService.new(id).reset + Cache::V2::UserStatisticService.new(id).reset end end end \ No newline at end of file diff --git a/app/jobs/cache_async_set_job.rb b/app/jobs/cache_async_set_job.rb index 5a0eb4d83..1c67f91a6 100644 --- a/app/jobs/cache_async_set_job.rb +++ b/app/jobs/cache_async_set_job.rb @@ -1,14 +1,14 @@ class CacheAsyncResetJob < ApplicationJob queue_as :cache - def perform(type, id, params={}) + def perform(type, id=nil, params={}) case type when "platform_statistic_service" Cache::V2::PlatformStatisticService.new(params).call when "project_common_service" Cache::V2::ProjectCommonService.new(id, params).call when "user_statistic_service" - Cache::V2::PlatformStatisticService.new(id, params).call + Cache::V2::UserStatisticService.new(id, params).call end end end \ No newline at end of file diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 0b95d7a58..77e5fe2db 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -17,14 +17,6 @@ class ApplicationRecord < ActiveRecord::Base Rails.env.production? && EduSetting.get('host_name') == 'https://www.educoder.net' end - def reset_user_cache_async_job(user) - ResetUserCacheJob.perform_later(user) - end - - def reset_platform_cache_async_job - ResetPlatformCacheJob.perform_later - end - def self.strip_param(key) key.to_s.strip.presence end diff --git a/app/models/fork_user.rb b/app/models/fork_user.rb index 0936f6bfa..0365af72b 100644 --- a/app/models/fork_user.rb +++ b/app/models/fork_user.rb @@ -24,8 +24,8 @@ class ForkUser < ApplicationRecord after_destroy :reset_cache_data def reset_cache_data - self.reset_platform_cache_async_job - self.reset_user_cache_async_job(self.project.owner) + CacheAsyncResetJob.perform_later("platform_statistic_service") + CacheAsyncResetJob.perform_later("user_statistic_service", self.project&.user_id) end end diff --git a/app/models/issue.rb b/app/models/issue.rb index 826ad3a5b..d195837a7 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -79,8 +79,8 @@ class Issue < ApplicationRecord after_destroy :update_closed_issues_count_in_project!, :reset_cache_data def reset_cache_data - self.reset_platform_cache_async_job - self.reset_user_cache_async_job(self.user) + CacheAsyncResetJob.perform_later("platform_statistic_service") + CacheAsyncResetJob.perform_later("user_statistic_service", self.author_id) end def get_assign_user diff --git a/app/models/praise_tread.rb b/app/models/praise_tread.rb index 5a9c19164..30d226735 100644 --- a/app/models/praise_tread.rb +++ b/app/models/praise_tread.rb @@ -1,20 +1,20 @@ -# == Schema Information -# -# Table name: praise_treads -# -# id :integer not null, primary key -# user_id :integer not null -# praise_tread_object_id :integer -# praise_tread_object_type :string(255) -# praise_or_tread :integer default("1") -# created_at :datetime not null -# updated_at :datetime not null -# -# Indexes -# -# praise_tread (praise_tread_object_id,praise_tread_object_type) -# - +# == Schema Information +# +# Table name: praise_treads +# +# id :integer not null, primary key +# user_id :integer not null +# praise_tread_object_id :integer +# praise_tread_object_type :string(255) +# praise_or_tread :integer default("1") +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# praise_tread (praise_tread_object_id,praise_tread_object_type) +# + class PraiseTread < ApplicationRecord belongs_to :user @@ -26,9 +26,9 @@ class PraiseTread < ApplicationRecord after_destroy :reset_cache_data def reset_cache_data - self.reset_platform_cache_async_job + CacheAsyncResetJob.perform_later("platform_statistic_service") if self.praise_tread_object.is_a?(Project) - self.reset_user_cache_async_job(self.praise_tread_object&.owner) + CacheAsyncResetJob.perform_later("user_statistic_service", self.praise_tread_object&.user_id) end end diff --git a/app/models/project.rb b/app/models/project.rb index 293e6c478..d9933e13d 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -151,11 +151,10 @@ class Project < ApplicationRecord def reset_cache_data if changes[:user_id].present? - first_owner = Owner.find_by_id(changes[:user_id].first) - self.reset_user_cache_async_job(first_owner) + CacheAsyncResetJob.perform_later("user_statistic_service", changes[:user_id].first) end - self.reset_platform_cache_async_job - self.reset_user_cache_async_job(self.owner) + CacheAsyncResetJob.perform_later("platform_statistic_service") + CacheAsyncResetJob.perform_later("user_statistic_service", self.user_id) end def reset_unmember_followed diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb index ce0cb04ad..9c6825f27 100644 --- a/app/models/pull_request.rb +++ b/app/models/pull_request.rb @@ -46,8 +46,8 @@ class PullRequest < ApplicationRecord after_destroy :reset_cache_data def reset_cache_data - self.reset_platform_cache_async_job - self.reset_user_cache_async_job(self.user) + CacheAsyncResetJob.perform_later("platform_statistic_service") + CacheAsyncResetJob.perform_later("user_statistic_service", self.user_id) end def fork_project diff --git a/app/models/watcher.rb b/app/models/watcher.rb index 6a8c94fcc..abbcf07bc 100644 --- a/app/models/watcher.rb +++ b/app/models/watcher.rb @@ -28,12 +28,12 @@ class Watcher < ApplicationRecord def reset_cache_data if self.watchable.is_a?(User) - self.reset_user_cache_async_job(self.watchable) + CacheAsyncResetJob.perform_later("user_statistic_service", self.watchable_id) end if self.watchable.is_a?(Project) - self.reset_user_cache_async_job(self.watchable&.owner) + CacheAsyncResetJob.perform_later("user_statistic_service", self.watchable&.user_id) end - self.reset_platform_cache_async_job + CacheAsyncResetJob.perform_later("platform_statistic_service") end def send_create_message_to_notice_system From 69c87fd5a4f431a355c6bd5247c87750b523026d Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 26 Oct 2021 15:22:42 +0800 Subject: [PATCH 05/41] add: callback cache --- app/controllers/projects_controller.rb | 2 + app/controllers/repositories_controller.rb | 2 +- app/jobs/cache_async_set_job.rb | 4 +- app/models/fork_user.rb | 28 ++++- app/models/issue.rb | 29 ++++- app/models/praise_tread.rb | 32 +++-- app/models/project.rb | 43 ++++++- app/models/pull_request.rb | 29 ++++- app/models/user.rb | 6 +- app/models/watcher.rb | 40 ++++-- .../cache/v2/project_common_service.rb | 41 ++++-- .../cache/v2/project_date_rank_service.rb | 3 +- .../cache/v2/user_date_rank_service.rb | 118 ++++++++++++++++++ .../cache/v2/user_statistic_service.rb | 17 +++ 14 files changed, 343 insertions(+), 51 deletions(-) create mode 100644 app/services/cache/v2/user_date_rank_service.rb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 1c6e9868c..b1ab9d010 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -190,6 +190,8 @@ class ProjectsController < ApplicationController end def simple + # 为了缓存活跃项目的基本信息，后续删除 + Cache::V2::ProjectCommonService.new(@project.id).read json_response(@project, current_user) end diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 35f11f476..9b94f0d5d 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -48,7 +48,7 @@ class RepositoriesController < ApplicationController def entries @project.increment!(:visits) - + CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id) if @project.educoder? @entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name) else diff --git a/app/jobs/cache_async_set_job.rb b/app/jobs/cache_async_set_job.rb index 1c67f91a6..f617b1316 100644 --- a/app/jobs/cache_async_set_job.rb +++ b/app/jobs/cache_async_set_job.rb @@ -1,7 +1,7 @@ -class CacheAsyncResetJob < ApplicationJob +class CacheAsyncSetJob < ApplicationJob queue_as :cache - def perform(type, id=nil, params={}) + def perform(type, params={}, id=nil) case type when "platform_statistic_service" Cache::V2::PlatformStatisticService.new(params).call diff --git a/app/models/fork_user.rb b/app/models/fork_user.rb index 0365af72b..bddf8f75c 100644 --- a/app/models/fork_user.rb +++ b/app/models/fork_user.rb @@ -20,12 +20,30 @@ class ForkUser < ApplicationRecord belongs_to :user belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id - after_save :reset_cache_data - after_destroy :reset_cache_data + after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic + after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic - def reset_cache_data - CacheAsyncResetJob.perform_later("platform_statistic_service") - CacheAsyncResetJob.perform_later("user_statistic_service", self.project&.user_id) + def incre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {forks: 1}, self.project_id) end + def decre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {forks: -1}, self.project_id) + end + + def incre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {fork_count: 1}, self.project&.user_id) + end + + def decre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {fork_count: -1}, self.project&.user_id) + end + + def incre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {fork_count: 1}) + end + + def decre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {fork_count: -1}) + end end diff --git a/app/models/issue.rb b/app/models/issue.rb index d195837a7..c642e642b 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -74,13 +74,32 @@ class Issue < ApplicationRecord scope :issue_pull_request, ->{where(issue_classify: "pull_request")} scope :issue_index_includes, ->{includes(:tracker, :priority, :version, :issue_status, :journals,:issue_tags,user: :user_extension)} scope :closed, ->{where(status_id: 5)} + after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic after_update :change_versions_count - after_save :reset_cache_data - after_destroy :update_closed_issues_count_in_project!, :reset_cache_data + after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic - def reset_cache_data - CacheAsyncResetJob.perform_later("platform_statistic_service") - CacheAsyncResetJob.perform_later("user_statistic_service", self.author_id) + def incre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {issues: 1}, self.project_id) + end + + def decre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {issues: -1}, self.project_id) + end + + def incre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: 1}, self.author_id) + end + + def decre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {issue_count: -1}, self.author_id) + end + + def incre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: 1}) + end + + def decre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {issue_count: -1}) end def get_assign_user diff --git a/app/models/praise_tread.rb b/app/models/praise_tread.rb index 30d226735..5d4ae0d80 100644 --- a/app/models/praise_tread.rb +++ b/app/models/praise_tread.rb @@ -21,15 +21,31 @@ class PraiseTread < ApplicationRecord belongs_to :praise_tread_object, polymorphic: true, counter_cache: :praises_count has_many :tidings, :as => :container, :dependent => :destroy - after_create :send_tiding - after_save :reset_cache_data - after_destroy :reset_cache_data + after_create :send_tiding, :incre_project_common, :incre_user_statistic, :incre_platform_statistic + after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic - def reset_cache_data - CacheAsyncResetJob.perform_later("platform_statistic_service") - if self.praise_tread_object.is_a?(Project) - CacheAsyncResetJob.perform_later("user_statistic_service", self.praise_tread_object&.user_id) - end + def incre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {praises: 1}, self.praise_tread_object_id) if self.praise_tread_object_type == "Project" + end + + def decre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {praises: -1}, self.praise_tread_object_id) if self.praise_tread_object_type == "Project" + end + + def incre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {project_praise_count: 1}, self.praise_tread_object&.user_id) if self.praise_tread_object_type == "Project" + end + + def decre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {project_praise_count: -1}, self.praise_tread_object&.user_id) if self.praise_tread_object_type == "Project" + end + + def incre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {project_praise_count: 1}) if self.praise_tread_object_type == "Project" + end + + def decre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {project_praise_count: -1}) if self.praise_tread_object_type == "Project" end def send_tiding diff --git a/app/models/project.rb b/app/models/project.rb index d9933e13d..78c049ab2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -126,10 +126,10 @@ class Project < ApplicationRecord has_many :pinned_projects, dependent: :destroy has_many :has_pinned_users, through: :pinned_projects, source: :user has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id - + after_create :init_project_common, :incre_user_statistic, :incre_platform_statistic after_save :check_project_members before_save :set_invite_code, :reset_cache_data, :reset_unmember_followed - after_destroy :reset_cache_data + after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)} scope :recommend, -> { visible.project_statics_select.where(recommend: true) } @@ -150,13 +150,46 @@ class Project < ApplicationRecord end def reset_cache_data + CacheAsyncResetJob.perform_later("project_common_service", self.id) if changes[:user_id].present? - CacheAsyncResetJob.perform_later("user_statistic_service", changes[:user_id].first) + CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1}, changes[:user_id].first) + CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1}, changes[:user_id].last) + end + if changes[:project_language_id].present? + first_language = ProjectLanguage.find_by_id(changes[:project_language_id].first) + last_language = ProjectLanguage.find_by_id(changes[:project_language_id].last) + CacheAsyncSetJob.perform_later("user_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1}, self.user_id) + CacheAsyncSetJob.perform_later("user_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1}, self.user_id) + CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: first_language&.name, project_language_count: -1}) + CacheAsyncSetJob.perform_later("platform_statistic_service", {project_language_count_key: last_language&.name, project_language_count: 1}) end - CacheAsyncResetJob.perform_later("platform_statistic_service") - CacheAsyncResetJob.perform_later("user_statistic_service", self.user_id) end + def init_project_common + CacheAsyncResetJob.perform_later("project_common_service", self.id) + end + + def decre_project_common + $redis_cache.del("v2-project-common:#{self.id}") + end + + def incre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: 1, project_language_count_key: self.project_language&.name, project_language_count: 1}, self.user_id) + end + + def decre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {project_count: -1, project_language_count_key: self.project_language&.name, project_language_count: -1}, self.user_id) + end + + def incre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: 1, project_language_count_key: self.project_language&.name, project_language_count: 1}) + end + + def decre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: -1, project_language_count_key: self.project_language&.name, project_language_count: -1}) + end + + def reset_unmember_followed if changes[:is_public].present? && changes[:is_public] == [true, false] self.watchers.where.not(user_id: self.all_collaborators).destroy_all diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb index 9c6825f27..7338a1d72 100644 --- a/app/models/pull_request.rb +++ b/app/models/pull_request.rb @@ -42,12 +42,31 @@ class PullRequest < ApplicationRecord scope :merged_and_closed, ->{where.not(status: 0)} scope :opening, -> {where(status: 0)} - after_save :reset_cache_data - after_destroy :reset_cache_data + after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic + after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic - def reset_cache_data - CacheAsyncResetJob.perform_later("platform_statistic_service") - CacheAsyncResetJob.perform_later("user_statistic_service", self.user_id) + def incre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {pullrequests: 1}, self.project_id) + end + + def decre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {pullrequests: -1}, self.project_id) + end + + def incre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {pullrequest_count: 1}, self.user_id) + end + + def decre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {pullrequest_count: -1}, self.user_id) + end + + def incre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {pullrequest_count: 1}) + end + + def decre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {pullrequest_count: -1}) end def fork_project diff --git a/app/models/user.rb b/app/models/user.rb index fc4c33618..7a172020c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -188,7 +188,7 @@ class User < Owner :show_email, :show_location, :show_department, :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true - before_save :update_hashed_password, :set_lastname + before_save :update_hashed_password, :set_lastname, :reset_cache_data after_create do SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie? end @@ -205,6 +205,10 @@ class User < Owner validate :validate_sensitive_string validate :validate_password_length + def reset_cache_data + Cache::V2::OwnerCommonService.new(self.login, self.mail).reset + end + # 用户参与的所有项目 def full_member_projects normal_projects = Project.members_projects(self.id).to_sql diff --git a/app/models/watcher.rb b/app/models/watcher.rb index abbcf07bc..5a2cd96fb 100644 --- a/app/models/watcher.rb +++ b/app/models/watcher.rb @@ -22,18 +22,36 @@ class Watcher < ApplicationRecord scope :watching_users, ->(watchable_id){ where("watchable_type = ? and user_id = ?",'User',watchable_id)} - after_save :reset_cache_data - after_destroy :reset_cache_data - after_create :send_create_message_to_notice_system + after_create :send_create_message_to_notice_system, :incre_project_common, :incre_user_statistic, :incre_platform_statistic + after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic - def reset_cache_data - if self.watchable.is_a?(User) - CacheAsyncResetJob.perform_later("user_statistic_service", self.watchable_id) - end - if self.watchable.is_a?(Project) - CacheAsyncResetJob.perform_later("user_statistic_service", self.watchable&.user_id) - end - CacheAsyncResetJob.perform_later("platform_statistic_service") + + def incre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {watchers: 1}, self.watchable_id) if self.watchable_type == "Project" + end + + def decre_project_common + CacheAsyncSetJob.perform_later("project_common_service", {watchers: -1}, self.watchable_id) if self.watchable_type == "Project" + end + + def incre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {follow_count: 1}, self.watchable_id) if self.watchable_type == "User" + CacheAsyncSetJob.perform_later("user_statistic_service", {project_watcher_count: 1}, self.watchable&.user_id) if self.watchable_type == "Project" + end + + def decre_user_statistic + CacheAsyncSetJob.perform_later("user_statistic_service", {follow_count: -1}, self.watchable_id) if self.watchable_type == "User" + CacheAsyncSetJob.perform_later("user_statistic_service", {project_watcher_count: -1}, self.watchable&.user_id) if self.watchable_type == "Project" + end + + def incre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {follow_count: 1}) if self.watchable_type == "User" + CacheAsyncSetJob.perform_later("platform_statistic_service", {project_watcher_count: 1}) if self.watchable_type == "Project" + end + + def decre_platform_statistic + CacheAsyncSetJob.perform_later("platform_statistic_service", {follow_count: -1}) if self.watchable_type == "User" + CacheAsyncSetJob.perform_later("platform_statistic_service", {project_watcher_count: -1}) if self.watchable_type == "Project" end def send_create_message_to_notice_system diff --git a/app/services/cache/v2/project_common_service.rb b/app/services/cache/v2/project_common_service.rb index 365f07a6e..6ea4bb3a9 100644 --- a/app/services/cache/v2/project_common_service.rb +++ b/app/services/cache/v2/project_common_service.rb @@ -1,5 +1,5 @@ class Cache::V2::ProjectCommonService < ApplicationService - attr_reader :project_id, :owner_id, :name, :identifier, :visits, :watchers, :praises, :forks, :issues, :pullrequests + attr_reader :project_id, :owner_id, :name, :identifier, :description, :visits, :watchers, :praises, :forks, :issues, :pullrequests attr_accessor :project def initialize(project_id, params={}) @@ -7,6 +7,7 @@ class Cache::V2::ProjectCommonService < ApplicationService @owner_id = params[:owner_id] @name = params[:name] @identifier = params[:identifier] + @description = params[:description] @visits = params[:visits] @watchers = params[:watchers] @praises = params[:praises] @@ -48,6 +49,10 @@ class Cache::V2::ProjectCommonService < ApplicationService "identifier" end + def description_key + "description" + end + def visits_key "visits" end @@ -102,13 +107,22 @@ class Cache::V2::ProjectCommonService < ApplicationService $redis_cache.hset(project_common_key, identifier_key, @identifier) end end + if @description.present? + if $redis_cache.hget(project_common_key, description_key).nil? + reset_project_description + else + $redis_cache.hset(project_common_key, description_key, @description) + end + end if @visits.present? if $redis_cache.hget(project_common_key, visits_key).nil? reset_project_visits + Cache::V2::ProjectRankService.call(@project_id, {visits: @visits}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {visits: @visits}) else $redis_cache.hincrby(project_common_key, visits_key, @visits) Cache::V2::ProjectRankService.call(@project_id, {visits: @visits}) - Cache::V2::ProjectDateRankService.call(@project_id, {visits: @visits}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {visits: @visits}) end end if @watchers.present? @@ -121,37 +135,45 @@ class Cache::V2::ProjectCommonService < ApplicationService if @praises.present? if $redis_cache.hget(project_common_key, praises_key).nil? reset_project_praises + Cache::V2::ProjectRankService.call(@project_id, {praises: @praises}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {praises: @praises}) else $redis_cache.hincrby(project_common_key, praises_key, @praises) Cache::V2::ProjectRankService.call(@project_id, {praises: @praises}) - Cache::V2::ProjectDateRankService.call(@project_id, {praises: @praises}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {praises: @praises}) end end if @forks.present? if $redis_cache.hget(project_common_key, forks_key).nil? reset_project_forks + Cache::V2::ProjectRankService.call(@project_id, {forks: @forks}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {forks: @forks}) else $redis_cache.hincrby(project_common_key, forks_key, @forks) Cache::V2::ProjectRankService.call(@project_id, {forks: @forks}) - Cache::V2::ProjectDateRankService.call(@project_id, {forks: @forks}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {forks: @forks}) end end if @issues.present? if $redis_cache.hget(project_common_key, issues_key).nil? reset_project_issues + Cache::V2::ProjectRankService.call(@project_id, {issues: @issues}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {issues: @issues}) else $redis_cache.hincrby(project_common_key, issues_key, @issues) Cache::V2::ProjectRankService.call(@project_id, {issues: @issues}) - Cache::V2::ProjectDateRankService.call(@project_id, {issues: @issues}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {issues: @issues}) end end if @pullrequests.present? if $redis_cache.hget(project_common_key, pullrequests_key).nil? reset_project_pullrequests + Cache::V2::ProjectRankService.call(@project_id, {pullrequests: @pullrequests}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {pullrequests: @pullrequests}) else $redis_cache.hincrby(project_common_key, pullrequests_key, @pullrequests) Cache::V2::ProjectRankService.call(@project_id, {pullrequests: @pullrequests}) - Cache::V2::ProjectDateRankService.call(@project_id, {pullrequests: @pullrequests}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {pullrequests: @pullrequests}) end end $redis_cache.hgetall(project_common_key) @@ -169,6 +191,10 @@ class Cache::V2::ProjectCommonService < ApplicationService $redis_cache.hset(project_common_key, identifier_key, @project&.identifier) end + def reset_project_description + $redis_cache.hset(project_common_key, description_key, @project&.description) + end + def reset_project_visits $redis_cache.hset(project_common_key, visits_key, @project&.visits) end @@ -186,7 +212,7 @@ class Cache::V2::ProjectCommonService < ApplicationService end def reset_project_issues - $redis_cache.hset(project_common_key, issues_key, Issue.where(project_id: @project_id).count) + $redis_cache.hset(project_common_key, issues_key, Issue.issue_issue.where(project_id: @project_id).count) end def reset_project_pullrequests @@ -199,6 +225,7 @@ class Cache::V2::ProjectCommonService < ApplicationService reset_project_owner_id reset_project_name reset_project_identifier + reset_project_description reset_project_visits reset_project_watchers reset_project_praises diff --git a/app/services/cache/v2/project_date_rank_service.rb b/app/services/cache/v2/project_date_rank_service.rb index 38c11c9b9..092aff796 100644 --- a/app/services/cache/v2/project_date_rank_service.rb +++ b/app/services/cache/v2/project_date_rank_service.rb @@ -4,6 +4,7 @@ class Cache::V2::ProjectDateRankService < ApplicationService def initialize(project_id, rank_date=Date.today, params={}) @project_id = project_id + @rank_date = rank_date @visits = params[:visits] @praises = params[:praises] @forks = params[:forks] @@ -21,7 +22,7 @@ class Cache::V2::ProjectDateRankService < ApplicationService private def project_rank_key - "v2-project-rank-#{rank_date.to_s}" + "v2-project-rank-#{@rank_date.to_s}" end def project_rank diff --git a/app/services/cache/v2/user_date_rank_service.rb b/app/services/cache/v2/user_date_rank_service.rb new file mode 100644 index 000000000..583f03a22 --- /dev/null +++ b/app/services/cache/v2/user_date_rank_service.rb @@ -0,0 +1,118 @@ +class Cache::V2::UserDateRankService < ApplicationService + attr_reader :user_id, :rank_date, :follow_count, :fork_count, :issue_count, :project_count, :project_language_count_key, :project_language_count, :project_praise_count, :project_watcher_count, :pullrequest_count + + def initialize(user_id, rank_date=Date.today, params={}) + @user_id = user_id + @rank_date = rank_date + @follow_count = params[:follow_count] + @fork_count = params[:fork_count] + @issue_count = params[:issue_count] + @project_count = params[:project_count] + @project_language_count_key = params[:project_language_count_key] + @project_language_count = params[:project_language_count] + @project_praise_count = params[:project_praise_count] + @project_watcher_count = params[:project_watcher_count] + @pullrequest_count = params[:pullrequest_count] + end + + def read_rank + user_rank + end + + def read_statistic + user_statistic + end + + def call + set_user_rank + end + + private + def user_rank_key + "v2-user-rank-#{@rank_date.to_s}" + end + + def user_date_statistic_key + "v2-user-statistic:#{@user_id}-#{@rank_date.to_s}" + end + + def user_rank + $redis_cache.zscore(user_rank_key, @user_id) + end + + def user_statistic + $redis_cache.hgetall(user_date_statistic_key) + end + + def set_user_statistic + if @follow_count.present? + $redis_cache.hincrby(user_date_statistic_key, "follow-count", @follow_count.to_i) + end + if @fork_count.present? + $redis_cache.hincrby(user_date_statistic_key, "fork-count", @fork_count.to_i) + end + if @issue_count.present? + $redis_cache.hincrby(user_date_statistic_key, "issue-count", @issue_count.to_i) + end + if @project_count.present? + $redis_cache.hincrby(user_date_statistic_key, "project-count", @project_count.to_i) + end + if project_language_count_key.present? && project_language_count.present? + if $redis_cache.hget(user_date_statistic_key, "project-language").nil? + result = {} + result[@project_language_count_key] = project_language_count.to_i + result.delete(@project_language_count_key) if result[@project_language_count_key] == 0 + $redis_cache.hset(user_date_statistic_key, "project-language", result.to_json) + else + result = JSON.parse($redis_cache.hget(user_date_statistic_key, "project-language")) + result[@project_language_count_key] ||= 0 + result[@project_language_count_key] += project_language_count.to_i + result.delete(@project_language_count_key) if result[@project_language_count_key] == 0 + $redis_cache.hset(user_date_statistic_key, "project-language", result.to_json) + end + end + if @project_praise_count.present? + $redis_cache.hincrby(user_date_statistic_key, "project-praise-count", @project_praise_count.to_i) + end + if @project_watcher_count.present? + $redis_cache.hincrby(user_date_statistic_key, "project-watcher-count", @project_watcher_count.to_i) + end + if @pullrequest_count.present? + $redis_cache.hincrby(user_date_statistic_key, "pullrequest-count", @pullrequest_count.to_i) + end + + $redis_cache.hgetall(user_date_statistic_key) + end + + def set_user_rank + set_user_statistic + follow_count = $redis_cache.hget(user_date_statistic_key, "follow-count") || 0 + pullrequest_count = $redis_cache.hget(user_date_statistic_key, "pullrequest-count") || 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 + project_watchers_count = $redis_cache.hget(user_date_statistic_key, "project-watcher-count") || 0 + project_praises_count = $redis_cache.hget(user_date_statistic_key, "project-praise-count") || 0 + project_languages_count = $redis_cache.hget(user_date_statistic_key, "project-language").nil? ? 0 : $redis_cache.hget(user_date_statistic_key, "project-language").length + # 影响力 + 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 + + # 项目经验 + experience = 10 * project_count.to_i + 5 * fork_count.to_i + project_watchers_count.to_i + project_praises_count.to_i + experience = (60.0 + experience / (experience + 100.0) * 40.0).to_i + # 语言能力 + language = (60.0 + project_languages_count.to_i / (project_languages_count.to_i + 5.0) * 40.0).to_i + + score = influence+ contribution + activity + experience + language + + $redis_cache.zadd(user_rank_key, score, @user_id) if score.to_i > 300 + + $redis_cache.zscore(user_rank_key, @user_id) + end +end \ No newline at end of file diff --git a/app/services/cache/v2/user_statistic_service.rb b/app/services/cache/v2/user_statistic_service.rb index 0df49c8ae..8caa66d88 100644 --- a/app/services/cache/v2/user_statistic_service.rb +++ b/app/services/cache/v2/user_statistic_service.rb @@ -76,60 +76,77 @@ class Cache::V2::UserStatisticService < ApplicationService if @follow_count.present? if $redis_cache.hget(user_statistic_key, follow_count_key).nil? reset_user_follow_count + Cache::V2::UserDateRankService.call(@user_id, Date.today, {follow_count: @follow_count}) else $redis_cache.hincrby(user_statistic_key, follow_count_key, @follow_count) + Cache::V2::UserDateRankService.call(@user_id, Date.today, {follow_count: @follow_count}) end end if @fork_count.present? if $redis_cache.hget(user_statistic_key, fork_count_key).nil? reset_user_fork_count + Cache::V2::UserDateRankService.call(@user_id, Date.today, {fork_count: @fork_count}) else $redis_cache.hincrby(user_statistic_key, fork_count_key, @fork_count) + Cache::V2::UserDateRankService.call(@user_id, Date.today, {fork_count: @fork_count}) end end if @issue_count.present? if $redis_cache.hget(user_statistic_key, issue_count_key).nil? reset_user_issue_count + Cache::V2::UserDateRankService.call(@user_id, Date.today, {issue_count: @issue_count}) else $redis_cache.hincrby(user_statistic_key, issue_count_key, @issue_count) + Cache::V2::UserDateRankService.call(@user_id, Date.today, {issue_count: @issue_count}) end end if @project_count.present? if $redis_cache.hget(user_statistic_key, project_count_key).nil? reset_user_project_count + Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_count: @project_count}) else $redis_cache.hincrby(user_statistic_key, project_count_key, @project_count) + Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_count: @project_count}) end end if @project_language_count_key.present? && project_language_count.present? if $redis_cache.hget(user_statistic_key, project_language_key).nil? reset_user_project_language + Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_language_count_key: @project_language_count_key, project_language_count: @project_language_count}) else result = JSON.parse($redis_cache.hget(user_statistic_key, project_language_key)) result[@project_language_count_key] ||= 0 result[@project_language_count_key] += project_language_count.to_i + result.delete(@project_language_count_key) if result[@project_language_count_key] == 0 $redis_cache.hset(user_statistic_key, project_language_key, result.to_json) + Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_language_count_key: @project_language_count_key, project_language_count: @project_language_count}) end end if @project_praise_count.present? if $redis_cache.hget(user_statistic_key, project_praise_count_key).nil? reset_user_project_praise_count + Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_praise_count: @project_praise_count}) else $redis_cache.hincrby(user_statistic_key, project_praise_count_key, @project_praise_count) + Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_praise_count: @project_praise_count}) end end if @project_watcher_count.present? if $redis_cache.hget(user_statistic_key, project_watcher_count_key).nil? reset_user_project_watcher_count + Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_watcher_count: @project_watcher_count}) else $redis_cache.hincrby(user_statistic_key, project_watcher_count_key, @project_watcher_count) + Cache::V2::UserDateRankService.call(@user_id, Date.today, {project_watcher_count: @project_watcher_count}) end end if @pullrequest_count.present? if $redis_cache.hget(user_statistic_key, pullrequest_count_key).nil? reset_user_pullrequest_count + Cache::V2::UserDateRankService.call(@user_id, Date.today, {pullrequest_count: @pullrequest_count}) else $redis_cache.hincrby(user_statistic_key, pullrequest_count_key, @pullrequest_count) + Cache::V2::UserDateRankService.call(@user_id, Date.today, {pullrequest_count: @pullrequest_count}) end end $redis_cache.hgetall(user_statistic_key) From 21fa609e05cfa2e3d7ada3b3cf8e7c58b09ccf44 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 26 Oct 2021 18:42:35 +0800 Subject: [PATCH 06/41] add: project rank and user rank api --- app/controllers/project_rank_controller.rb | 24 +++++++++++++++++++ app/controllers/user_rank_controller.rb | 24 +++++++++++++++++++ app/models/project.rb | 7 +++--- app/services/cache/v2/owner_common_service.rb | 14 +++++++++++ .../cache/v2/project_common_service.rb | 7 ++++-- app/services/cache/v2/project_rank_service.rb | 10 ++++++-- .../cache/v2/user_date_rank_service.rb | 7 +++--- app/views/project_rank/_detail.json.jbuilder | 19 +++++++++++++++ app/views/project_rank/index.json.jbuilder | 8 +++++++ app/views/user_rank/_detail.json.jbuilder | 15 ++++++++++++ app/views/user_rank/index.json.jbuilder | 8 +++++++ config/routes.rb | 3 +++ 12 files changed, 136 insertions(+), 10 deletions(-) create mode 100644 app/controllers/project_rank_controller.rb create mode 100644 app/controllers/user_rank_controller.rb create mode 100644 app/views/project_rank/_detail.json.jbuilder create mode 100644 app/views/project_rank/index.json.jbuilder create mode 100644 app/views/user_rank/_detail.json.jbuilder create mode 100644 app/views/user_rank/index.json.jbuilder diff --git a/app/controllers/project_rank_controller.rb b/app/controllers/project_rank_controller.rb new file mode 100644 index 000000000..07bc2fb0f --- /dev/null +++ b/app/controllers/project_rank_controller.rb @@ -0,0 +1,24 @@ +class ProjectRankController < ApplicationController + # 根据时间获取热门项目 + def index + $redis_cache.zunionstore("recent-days-project-rank", get_timeable_key_names) + @project_rank = $redis_cache.zrevrange("recent-days-project-rank", 0, 5, withscores: true) + rescue Exception => e + @project_rack = [] + end + + private + # 默认显示7天的 + def time + params.fetch(:time, 7).to_i + end + + def get_timeable_key_names + names_array = [] + (0...time).to_a.each do |i| + date_time_string = (Date.today - i.days).to_s + names_array << "v2-project-rank-#{date_time_string}" + end + names_array + end +end \ No newline at end of file diff --git a/app/controllers/user_rank_controller.rb b/app/controllers/user_rank_controller.rb new file mode 100644 index 000000000..734b94c84 --- /dev/null +++ b/app/controllers/user_rank_controller.rb @@ -0,0 +1,24 @@ +class UserRankController < ApplicationController + # 根据时间获取热门开发者 + def index + $redis_cache.zunionstore("recent-days-user-rank", get_timeable_key_names) + @user_rank = $redis_cache.zrevrange("recent-days-user-rank", 0, 5, withscores: true) + rescue Exception => e + @user_rank = [] + end + + private + # 默认显示7天的 + def time + params.fetch(:time, 7).to_i + end + + def get_timeable_key_names + names_array = [] + (0...time).to_a.each do |i| + date_time_string = (Date.today - i.days).to_s + names_array << "v2-user-rank-#{date_time_string}" + end + names_array + end +end \ No newline at end of file diff --git a/app/models/project.rb b/app/models/project.rb index 78c049ab2..c4c085096 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -127,9 +127,10 @@ class Project < ApplicationRecord has_many :has_pinned_users, through: :pinned_projects, source: :user has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id after_create :init_project_common, :incre_user_statistic, :incre_platform_statistic - after_save :check_project_members - before_save :set_invite_code, :reset_cache_data, :reset_unmember_followed - after_destroy :decre_project_common, :decre_user_statistic, :decre_platform_statistic + after_save :check_project_members, :reset_cache_data + before_save :set_invite_code, :reset_unmember_followed + before_destroy :decre_project_common + after_destroy :decre_user_statistic, :decre_platform_statistic scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)} scope :recommend, -> { visible.project_statics_select.where(recommend: true) } diff --git a/app/services/cache/v2/owner_common_service.rb b/app/services/cache/v2/owner_common_service.rb index 07183f811..62322b49c 100644 --- a/app/services/cache/v2/owner_common_service.rb +++ b/app/services/cache/v2/owner_common_service.rb @@ -31,6 +31,10 @@ class Cache::V2::OwnerCommonService < ApplicationService "v2-owner-common:#{@login}-#{@email.to_s}" end + def owner_common_key_by_id + "v2-owner-common:#{@owner.id}" + end + def owner_common $redis_cache.hgetall(owner_common_key).blank? ? reset_owner_common : $redis_cache.hgetall(owner_common_key) end @@ -46,6 +50,9 @@ class Cache::V2::OwnerCommonService < ApplicationService else $redis_cache.hset(owner_common_key, "name", @name) $redis_cache.hset(owner_common_key, "avatar_url", url_to_avatar(owner)) + + $redis_cache.hset(owner_common_key_by_id, "name", @name) + $redis_cache.hset(owner_common_key_by_id, "avatar_url", url_to_avatar(owner)) end end if @email.present? @@ -53,6 +60,7 @@ class Cache::V2::OwnerCommonService < ApplicationService reset_owner_email else $redis_cache.hset(owner_common_key, "email", @email) + $redis_cache.hset(owner_common_key_by_id, "email", @email) end end @@ -60,23 +68,29 @@ class Cache::V2::OwnerCommonService < ApplicationService end def reset_owner_id $redis_cache.hset(owner_common_key, "id", owner&.id) + $redis_cache.hset(owner_common_key_by_id, "id", owner&.id) end def reset_owner_type $redis_cache.hset(owner_common_key, "type", owner&.type) + $redis_cache.hset(owner_common_key_by_id, "type", owner&.type) end def reset_owner_login $redis_cache.hset(owner_common_key, "login", owner&.login) + $redis_cache.hset(owner_common_key_by_id, "login", owner&.login) end def reset_owner_email $redis_cache.hset(owner_common_key, "email", owner&.mail) + $redis_cache.hset(owner_common_key_by_id, "email", owner&.mail) end def reset_owner_name $redis_cache.hset(owner_common_key, "name", owner&.real_name) $redis_cache.hset(owner_common_key, "avatar_url", url_to_avatar(owner)) + $redis_cache.hset(owner_common_key_by_id, "name", owner&.real_name) + $redis_cache.hset(owner_common_key_by_id, "avatar_url", url_to_avatar(owner)) end def reset_owner_common diff --git a/app/services/cache/v2/project_common_service.rb b/app/services/cache/v2/project_common_service.rb index 6ea4bb3a9..841a0bb55 100644 --- a/app/services/cache/v2/project_common_service.rb +++ b/app/services/cache/v2/project_common_service.rb @@ -120,7 +120,10 @@ class Cache::V2::ProjectCommonService < ApplicationService Cache::V2::ProjectRankService.call(@project_id, {visits: @visits}) Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {visits: @visits}) else - $redis_cache.hincrby(project_common_key, visits_key, @visits) + puts project_common_key + puts visits_key + puts @visits + $redis_cache.hincrby(project_common_key, visits_key, @visits.to_s) Cache::V2::ProjectRankService.call(@project_id, {visits: @visits}) Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {visits: @visits}) end @@ -196,7 +199,7 @@ class Cache::V2::ProjectCommonService < ApplicationService end def reset_project_visits - $redis_cache.hset(project_common_key, visits_key, @project&.visits) + $redis_cache.hset(project_common_key, visits_key, @project&.visits || 0) end def reset_project_watchers diff --git a/app/services/cache/v2/project_rank_service.rb b/app/services/cache/v2/project_rank_service.rb index 089258d96..45484dc08 100644 --- a/app/services/cache/v2/project_rank_service.rb +++ b/app/services/cache/v2/project_rank_service.rb @@ -37,6 +37,7 @@ class Cache::V2::ProjectRankService < ApplicationService end def set_project_rank + load_project_common if $redis_cache.zscore(project_rank_key, @project_id).blank? reset_project_rank return @@ -56,16 +57,21 @@ class Cache::V2::ProjectRankService < ApplicationService if @pullrequests.present? $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) end + reset_user_project_rank $redis_cache.zscore(project_rank_key, @project_id) end def reset_project_rank load_project_common - $redis_cache.zrem(project_rank_key, @project_id) score = @project_common["visits"].to_i * 1 + @project_common["praises"].to_i * 5 + @project_common["forks"].to_i * 5 + @project_common["issues"].to_i * 10 + @project_common["pullrequests"].to_i * 10 - $redis_cache.zincrby(project_rank_key, score, @project_id) + $redis_cache.zadd(project_rank_key, score, @project_id) + reset_user_project_rank $redis_cache.zscore(project_rank_key, @project_id) end + + def reset_user_project_rank + $redis_cache.zadd("v2-user-project-rank:#{@project_common["owner_id"]}", $redis_cache.zscore(project_rank_key, @project_id), @project_id) + end end \ No newline at end of file diff --git a/app/services/cache/v2/user_date_rank_service.rb b/app/services/cache/v2/user_date_rank_service.rb index 583f03a22..00073a8e8 100644 --- a/app/services/cache/v2/user_date_rank_service.rb +++ b/app/services/cache/v2/user_date_rank_service.rb @@ -93,7 +93,8 @@ class Cache::V2::UserDateRankService < ApplicationService fork_count = $redis_cache.hget(user_date_statistic_key, "fork-count") || 0 project_watchers_count = $redis_cache.hget(user_date_statistic_key, "project-watcher-count") || 0 project_praises_count = $redis_cache.hget(user_date_statistic_key, "project-praise-count") || 0 - project_languages_count = $redis_cache.hget(user_date_statistic_key, "project-language").nil? ? 0 : $redis_cache.hget(user_date_statistic_key, "project-language").length + 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 # 影响力 influence = (60.0 + follow_count.to_i / (follow_count.to_i + 20.0) * 40.0).to_i @@ -110,8 +111,8 @@ class Cache::V2::UserDateRankService < ApplicationService language = (60.0 + project_languages_count.to_i / (project_languages_count.to_i + 5.0) * 40.0).to_i score = influence+ contribution + activity + experience + language - - $redis_cache.zadd(user_rank_key, score, @user_id) if score.to_i > 300 + $redis_cache.zrem(user_rank_key, @user_id) + $redis_cache.zadd(user_rank_key, score-300, @user_id) if score > 300 $redis_cache.zscore(user_rank_key, @user_id) end diff --git a/app/views/project_rank/_detail.json.jbuilder b/app/views/project_rank/_detail.json.jbuilder new file mode 100644 index 000000000..454aee2cb --- /dev/null +++ b/app/views/project_rank/_detail.json.jbuilder @@ -0,0 +1,19 @@ +project_common = $redis_cache.hgetall("v2-project-common:#{item[0]}") +owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id"]}") +json.id item[0] +json.score item[1] +json.name project_common["name"] +json.identifier project_common["identifier"] +json.description project_common["description"] +json.owner do + json.id project_common["owner_id"] + json.name owner_common["name"] + json.login owner_common["login"] + json.avatar_url owner_common["avatar_url"] +end +json.visits project_common["visits"] +json.forks project_common["forks"] +json.watchers project_common["watchers"] +json.praises project_common["praises"] +json.issues project_common["issues"] +json.pulls project_common["pullrequests"] \ No newline at end of file diff --git a/app/views/project_rank/index.json.jbuilder b/app/views/project_rank/index.json.jbuilder new file mode 100644 index 000000000..84792ca7d --- /dev/null +++ b/app/views/project_rank/index.json.jbuilder @@ -0,0 +1,8 @@ +json.partial! "commons/success" +json.projects do + + json.array! @project_rank.each do |item| + json.partial! "detail", locals: {item: item} + end + +end \ No newline at end of file diff --git a/app/views/user_rank/_detail.json.jbuilder b/app/views/user_rank/_detail.json.jbuilder new file mode 100644 index 000000000..54afea5c4 --- /dev/null +++ b/app/views/user_rank/_detail.json.jbuilder @@ -0,0 +1,15 @@ +owner_common = $redis_cache.hgetall("v2-owner-common:#{item[0]}") +popular_project = $redis_cache.zrevrange("v2-user-project-rank:#{item[0]}", 0, 1, withscores: true)[0] +popular_project_common = $redis_cache.hgetall("v2-project-common:#{popular_project[0]}") +json.id item[0] +json.score item[1] +json.name owner_common["name"] +json.type owner_common["type"] +json.login owner_common["login"] +json.avatar_url owner_common["avatar_url"] +json.project do + json.id popular_project[0] + json.name popular_project_common["name"] + json.identifier popular_project_common["identifier"] + json.description popular_project_common["description"] +end \ No newline at end of file diff --git a/app/views/user_rank/index.json.jbuilder b/app/views/user_rank/index.json.jbuilder new file mode 100644 index 000000000..51ad153c4 --- /dev/null +++ b/app/views/user_rank/index.json.jbuilder @@ -0,0 +1,8 @@ +json.partial! "commons/success" +json.users do + + json.array! @user_rank.each do |item| + json.partial! "detail", locals: {item: item} + end + +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 35fea39c7..7f78cc8dd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -73,6 +73,9 @@ Rails.application.routes.draw do resources :public_keys, only: [:index, :create, :destroy] + resources :project_rank, only: [:index] + resources :user_rank, only: [:index] + resources :statistic, only: [:index] do collection do get :platform_profile From e1b0abbf310da699ac610ed5000f90aec2e56cae Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 09:20:46 +0800 Subject: [PATCH 07/41] fix --- app/controllers/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b1ab9d010..4f48e53dc 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -191,7 +191,7 @@ class ProjectsController < ApplicationController def simple # 为了缓存活跃项目的基本信息，后续删除 - Cache::V2::ProjectCommonService.new(@project.id).read + Cache::V2::ProjectCommonService.new(@project.id).reset json_response(@project, current_user) end From d0791ee6539781e79c054d87e6d36d974441ea7a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 09:48:23 +0800 Subject: [PATCH 08/41] fix: privacy project not use cache --- app/models/project.rb | 8 ++++++++ app/services/cache/v2/project_common_service.rb | 3 +++ app/views/project_rank/_detail.json.jbuilder | 1 + 3 files changed, 12 insertions(+) diff --git a/app/models/project.rb b/app/models/project.rb index c4c085096..03cad7ca7 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -190,6 +190,14 @@ class Project < ApplicationRecord CacheAsyncSetJob.perform_later("platform_statistic_service", {project_count: -1, project_language_count_key: self.project_language&.name, project_language_count: -1}) end + def is_full_public + owner = self.owner + if owner.is_a?(Organization) + return self.is_public && owner&.visibility == "common" + else + return self.is_public + end + end def reset_unmember_followed if changes[:is_public].present? && changes[:is_public] == [true, false] diff --git a/app/services/cache/v2/project_common_service.rb b/app/services/cache/v2/project_common_service.rb index 841a0bb55..77a7d27b7 100644 --- a/app/services/cache/v2/project_common_service.rb +++ b/app/services/cache/v2/project_common_service.rb @@ -86,6 +86,8 @@ class Cache::V2::ProjectCommonService < ApplicationService reset_project_common return end + load_project + return unless @project.is_full_public if @owner_id.present? if $redis_cache.hget(project_common_key, owner_id_key).nil? reset_project_owner_id @@ -224,6 +226,7 @@ class Cache::V2::ProjectCommonService < ApplicationService def reset_project_common load_project + return unless @project.is_full_public $redis_cache.del(project_common_key) reset_project_owner_id reset_project_name diff --git a/app/views/project_rank/_detail.json.jbuilder b/app/views/project_rank/_detail.json.jbuilder index 454aee2cb..ce703e77a 100644 --- a/app/views/project_rank/_detail.json.jbuilder +++ b/app/views/project_rank/_detail.json.jbuilder @@ -7,6 +7,7 @@ json.identifier project_common["identifier"] json.description project_common["description"] json.owner do json.id project_common["owner_id"] + json type owner_common["type"] json.name owner_common["name"] json.login owner_common["login"] json.avatar_url owner_common["avatar_url"] From e6c6e544fe0c53c46af1880493ef14287dc3ec64 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 10:00:06 +0800 Subject: [PATCH 09/41] fix --- app/views/project_rank/_detail.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/project_rank/_detail.json.jbuilder b/app/views/project_rank/_detail.json.jbuilder index ce703e77a..b23403966 100644 --- a/app/views/project_rank/_detail.json.jbuilder +++ b/app/views/project_rank/_detail.json.jbuilder @@ -7,7 +7,7 @@ json.identifier project_common["identifier"] json.description project_common["description"] json.owner do json.id project_common["owner_id"] - json type owner_common["type"] + json.type owner_common["type"] json.name owner_common["name"] json.login owner_common["login"] json.avatar_url owner_common["avatar_url"] From 9232a284d859695ca1ae8b29d5ee44887ae2ff0e Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 10:46:09 +0800 Subject: [PATCH 10/41] fix --- app/controllers/organizations/organizations_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb index 218bc872d..f019e8d39 100644 --- a/app/controllers/organizations/organizations_controller.rb +++ b/app/controllers/organizations/organizations_controller.rb @@ -22,6 +22,7 @@ class Organizations::OrganizationsController < Organizations::BaseController @can_create_project = @organization.can_create_project?(current_user.id) @is_admin = can_edit_org? @is_member = @organization.is_member?(current_user.id) + Cache::V2::OwnerCommonService.new(@organization.login, @organization.mail).read end def create From c019766df20b0ac3072fbe73ba13648fa4db5b42 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 10:48:45 +0800 Subject: [PATCH 11/41] fix --- app/services/cache/v2/owner_common_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/cache/v2/owner_common_service.rb b/app/services/cache/v2/owner_common_service.rb index 62322b49c..d8b86d097 100644 --- a/app/services/cache/v2/owner_common_service.rb +++ b/app/services/cache/v2/owner_common_service.rb @@ -24,7 +24,7 @@ class Cache::V2::OwnerCommonService < ApplicationService private def load_owner - @owner = User.find_by(login: @login) + @owner = Owner.find_by(login: @login) end def owner_common_key From 01f99a2f120d5834c36f9f97e74c81070b13c53d Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 11:03:34 +0800 Subject: [PATCH 12/41] fix --- app/models/organization.rb | 6 ++++++ app/models/user.rb | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/organization.rb b/app/models/organization.rb index 843c2b05f..4fd0886da 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -81,6 +81,12 @@ class Organization < Owner scope :with_visibility, ->(visibility) { joins(:organization_extension).where(organization_extensions: {visibility: visibility}) if visibility.present? } + after_save :reset_cache_data + + def reset_cache_data + Cache::V2::OwnerCommonService.new(self.login, self.mail).reset + end + def self.build(name, nickname, gitea_token=nil) self.create!(login: name, nickname: nickname, gitea_token: gitea_token) end diff --git a/app/models/user.rb b/app/models/user.rb index 7a172020c..ae20b83d3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -188,7 +188,8 @@ class User < Owner :show_email, :show_location, :show_department, :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true - before_save :update_hashed_password, :set_lastname, :reset_cache_data + before_save :update_hashed_password, :set_lastname + after_save :reset_cache_data after_create do SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie? end From a43f6714de81e1a625eab9441f58553a333ef96b Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 14:20:27 +0800 Subject: [PATCH 13/41] add: project explore api --- .../project_categories_controller.rb | 4 +++ app/controllers/projects_controller.rb | 10 ++++-- app/models/project.rb | 5 ++- app/models/project_category.rb | 6 ++++ app/queries/projects/list_query.rb | 3 +- .../pinned_index.json.jbuilder | 1 + .../projects/banner_recommend.json.jbuilder | 35 +++++++++++++++++++ app/views/projects/index.json.jbuilder | 2 +- config/routes.rb | 2 ++ ..._some_columns_to_project_detail_feature.rb | 7 ++++ 10 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 app/views/project_categories/pinned_index.json.jbuilder create mode 100644 app/views/projects/banner_recommend.json.jbuilder create mode 100644 db/migrate/20211027032626_add_some_columns_to_project_detail_feature.rb diff --git a/app/controllers/project_categories_controller.rb b/app/controllers/project_categories_controller.rb index 106ff7f22..67a040fef 100644 --- a/app/controllers/project_categories_controller.rb +++ b/app/controllers/project_categories_controller.rb @@ -5,6 +5,10 @@ class ProjectCategoriesController < ApplicationController @project_categories = q.result(distinct: true) end + def pinned_index + @project_categories = ProjectCategory.where.not(pinned_index: 0).order(pinned_index: :desc) + end + def group_list @project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc) # projects = Project.no_anomory_projects.visible diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4f48e53dc..fc0bc41e1 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -6,7 +6,7 @@ class ProjectsController < ApplicationController before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend about menu_list] before_action :require_profile_completed, only: [:create, :migrate] - before_action :load_repository, except: %i[index group_type_list migrate create recommend] + before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend] before_action :authorizate_user_can_edit_project!, only: %i[update] before_action :project_public?, only: %i[fork_users praise_users watch_users] @@ -30,8 +30,8 @@ class ProjectsController < ApplicationController def index scope = current_user.logged? ? Projects::ListQuery.call(params, current_user.id) : Projects::ListQuery.call(params) - # @projects = kaminari_paginate(scope) - @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units) + @projects = kaminari_paginate(scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)) + # @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units) category_id = params[:category_id] @total_count = @@ -199,6 +199,10 @@ class ProjectsController < ApplicationController @projects = Project.recommend.includes(:repository, :project_category, :owner).order(visits: :desc) end + def banner_recommend + @projects = Project.recommend.where.not(recommend_index: 0).includes(:project_category, :owner, :project_language).order(recommend_index: :desc) + end + def about @project_detail = @project.project_detail @attachments = Array(@project_detail&.attachments) if request.get? diff --git a/app/models/project.rb b/app/models/project.rb index 03cad7ca7..d36c13efc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -55,8 +55,9 @@ # platform :integer default("0") # default_branch :string(255) default("master") # website :string(255) -# order_index :integer default("0") # lesson_url :string(255) +# is_pinned :boolean default("0") +# recommend_index :integer default("0") # # Indexes # @@ -79,6 +80,7 @@ + class Project < ApplicationRecord include Matchable include Publicable @@ -134,6 +136,7 @@ class Project < ApplicationRecord scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)} scope :recommend, -> { visible.project_statics_select.where(recommend: true) } + scope :pinned, -> {where(is_pinned: true)} delegate :content, to: :project_detail, allow_nil: true delegate :name, to: :license, prefix: true, allow_nil: true diff --git a/app/models/project_category.rb b/app/models/project_category.rb index 67b802998..df8962e00 100644 --- a/app/models/project_category.rb +++ b/app/models/project_category.rb @@ -8,6 +8,12 @@ # projects_count :integer default("0") # created_at :datetime not null # updated_at :datetime not null +# ancestry :string(255) +# pinned_index :integer default("0") +# +# Indexes +# +# index_project_categories_on_ancestry (ancestry) # class ProjectCategory < ApplicationRecord diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 4658408d2..4f514b610 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -11,7 +11,8 @@ class Projects::ListQuery < ApplicationQuery end def call - q = Project.visible.by_name_or_identifier(params[:search]) + q = params[:pinned].present? ? Project.pinned : Project + q = q.visible.by_name_or_identifier(params[:search]) scope = q .with_project_type(params[:project_type]) diff --git a/app/views/project_categories/pinned_index.json.jbuilder b/app/views/project_categories/pinned_index.json.jbuilder new file mode 100644 index 000000000..c2f2e024c --- /dev/null +++ b/app/views/project_categories/pinned_index.json.jbuilder @@ -0,0 +1 @@ +json.project_categories @project_categories, :id, :name diff --git a/app/views/projects/banner_recommend.json.jbuilder b/app/views/projects/banner_recommend.json.jbuilder new file mode 100644 index 000000000..ca672373a --- /dev/null +++ b/app/views/projects/banner_recommend.json.jbuilder @@ -0,0 +1,35 @@ +json.partial! "commons/success" +json.projects do + json.array! @projects do |project| + owner = project.owner + json.id project.id + json.identifier project.identifier + json.name project.name + json.visits project.visits + json.author do + json.name owner.try(:show_real_name) + json.type owner.type + json.login owner.login + json.image_url url_to_avatar(owner) + end + + json.category do + if project.project_category.blank? + json.nil! + else + json.id project.project_category.id + json.name project.project_category.name + end + end + + json.language do + if project.project_language.blank? + json.nil! + else + json.id project.project_language.id + json.name project.project_language.name + end + end + end +end + diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 96ab89c00..874f60974 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -1,4 +1,4 @@ -json.total_count @total_count +json.total_count @projects.total_count json.projects @projects do |project| # json.partial! "/projects/project_detail", project: project json.id project.id diff --git a/config/routes.rb b/config/routes.rb index 7f78cc8dd..c4afbe4c3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -159,6 +159,7 @@ Rails.application.routes.draw do resources :project_categories, only: [:index, :show] do get :group_list, on: :collection + get :pinned_index, on: :collection end resources :project_languages, only: [:index, :show] resources :ignores, only: [:index, :show] @@ -184,6 +185,7 @@ Rails.application.routes.draw do post :migrate get :group_type_list get :recommend + get :banner_recommend end end diff --git a/db/migrate/20211027032626_add_some_columns_to_project_detail_feature.rb b/db/migrate/20211027032626_add_some_columns_to_project_detail_feature.rb new file mode 100644 index 000000000..4a4aef328 --- /dev/null +++ b/db/migrate/20211027032626_add_some_columns_to_project_detail_feature.rb @@ -0,0 +1,7 @@ +class AddSomeColumnsToProjectDetailFeature < ActiveRecord::Migration[5.2] + def change + add_column :project_categories, :pinned_index, :integer, default: 0 + add_column :projects, :is_pinned, :boolean, default: false + add_column :projects, :recommend_index, :integer, default: 0 + end +end From 0970a402c8743e645c4f906955bc786051606804 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 14:38:30 +0800 Subject: [PATCH 14/41] fix --- app/models/project_category.rb | 3 +++ app/views/project_categories/pinned_index.json.jbuilder | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/project_category.rb b/app/models/project_category.rb index df8962e00..a8362af69 100644 --- a/app/models/project_category.rb +++ b/app/models/project_category.rb @@ -20,4 +20,7 @@ class ProjectCategory < ApplicationRecord include Projectable has_ancestry + def logo_url + "" + end end diff --git a/app/views/project_categories/pinned_index.json.jbuilder b/app/views/project_categories/pinned_index.json.jbuilder index c2f2e024c..db3997ebd 100644 --- a/app/views/project_categories/pinned_index.json.jbuilder +++ b/app/views/project_categories/pinned_index.json.jbuilder @@ -1 +1 @@ -json.project_categories @project_categories, :id, :name +json.project_categories @project_categories, :id, :name, :logo_url From 91852d7957dd22f5c56f16000f4b8bda9adc6470 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 16:50:18 +0800 Subject: [PATCH 15/41] add: project explore management --- .../javascripts/admins/projects/index.js | 137 ++++++++++++++++++ .../admins/project_categories_controller.rb | 6 +- app/controllers/admins/projects_controller.rb | 30 ++++ app/models/project.rb | 12 +- .../project_categories/_form_modal.html.erb | 13 +- .../admins/project_categories/_list.html.erb | 2 + app/views/admins/projects/edit.js.erb | 2 + app/views/admins/projects/index.html.erb | 5 +- .../projects/shared/_form_modal.html.erb | 26 ++++ .../admins/projects/shared/_list.html.erb | 17 ++- config/routes.rb | 2 +- 11 files changed, 242 insertions(+), 10 deletions(-) create mode 100644 app/assets/javascripts/admins/projects/index.js create mode 100644 app/views/admins/projects/edit.js.erb create mode 100644 app/views/admins/projects/shared/_form_modal.html.erb diff --git a/app/assets/javascripts/admins/projects/index.js b/app/assets/javascripts/admins/projects/index.js new file mode 100644 index 000000000..55da8e455 --- /dev/null +++ b/app/assets/javascripts/admins/projects/index.js @@ -0,0 +1,137 @@ +/* + * @Description: Do not edit + * @Date: 2021-08-31 11:16:45 + * @LastEditors: viletyy + * @Author: viletyy + * @LastEditTime: 2021-08-31 14:19:46 + * @FilePath: /forgeplus/app/assets/javascripts/admins/system_notifications/index.js + */ +$(document).on('turbolinks:load', function(){ + + var showSuccessNotify = function() { + $.notify({ + message: '操作成功' + },{ + type: 'success' + }); + } + + // close user + $('.project-list-container').on('click', '.recommend-action', function(){ + var $closeAction = $(this); + var $uncloseAction = $closeAction.siblings('.unrecommend-action'); + + var keywordID = $closeAction.data('id'); + customConfirm({ + content: '确认将该项目设置为推荐项目吗?', + ok: function(){ + $.ajax({ + url: '/admins/projects/' + keywordID, + method: 'PUT', + dataType: 'json', + data: { + project: { + recommend: true, + recommend_index: 1 + } + }, + success: function() { + showSuccessNotify(); + $closeAction.hide(); + $uncloseAction.show(); + $(".project-item-"+keywordID).children('td').eq(5).text("√") + } + }); + } + }); + }); + + // unclose user + $('.project-list-container').on('click', '.unrecommend-action', function(){ + var $uncloseAction = $(this); + var $closeAction = $uncloseAction.siblings('.recommend-action'); + + var keywordID = $uncloseAction.data('id'); + customConfirm({ + content: '确认取消该推荐项目吗？', + ok: function () { + $.ajax({ + url: '/admins/projects/' + keywordID, + method: 'PUT', + dataType: 'json', + data: { + project: { + recommend: false, + recommend: 1 + } + }, + success: function() { + showSuccessNotify(); + $closeAction.show(); + $uncloseAction.hide(); + $(".project-item-"+keywordID).children('td').eq(5).text("") + } + }); + } + }) + }); + + + // close user + $('.project-list-container').on('click', '.pinned-action', function(){ + var $closeAction = $(this); + var $uncloseAction = $closeAction.siblings('.unpinned-action'); + + var keywordID = $closeAction.data('id'); + customConfirm({ + content: '确认将该项目设置为精选项目吗?', + ok: function(){ + $.ajax({ + url: '/admins/projects/' + keywordID, + method: 'PUT', + dataType: 'json', + data: { + project: { + is_pinned: true, + } + }, + success: function() { + showSuccessNotify(); + $closeAction.hide(); + $uncloseAction.show(); + $(".project-item-"+keywordID).children('td').eq(4).text("√") + } + }); + } + }); + }); + + // unclose user + $('.project-list-container').on('click', '.unpinned-action', function(){ + var $uncloseAction = $(this); + var $closeAction = $uncloseAction.siblings('.pinned-action'); + + var keywordID = $uncloseAction.data('id'); + customConfirm({ + content: '确认取消该精选项目吗？', + ok: function () { + $.ajax({ + url: '/admins/projects/' + keywordID, + method: 'PUT', + dataType: 'json', + data: { + project: { + is_pinned: false, + } + }, + success: function() { + showSuccessNotify(); + $closeAction.show(); + $uncloseAction.hide(); + $(".project-item-"+keywordID).children('td').eq(4).text("") + } + }); + } + }) + }); +}) \ No newline at end of file diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb index ba83e841d..282faf771 100644 --- a/app/controllers/admins/project_categories_controller.rb +++ b/app/controllers/admins/project_categories_controller.rb @@ -22,7 +22,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController max_position_items = ProjectCategory.select(:id, :position).pluck(:position).reject!(&:blank?) max_position = max_position_items.present? ? max_position_items.max.to_i : 0 - @project_category = ProjectCategory.new(name: @name,position: max_position) + @project_category = ProjectCategory.new(name: @name,position: max_position, pinned_index: params[:project_category][:pinned_index].to_i) if @project_category.save redirect_to admins_project_categories_path flash[:success] = '创建成功' @@ -33,7 +33,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController end def update - if @project_category.update_attribute(:name, @name) + if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i}) redirect_to admins_project_categories_path flash[:success] = '更新成功' else @@ -43,7 +43,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController end def destroy - if @project_language.destroy + if @project_category.destroy redirect_to admins_project_categories_path flash[:success] = "删除成功" else diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb index 9e06eb1c9..4175f7250 100644 --- a/app/controllers/admins/projects_controller.rb +++ b/app/controllers/admins/projects_controller.rb @@ -1,4 +1,5 @@ class Admins::ProjectsController < Admins::BaseController + before_action :find_project, only: [:edit, :update] def index sort_by = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_on' @@ -8,6 +9,26 @@ class Admins::ProjectsController < Admins::BaseController @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score) end + def edit ;end + + def update + respond_to do |format| + if @project.update_attributes(project_update_params) + format.html do + redirect_to admins_projects_path + flash[:sucess] = "更新成功" + end + format.js {render_ok} + else + format.html do + redirect_to admins_projects_path + flash[:danger] = "更新失败" + end + format.js {render_js_error} + end + end + end + def destroy project = Project.find_by!(id: params[:id]) ActiveRecord::Base.transaction do @@ -21,4 +42,13 @@ class Admins::ProjectsController < Admins::BaseController redirect_to admins_projects_path flash[:danger] = "删除失败" end + + private + def find_project + @project = Project.find_by_id(params[:id]) + end + + def project_update_params + params.require(:project).permit(:is_pinned, :recommend, :recommend_index) + end end \ No newline at end of file diff --git a/app/models/project.rb b/app/models/project.rb index d36c13efc..aa2e152cf 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -130,7 +130,7 @@ class Project < ApplicationRecord has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id after_create :init_project_common, :incre_user_statistic, :incre_platform_statistic after_save :check_project_members, :reset_cache_data - before_save :set_invite_code, :reset_unmember_followed + before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned before_destroy :decre_project_common after_destroy :decre_user_statistic, :decre_platform_statistic scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} @@ -214,6 +214,16 @@ class Project < ApplicationRecord end end + def set_recommend_and_is_pinned + self.recommend = self.recommend_index.zero? ? false : true + # 私有项目不允许设置精选和推荐 + unless self.is_public + self.recommend = false + self.recommend_index = 0 + self.is_pinned = false + end + end + def self.search_project(search) ransack(name_or_identifier_cont: search) end diff --git a/app/views/admins/project_categories/_form_modal.html.erb b/app/views/admins/project_categories/_form_modal.html.erb index fd20936b6..84e43416a 100644 --- a/app/views/admins/project_categories/_form_modal.html.erb +++ b/app/views/admins/project_categories/_form_modal.html.erb @@ -9,7 +9,18 @@ <%= form_for @project_category, url: {controller: "project_categories", action: "#{type}"} do |p| %>
- <%= p.text_field :name,class: "form-control input-lg",placeholder: "分类名称",required: true, maxlength: 64%> +
+ + <%= p.text_field :name,class: "form-control input-lg",placeholder: "分类名称",required: true, maxlength: 64%> +
+
+ + <%= p.number_field :pinned_index,class: "form-control input-lg",placeholder: "精选级别",required: true%> +
diff --git a/app/views/admins/project_categories/_list.html.erb b/app/views/admins/project_categories/_list.html.erb index 1d3316817..b8b55afa4 100644 --- a/app/views/admins/project_categories/_list.html.erb +++ b/app/views/admins/project_categories/_list.html.erb @@ -3,6 +3,7 @@ 序号 名称 + <%= sort_tag('精选', name: 'pinned_index', path: admins_project_categories_path) %> <%= sort_tag('项目数', name: 'projects_count', path: admins_project_categories_path) %> <%= sort_tag('创建时间', name: 'created_at', path: admins_project_categories_path) %> 操作 @@ -16,6 +17,7 @@ <%= link_to(project_category.name, "/projects?category_id=#{project_category.id}", target: '_blank') %> + <%= project_category.pinned_index == 0 ? "" : "√" %> <%= project_category.projects_count %> <%= project_category.created_at&.strftime('%Y-%m-%d %H:%M') %> diff --git a/app/views/admins/projects/edit.js.erb b/app/views/admins/projects/edit.js.erb new file mode 100644 index 000000000..9bb97d4b2 --- /dev/null +++ b/app/views/admins/projects/edit.js.erb @@ -0,0 +1,2 @@ +$("#projects-modals").html("<%= j render(partial: 'admins/projects/shared/form_modal', locals: {type: 'update'}) %>") +$(".project-change-modal").modal('show'); \ No newline at end of file diff --git a/app/views/admins/projects/index.html.erb b/app/views/admins/projects/index.html.erb index c2cdd3946..af93598c9 100644 --- a/app/views/admins/projects/index.html.erb +++ b/app/views/admins/projects/index.html.erb @@ -12,4 +12,7 @@
<%= render partial: 'admins/projects/shared/list', locals: { projects: @projects } %> -
\ No newline at end of file +
+ +
+
diff --git a/app/views/admins/projects/shared/_form_modal.html.erb b/app/views/admins/projects/shared/_form_modal.html.erb new file mode 100644 index 000000000..359d3bdd3 --- /dev/null +++ b/app/views/admins/projects/shared/_form_modal.html.erb @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb index fe8d96e9d..90ce5c4ad 100644 --- a/app/views/admins/projects/shared/_list.html.erb +++ b/app/views/admins/projects/shared/_list.html.erb @@ -5,6 +5,8 @@ ID 项目名称 公开 + 精选 + 推荐 issue 资源 版本库 @@ -12,8 +14,8 @@ 里程碑 成员 管理员 - <%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %> - 操作 + <%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %> + 操作 @@ -26,6 +28,8 @@ <%= link_to(project.name, "/projects/#{project&.owner&.login}/#{project.identifier}", target: '_blank') %> <%= project.is_public ? '√' : '' %> + <%= project.is_pinned ? '√' : '' %> + <%= project.recommend ? '√' : '' %> <%= project.issues.size %> <%= project.attachments.size %> <%= project&.project_score.try(:changeset_num).to_i %> @@ -37,8 +41,15 @@ <%= project.created_on&.strftime('%Y-%m-%d %H:%M') %> + <% if project.is_public %> + <%= javascript_void_link '精选', class: 'action pinned-action', data: { id: project.id }, style: project.is_pinned ? 'display: none;' : '' %> + <%= javascript_void_link '取消精选', class: 'action unpinned-action', data: { id: project.id }, style: project.is_pinned ? '' : 'display: none;' %> + <%= javascript_void_link '推荐', class: 'action recommend-action', data: { id: project.id }, style: project.recommend ? 'display: none;' : '' %> + <%= javascript_void_link '取消推荐', class: 'action unrecommend-action', data: { id: project.id }, style: project.recommend ? '' : 'display: none;' %> + <%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action", style: project.recommend ? '' : 'display: none;' %> + <% end %> <%= link_to "删除", admins_project_path(project.id), method: :delete, data:{confirm: "确认删除的吗？"}, class: "delete-project-action" %> - + <% end %> <% else %> diff --git a/config/routes.rb b/config/routes.rb index c4afbe4c3..5d40ca42c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -909,7 +909,7 @@ Rails.application.routes.draw do resources :courses, only: [:index, :destroy, :update] - resources :projects, only: [:index, :destroy] + resources :projects, only: [:index, :edit, :update, :destroy] resources :disciplines, only: [:index, :create, :edit, :update, :destroy] do post :adjust_position, on: :member From f0580720e3908f266e7a34f275ffd5ba527a647a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 16:58:31 +0800 Subject: [PATCH 16/41] fix --- app/assets/javascripts/admins/projects/index.js | 2 ++ app/views/admins/projects/shared/_list.html.erb | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admins/projects/index.js b/app/assets/javascripts/admins/projects/index.js index 55da8e455..19374ab47 100644 --- a/app/assets/javascripts/admins/projects/index.js +++ b/app/assets/javascripts/admins/projects/index.js @@ -20,6 +20,7 @@ $(document).on('turbolinks:load', function(){ $('.project-list-container').on('click', '.recommend-action', function(){ var $closeAction = $(this); var $uncloseAction = $closeAction.siblings('.unrecommend-action'); + var $editAction = $closeAction.siblings('.edit-recommend-action'); var keywordID = $closeAction.data('id'); customConfirm({ @@ -39,6 +40,7 @@ $(document).on('turbolinks:load', function(){ showSuccessNotify(); $closeAction.hide(); $uncloseAction.show(); + $editAction.show(); $(".project-item-"+keywordID).children('td').eq(5).text("√") } }); diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb index 90ce5c4ad..96b85a989 100644 --- a/app/views/admins/projects/shared/_list.html.erb +++ b/app/views/admins/projects/shared/_list.html.erb @@ -1,9 +1,9 @@ - - - + + + @@ -46,7 +46,7 @@ <%= javascript_void_link '取消精选', class: 'action unpinned-action', data: { id: project.id }, style: project.is_pinned ? '' : 'display: none;' %> <%= javascript_void_link '推荐', class: 'action recommend-action', data: { id: project.id }, style: project.recommend ? 'display: none;' : '' %> <%= javascript_void_link '取消推荐', class: 'action unrecommend-action', data: { id: project.id }, style: project.recommend ? '' : 'display: none;' %> - <%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action", style: project.recommend ? '' : 'display: none;' %> + <%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action edit-recommend-action", style: project.recommend ? '' : 'display: none;' %> <% end %> <%= link_to "删除", admins_project_path(project.id), method: :delete, data:{confirm: "确认删除的吗？"}, class: "delete-project-action" %> From cc0e01cc471c5a5790d17434c647f1f8cb4ef0e8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 17:06:35 +0800 Subject: [PATCH 17/41] fix --- app/views/projects/banner_recommend.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/projects/banner_recommend.json.jbuilder b/app/views/projects/banner_recommend.json.jbuilder index ca672373a..fe9861f85 100644 --- a/app/views/projects/banner_recommend.json.jbuilder +++ b/app/views/projects/banner_recommend.json.jbuilder @@ -5,6 +5,7 @@ json.projects do json.id project.id json.identifier project.identifier json.name project.name + json.description project.description json.visits project.visits json.author do json.name owner.try(:show_real_name) From 274e5090ceee56b13f0a4a740c2ec8c39146bd7a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 17:07:48 +0800 Subject: [PATCH 18/41] fix --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index aa2e152cf..e8760acf1 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -133,7 +133,7 @@ class Project < ApplicationRecord before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned before_destroy :decre_project_common after_destroy :decre_user_statistic, :decre_platform_statistic - scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} + scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :description, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)} scope :recommend, -> { visible.project_statics_select.where(recommend: true) } scope :pinned, -> {where(is_pinned: true)} From 43dc966cf99580796dda532c4db9750d8201f032 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 18:02:21 +0800 Subject: [PATCH 19/41] add: project category upload logo --- app/assets/javascripts/admin.js | 35 +++++ app/assets/stylesheets/admin.scss | 146 ++++++++++++++++++ .../admins/project_categories_controller.rb | 10 +- app/models/project_category.rb | 10 +- .../project_categories/_form_modal.html.erb | 19 ++- .../admins/project_categories/edit.js.erb | 19 ++- .../projects/shared/_form_modal.html.erb | 2 +- 7 files changed, 234 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 0cab04359..d738e5caa 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -99,3 +99,38 @@ $(document).on("turbolinks:before-cache", function () { $(function () { }); + +$(document).on('turbolinks:load', function() { + + $('.logo-item-left').on("change", 'input[type="file"]', function () { + var $fileInput = $(this); + var file = this.files[0]; + var imageType = /image.*/; + if (file && file.type.match(imageType)) { + var reader = new FileReader(); + reader.onload = function () { + var $box = $fileInput.parent(); + $box.find('img').attr('src', reader.result).css('display', 'block'); + $box.addClass('has-img'); + }; + reader.readAsDataURL(file); + } else { + } + }); + + $('.attachment-item-left').on("change", 'input[type="file"]', function () { + var $fileInput = $(this); + var file = this.files[0]; + var imageType = /image.*/; + if (file && file.type.match(imageType)) { + var reader = new FileReader(); + reader.onload = function () { + var $box = $fileInput.parent(); + $box.find('img').attr('src', reader.result).css('display', 'block'); + $box.addClass('has-img'); + }; + reader.readAsDataURL(file); + } else { + } + }); +}) \ No newline at end of file diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index a401fc379..03c3970a6 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -58,3 +58,149 @@ input.form-control { position: absolute; } +.logo-item { + display: flex; + + &-img { + display: block; + width: 80px; + height: 80px; + background: #e9ecef; + } + + &-upload { + cursor: pointer; + position: absolute; + top: 0; + width: 80px; + height: 80px; + background: #e9ecef; + border: 1px solid #ced4da; + + &::before { + content: ''; + position: absolute; + top: 27px; + left: 39px; + width: 2px; + height: 26px; + background: #495057; + } + + &::after { + content: ''; + position: absolute; + top: 39px; + left: 27px; + width: 26px; + height: 2px; + background: #495057; + } + } + + &-left { + position: relative; + width: 80px; + height: 80px; + + &.has-img { + .logo-item-upload { + display: none; + } + + &:hover { + .logo-item-upload { + display: block; + background: rgba(145, 145, 145, 0.8); + } + } + } + } + + &-right { + display: flex; + flex-direction: column; + justify-content: space-between; + color: #777777; + font-size: 0.8rem; + } + + &-title { + color: #23272B; + font-size: 1rem; + } +} + +.attachment-item { + display: flex; + + &-img { + display: block; + width: 160px; + height: 160px; + background: #e9ecef; + } + + &-upload { + cursor: pointer; + position: absolute; + top: 0; + width: 160px; + height: 160px; + background: #e9ecef; + border: 1px solid #ced4da; + + &::before { + content: ''; + position: absolute; + top: 54px; + left: 78px; + width: 2px; + height: 52px; + background: #495057; + } + + &::after { + content: ''; + position: absolute; + top: 78px; + left: 54px; + width: 52px; + height: 2px; + background: #495057; + } + } + + &-left { + position: relative; + width: 160px; + height: 160px; + + &.has-img { + .attachment-item-upload { + display: none; + } + + &:hover { + .attachment-item-upload { + display: block; + background: rgba(145, 145, 145, 0.8); + } + } + } + } + + &-right { + padding-top: 100px; + display: flex; + flex-direction: column; + justify-content: space-between; + color: #777777; + font-size: 0.8rem; + } + + &-title { + color: #23272B; + font-size: 1rem; + } +} \ No newline at end of file diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb index 282faf771..8b1dd1f77 100644 --- a/app/controllers/admins/project_categories_controller.rb +++ b/app/controllers/admins/project_categories_controller.rb @@ -33,7 +33,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController end def update - if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i}) + if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i}) && save_image_file(params[:logo], 'logo') redirect_to admins_project_categories_path flash[:success] = '更新成功' else @@ -80,4 +80,12 @@ class Admins::ProjectCategoriesController < Admins::BaseController flash[:danger] = '分类已存在' end end + + def save_image_file(file, type) + return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile) + + file_path = Util::FileManage.source_disk_filename(@project_category, type) + File.delete(file_path) if File.exist?(file_path) # 删除之前的文件 + Util.write_file(file, file_path) + end end \ No newline at end of file diff --git a/app/models/project_category.rb b/app/models/project_category.rb index a8362af69..4bba5423e 100644 --- a/app/models/project_category.rb +++ b/app/models/project_category.rb @@ -21,6 +21,14 @@ class ProjectCategory < ApplicationRecord has_ancestry def logo_url - "" + image_url('logo') end + + private + + def image_url(type) + return nil unless Util::FileManage.exists?(self, type) + Util::FileManage.source_disk_file_url(self, type) + end + end diff --git a/app/views/admins/project_categories/_form_modal.html.erb b/app/views/admins/project_categories/_form_modal.html.erb index 84e43416a..f638b4d0e 100644 --- a/app/views/admins/project_categories/_form_modal.html.erb +++ b/app/views/admins/project_categories/_form_modal.html.erb @@ -7,7 +7,7 @@ - <%= form_for @project_category, url: {controller: "project_categories", action: "#{type}"} do |p| %> + <%= form_for @project_category, url: {controller: "project_categories", action: "#{type}"}, html: { enctype: 'multipart/form-data' } do |p| %>
- <%= p.number_field :pinned_index,class: "form-control input-lg",placeholder: "精选级别",required: true%> + <%= p.number_field :pinned_index,class: "form-control input-lg",placeholder: "精选等级",required: true%> +
+
+ <% logo_img = @project_category.logo_url %> +
+ + <%= file_field_tag(:logo, accept: 'image/png,image/jpg,image/jpeg',style: "display: none", value: params[:logo]) %> + +
+
+
网站导航logo
+
格式：PNG、JPG
+
尺寸：高度38px以内，宽等比例缩放
+
diff --git a/app/views/admins/project_categories/edit.js.erb b/app/views/admins/project_categories/edit.js.erb index a8636cfce..86d1d2ee2 100644 --- a/app/views/admins/project_categories/edit.js.erb +++ b/app/views/admins/project_categories/edit.js.erb @@ -1,2 +1,19 @@ $("#project-category-modals").html("<%= j render(partial: 'admins/project_categories/form_modal', locals: {type: 'update'}) %>") -$(".project-category-change-modal").modal('show'); \ No newline at end of file +$(".project-category-change-modal").modal('show'); + + +$('.logo-item-left').on("change", 'input[type="file"]', function () { + var $fileInput = $(this); + var file = this.files[0]; + var imageType = /image.*/; + if (file && file.type.match(imageType)) { + var reader = new FileReader(); + reader.onload = function () { + var $box = $fileInput.parent(); + $box.find('img').attr('src', reader.result).css('display', 'block'); + $box.addClass('has-img'); + }; + reader.readAsDataURL(file); + } else { + } +}); diff --git a/app/views/admins/projects/shared/_form_modal.html.erb b/app/views/admins/projects/shared/_form_modal.html.erb index 359d3bdd3..b9796756a 100644 --- a/app/views/admins/projects/shared/_form_modal.html.erb +++ b/app/views/admins/projects/shared/_form_modal.html.erb @@ -13,7 +13,7 @@ - <%= p.number_field :recommend_index,class: "form-control input-lg"%> + <%= p.number_field :recommend_index,class: "form-control input-lg",required: true%>
From 9aff90c03a6c64e89db1e73b166b47ec0c2f61ab Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 10:52:44 +0800 Subject: [PATCH 20/41] fix --- app/assets/javascripts/admins/projects/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admins/projects/index.js b/app/assets/javascripts/admins/projects/index.js index 19374ab47..dbf710ea5 100644 --- a/app/assets/javascripts/admins/projects/index.js +++ b/app/assets/javascripts/admins/projects/index.js @@ -52,6 +52,7 @@ $(document).on('turbolinks:load', function(){ $('.project-list-container').on('click', '.unrecommend-action', function(){ var $uncloseAction = $(this); var $closeAction = $uncloseAction.siblings('.recommend-action'); + var $editAction = $closeAction.siblings('.edit-recommend-action'); var keywordID = $uncloseAction.data('id'); customConfirm({ @@ -64,13 +65,14 @@ $(document).on('turbolinks:load', function(){ data: { project: { recommend: false, - recommend: 1 + recommend_index: 0 } }, success: function() { showSuccessNotify(); $closeAction.show(); $uncloseAction.hide(); + $editAction.hide(); $(".project-item-"+keywordID).children('td').eq(5).text("") } }); From 2b6d5e694e96201b312b2a0d41e0de1bd55f9dd7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 10:56:30 +0800 Subject: [PATCH 21/41] fix --- app/views/admins/project_categories/_form_modal.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/project_categories/_form_modal.html.erb b/app/views/admins/project_categories/_form_modal.html.erb index f638b4d0e..fc58d3345 100644 --- a/app/views/admins/project_categories/_form_modal.html.erb +++ b/app/views/admins/project_categories/_form_modal.html.erb @@ -29,7 +29,7 @@
-
网站导航logo
+
logo
格式：PNG、JPG
尺寸：高度38px以内，宽等比例缩放
From 3f690fd9a01fc67fd9b8f4d7eebeafbf1d0d9b46 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 11:00:32 +0800 Subject: [PATCH 22/41] add: pinned projects size --- app/controllers/admins/project_categories_controller.rb | 2 +- app/views/admins/project_categories/_list.html.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb index 8b1dd1f77..3b5065a16 100644 --- a/app/controllers/admins/project_categories_controller.rb +++ b/app/controllers/admins/project_categories_controller.rb @@ -5,7 +5,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController def index sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at' sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc' - q = ProjectCategory.ransack(name_cont: params[:name]) + q = ProjectCategory.includes(:projects).ransack(name_cont: params[:name]) project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}") @project_categories = paginate(project_categories) diff --git a/app/views/admins/project_categories/_list.html.erb b/app/views/admins/project_categories/_list.html.erb index b8b55afa4..1a460a486 100644 --- a/app/views/admins/project_categories/_list.html.erb +++ b/app/views/admins/project_categories/_list.html.erb @@ -5,6 +5,7 @@ + @@ -19,6 +20,7 @@ + - +
序号ID项目名称序号ID项目名称 公开 精选 推荐名称 <%= sort_tag('精选', name: 'pinned_index', path: admins_project_categories_path) %> <%= sort_tag('项目数', name: 'projects_count', path: admins_project_categories_path) %>精选项目数 <%= sort_tag('创建时间', name: 'created_at', path: admins_project_categories_path) %> 操作
<%= project_category.pinned_index == 0 ? "" : "√" %> <%= project_category.projects_count %><%= project_category.projects.where(is_pinned: true).size %> <%= project_category.created_at&.strftime('%Y-%m-%d %H:%M') %> <%= link_to "编辑", edit_admins_project_category_path(project_category), remote: true, class: "action" %> From 81ab0b01c04b055d7d312e47feb2ab82392ef548 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 14:21:42 +0800 Subject: [PATCH 23/41] fix: banner recommend remove login require --- app/controllers/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index fc0bc41e1..4c4aa3a00 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -4,7 +4,7 @@ class ProjectsController < ApplicationController include ProjectsHelper include Acceleratorable - before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend about menu_list] + before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend banner_recommend about menu_list] before_action :require_profile_completed, only: [:create, :migrate] before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend] before_action :authorizate_user_can_edit_project!, only: %i[update] From 8698829678b72fc6929c6f622b2b958188361726 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 15:28:33 +0800 Subject: [PATCH 24/41] fix: organization recommend api --- .../organizations/organizations_controller.rb | 7 +++++-- app/models/organization.rb | 2 +- app/models/organization_extension.rb | 8 ++++++++ .../organizations/recommend.json.jbuilder | 16 +++++++++++----- ...9_add_recommend_to_organization_extensions.rb | 5 +++++ 5 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20211028065339_add_recommend_to_organization_extensions.rb diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb index f019e8d39..dcec6c050 100644 --- a/app/controllers/organizations/organizations_controller.rb +++ b/app/controllers/organizations/organizations_controller.rb @@ -69,8 +69,7 @@ class Organizations::OrganizationsController < Organizations::BaseController def recommend recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer) - @organizations = Organization.with_visibility(%w(common)) - .where(login: recommend).select(:id, :login, :firstname, :lastname, :nickname) + @organizations = Organization.includes(:organization_extension).where(organization_extensions: {recommend: true}).to_a.each_slice(group_size).to_a end private @@ -81,6 +80,10 @@ class Organizations::OrganizationsController < Organizations::BaseController :max_repo_creation, :nickname) end + def group_size + params.fetch(:group_size, 4) + end + def password params.fetch(:password, "") end diff --git a/app/models/organization.rb b/app/models/organization.rb index 4fd0886da..a967e4782 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -76,7 +76,7 @@ class Organization < Owner validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false validates :login, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" } - delegate :description, :website, :location, :repo_admin_change_team_access, + delegate :description, :website, :location, :repo_admin_change_team_access, :recommend, :visibility, :max_repo_creation, :num_projects, :num_users, :num_teams, to: :organization_extension, allow_nil: true scope :with_visibility, ->(visibility) { joins(:organization_extension).where(organization_extensions: {visibility: visibility}) if visibility.present? } diff --git a/app/models/organization_extension.rb b/app/models/organization_extension.rb index 8b9946cd7..4b0935208 100644 --- a/app/models/organization_extension.rb +++ b/app/models/organization_extension.rb @@ -15,6 +15,7 @@ # num_projects :integer default("0") # num_users :integer default("0") # num_teams :integer default("0") +# recommend :boolean default("0") # # Indexes # @@ -30,6 +31,8 @@ class OrganizationExtension < ApplicationRecord enum visibility: {common: 0, limited: 1, privacy: 2} + before_save :set_recommend + def self.build(organization_id, description, website, location, repo_admin_change_team_access, visibility, max_repo_creation) self.create!(organization_id: organization_id, description: description, @@ -39,4 +42,9 @@ class OrganizationExtension < ApplicationRecord visibility: visibility, max_repo_creation: max_repo_creation) end + + private + def set_recommend + self.recommend = false unless self.common? + end end diff --git a/app/views/organizations/organizations/recommend.json.jbuilder b/app/views/organizations/organizations/recommend.json.jbuilder index 262cc23dd..340634e02 100644 --- a/app/views/organizations/organizations/recommend.json.jbuilder +++ b/app/views/organizations/organizations/recommend.json.jbuilder @@ -1,6 +1,12 @@ -json.organizations @organizations do |organization| - json.id organization.id - json.name organization.login - json.nickname organization.nickname.blank? ? organization.name : organization.nickname - json.avatar_url url_to_avatar(organization) +json.organizations do + + json.array! @organizations.each do |group| + json.array! group.each do |organization| + json.id organization.id + json.name organization.login + json.nickname organization.real_name + json.avatar_url url_to_avatar(organization) + json.website organization.website + end + end end \ No newline at end of file diff --git a/db/migrate/20211028065339_add_recommend_to_organization_extensions.rb b/db/migrate/20211028065339_add_recommend_to_organization_extensions.rb new file mode 100644 index 000000000..39a8d08b3 --- /dev/null +++ b/db/migrate/20211028065339_add_recommend_to_organization_extensions.rb @@ -0,0 +1,5 @@ +class AddRecommendToOrganizationExtensions < ActiveRecord::Migration[5.2] + def change + add_column :organization_extensions, :recommend, :boolean, default: false + end +end From 11d102f2400ca26004906c4aa79c807ccc953707 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 15:32:49 +0800 Subject: [PATCH 25/41] fix --- app/controllers/organizations/organizations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb index dcec6c050..00a7588b5 100644 --- a/app/controllers/organizations/organizations_controller.rb +++ b/app/controllers/organizations/organizations_controller.rb @@ -81,7 +81,7 @@ class Organizations::OrganizationsController < Organizations::BaseController end def group_size - params.fetch(:group_size, 4) + params.fetch(:group_size, 4).to_i end def password From 4f53994470dba09a56b41c1eb63ec98972a478e0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 16:33:30 +0800 Subject: [PATCH 26/41] fix: rank count --- app/controllers/project_rank_controller.rb | 2 +- app/controllers/user_rank_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/project_rank_controller.rb b/app/controllers/project_rank_controller.rb index 07bc2fb0f..d2477b331 100644 --- a/app/controllers/project_rank_controller.rb +++ b/app/controllers/project_rank_controller.rb @@ -2,7 +2,7 @@ class ProjectRankController < ApplicationController # 根据时间获取热门项目 def index $redis_cache.zunionstore("recent-days-project-rank", get_timeable_key_names) - @project_rank = $redis_cache.zrevrange("recent-days-project-rank", 0, 5, withscores: true) + @project_rank = $redis_cache.zrevrange("recent-days-project-rank", 0, 4, withscores: true) rescue Exception => e @project_rack = [] end diff --git a/app/controllers/user_rank_controller.rb b/app/controllers/user_rank_controller.rb index 734b94c84..dddca485c 100644 --- a/app/controllers/user_rank_controller.rb +++ b/app/controllers/user_rank_controller.rb @@ -2,7 +2,7 @@ class UserRankController < ApplicationController # 根据时间获取热门开发者 def index $redis_cache.zunionstore("recent-days-user-rank", get_timeable_key_names) - @user_rank = $redis_cache.zrevrange("recent-days-user-rank", 0, 5, withscores: true) + @user_rank = $redis_cache.zrevrange("recent-days-user-rank", 0, 3, withscores: true) rescue Exception => e @user_rank = [] end From eba672f39a4330fb692b058a5f1d91c39ca9f8d8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 29 Oct 2021 19:38:49 +0800 Subject: [PATCH 27/41] fix: user popular project nil --- app/views/user_rank/_detail.json.jbuilder | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/user_rank/_detail.json.jbuilder b/app/views/user_rank/_detail.json.jbuilder index 54afea5c4..11eda3fc7 100644 --- a/app/views/user_rank/_detail.json.jbuilder +++ b/app/views/user_rank/_detail.json.jbuilder @@ -1,15 +1,19 @@ owner_common = $redis_cache.hgetall("v2-owner-common:#{item[0]}") popular_project = $redis_cache.zrevrange("v2-user-project-rank:#{item[0]}", 0, 1, withscores: true)[0] -popular_project_common = $redis_cache.hgetall("v2-project-common:#{popular_project[0]}") json.id item[0] json.score item[1] json.name owner_common["name"] json.type owner_common["type"] json.login owner_common["login"] json.avatar_url owner_common["avatar_url"] -json.project do - json.id popular_project[0] - json.name popular_project_common["name"] - json.identifier popular_project_common["identifier"] - json.description popular_project_common["description"] +if popular_project.blank? + json.project nil +else + popular_project_common = $redis_cache.hgetall("v2-project-common:#{popular_project[0]}") + json.project do + json.id popular_project[0] + json.name popular_project_common["name"] + json.identifier popular_project_common["identifier"] + json.description popular_project_common["description"] + end end \ No newline at end of file From de2399a0a1985b4640aea1a33993aeeceec82345 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 29 Oct 2021 19:54:58 +0800 Subject: [PATCH 28/41] fix: project category load slowly --- app/controllers/admins/project_categories_controller.rb | 2 +- app/views/admins/project_categories/_list.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb index 3b5065a16..8b1dd1f77 100644 --- a/app/controllers/admins/project_categories_controller.rb +++ b/app/controllers/admins/project_categories_controller.rb @@ -5,7 +5,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController def index sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at' sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc' - q = ProjectCategory.includes(:projects).ransack(name_cont: params[:name]) + q = ProjectCategory.ransack(name_cont: params[:name]) project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}") @project_categories = paginate(project_categories) diff --git a/app/views/admins/project_categories/_list.html.erb b/app/views/admins/project_categories/_list.html.erb index 1a460a486..1a1626bc4 100644 --- a/app/views/admins/project_categories/_list.html.erb +++ b/app/views/admins/project_categories/_list.html.erb @@ -20,7 +20,7 @@ <%= project_category.pinned_index == 0 ? "" : "√" %> <%= project_category.projects_count %><%= project_category.projects.where(is_pinned: true).size %><%= project_category.projects.select(:id).where(is_pinned: true).size %> <%= project_category.created_at&.strftime('%Y-%m-%d %H:%M') %> <%= link_to "编辑", edit_admins_project_category_path(project_category), remote: true, class: "action" %> From 46405e704aa32efd16fb14d3607fbe1ba45507c4 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 1 Nov 2021 16:20:52 +0800 Subject: [PATCH 29/41] add: rank not include deleted project --- .../organizations/organizations_controller.rb | 2 +- app/controllers/project_rank_controller.rb | 3 +- app/controllers/projects_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/jobs/cache_async_clear_job.rb | 12 ++ app/jobs/cache_async_reset_job.rb | 2 + app/jobs/cache_async_set_job.rb | 2 + app/models/organization.rb | 2 +- app/models/project.rb | 8 +- app/models/user.rb | 2 +- app/services/cache/v2/owner_common_service.rb | 88 ++++++++----- .../cache/v2/platform_statistic_service.rb | 4 +- .../cache/v2/project_common_service.rb | 119 +++++++----------- app/services/cache/v2/project_rank_service.rb | 44 ++++--- .../cache/v2/user_statistic_service.rb | 4 +- 15 files changed, 163 insertions(+), 133 deletions(-) create mode 100644 app/jobs/cache_async_clear_job.rb diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb index 00a7588b5..aedf285cd 100644 --- a/app/controllers/organizations/organizations_controller.rb +++ b/app/controllers/organizations/organizations_controller.rb @@ -22,7 +22,7 @@ class Organizations::OrganizationsController < Organizations::BaseController @can_create_project = @organization.can_create_project?(current_user.id) @is_admin = can_edit_org? @is_member = @organization.is_member?(current_user.id) - Cache::V2::OwnerCommonService.new(@organization.login, @organization.mail).read + Cache::V2::OwnerCommonService.new(@organization.id).read end def create diff --git a/app/controllers/project_rank_controller.rb b/app/controllers/project_rank_controller.rb index d2477b331..025e29717 100644 --- a/app/controllers/project_rank_controller.rb +++ b/app/controllers/project_rank_controller.rb @@ -2,9 +2,10 @@ class ProjectRankController < ApplicationController # 根据时间获取热门项目 def index $redis_cache.zunionstore("recent-days-project-rank", get_timeable_key_names) + $redis_cache.zrem("recent-days-project-rank", $redis_cache.smembers("v2-project-rank-deleted")) @project_rank = $redis_cache.zrevrange("recent-days-project-rank", 0, 4, withscores: true) rescue Exception => e - @project_rack = [] + @project_rank = [] end private diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4c4aa3a00..1864c6964 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -191,7 +191,7 @@ class ProjectsController < ApplicationController def simple # 为了缓存活跃项目的基本信息，后续删除 - Cache::V2::ProjectCommonService.new(@project.id).reset + Cache::V2::ProjectCommonService.new(@project.id).read json_response(@project, current_user) end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 48f016b98..744468ed8 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -52,7 +52,7 @@ class UsersController < ApplicationController @projects_mirrior_count = user_projects.mirror.size @projects_sync_mirrior_count = user_projects.sync_mirror.size # 为了缓存活跃用户的基本信息，后续删除 - Cache::V2::OwnerCommonService.new(@user.login, @user.mail).read + Cache::V2::OwnerCommonService.new(@user.id).read end def watch_users diff --git a/app/jobs/cache_async_clear_job.rb b/app/jobs/cache_async_clear_job.rb new file mode 100644 index 000000000..651dfaf41 --- /dev/null +++ b/app/jobs/cache_async_clear_job.rb @@ -0,0 +1,12 @@ +class CacheAsyncClearJob < ApplicationJob + queue_as :cache + + def perform(type, id=nil) + case type + when "project_common_service" + Cache::V2::ProjectCommonService.new(id).clear + when "owner_common_service" + Cache::V2::OwnnerCommonService.new(id).clear + end + end +end \ No newline at end of file diff --git a/app/jobs/cache_async_reset_job.rb b/app/jobs/cache_async_reset_job.rb index da3f01168..0df0f0fd4 100644 --- a/app/jobs/cache_async_reset_job.rb +++ b/app/jobs/cache_async_reset_job.rb @@ -7,6 +7,8 @@ class CacheAsyncResetJob < ApplicationJob Cache::V2::PlatformStatisticService.new.reset when "project_common_service" Cache::V2::ProjectCommonService.new(id).reset + when "owner_common_service" + Cache::V2::OwnnerCommonService.new(id).reset when "user_statistic_service" Cache::V2::UserStatisticService.new(id).reset end diff --git a/app/jobs/cache_async_set_job.rb b/app/jobs/cache_async_set_job.rb index f617b1316..9c7015d42 100644 --- a/app/jobs/cache_async_set_job.rb +++ b/app/jobs/cache_async_set_job.rb @@ -7,6 +7,8 @@ class CacheAsyncSetJob < ApplicationJob Cache::V2::PlatformStatisticService.new(params).call when "project_common_service" Cache::V2::ProjectCommonService.new(id, params).call + when "owner_common_service" + Cache::V2::OwnnerCommonService.new(id, params).call when "user_statistic_service" Cache::V2::UserStatisticService.new(id, params).call end diff --git a/app/models/organization.rb b/app/models/organization.rb index a967e4782..40c676e05 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -84,7 +84,7 @@ class Organization < Owner after_save :reset_cache_data def reset_cache_data - Cache::V2::OwnerCommonService.new(self.login, self.mail).reset + Cache::V2::OwnerCommonService.new(self.id).reset end def self.build(name, nickname, gitea_token=nil) diff --git a/app/models/project.rb b/app/models/project.rb index e8760acf1..45b93cd00 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -128,7 +128,7 @@ class Project < ApplicationRecord has_many :pinned_projects, dependent: :destroy has_many :has_pinned_users, through: :pinned_projects, source: :user has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id - after_create :init_project_common, :incre_user_statistic, :incre_platform_statistic + after_create :incre_user_statistic, :incre_platform_statistic after_save :check_project_members, :reset_cache_data before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned before_destroy :decre_project_common @@ -169,12 +169,8 @@ class Project < ApplicationRecord end end - def init_project_common - CacheAsyncResetJob.perform_later("project_common_service", self.id) - end - def decre_project_common - $redis_cache.del("v2-project-common:#{self.id}") + CacheAsyncClearJob.perform_later('project_common_service', self.id) end def incre_user_statistic diff --git a/app/models/user.rb b/app/models/user.rb index ae20b83d3..72381d0d0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -207,7 +207,7 @@ class User < Owner validate :validate_password_length def reset_cache_data - Cache::V2::OwnerCommonService.new(self.login, self.mail).reset + Cache::V2::OwnerCommonService.new(self.id).reset end # 用户参与的所有项目 diff --git a/app/services/cache/v2/owner_common_service.rb b/app/services/cache/v2/owner_common_service.rb index d8b86d097..c97e34d48 100644 --- a/app/services/cache/v2/owner_common_service.rb +++ b/app/services/cache/v2/owner_common_service.rb @@ -1,12 +1,13 @@ class Cache::V2::OwnerCommonService < ApplicationService include AvatarHelper - attr_reader :owner_id, :login, :name, :avatar_url, :email - attr_accessor :owner + attr_reader :owner_id, :name + attr_accessor :owner, :login, :email - def initialize(login, email, params={}) - @login = login - @email = email + def initialize(owner_id, params={}) + @owner_id = owner_id + @email = params[:email] @name = params[:name] + @avatar_url = params[:avatar_url] end def read @@ -14,7 +15,6 @@ class Cache::V2::OwnerCommonService < ApplicationService end def call - load_owner set_owner_common end @@ -22,9 +22,15 @@ class Cache::V2::OwnerCommonService < ApplicationService reset_owner_common end + def clear + clear_owner_common + end + private def load_owner - @owner = Owner.find_by(login: @login) + @owner = Owner.find_by_id @owner_id + @login = @owner&.login + @email ||= @owner&.mail end def owner_common_key @@ -32,35 +38,47 @@ class Cache::V2::OwnerCommonService < ApplicationService end def owner_common_key_by_id - "v2-owner-common:#{@owner.id}" + "v2-owner-common:#{@owner&.id}" end def owner_common - $redis_cache.hgetall(owner_common_key).blank? ? reset_owner_common : $redis_cache.hgetall(owner_common_key) + result = $redis_cache.hgetall(owner_common_key_by_id) + result.blank? ? reset_owner_common : result end def set_owner_common - if $redis_cache.hgetall(owner_common_key).blank? + if $redis_cache.hgetall(owner_common_key_by_id).blank? reset_owner_common return - end - if @name.present? - if $redis_cache.hget(owner_common_key, "name").nil? - reset_owner_name - else - $redis_cache.hset(owner_common_key, "name", @name) - $redis_cache.hset(owner_common_key, "avatar_url", url_to_avatar(owner)) - - $redis_cache.hset(owner_common_key_by_id, "name", @name) - $redis_cache.hset(owner_common_key_by_id, "avatar_url", url_to_avatar(owner)) + else + load_owner + return if @owner.nil? + if @name.present? + if $redis_cache.hget(owner_common_key, "name").nil? + reset_owner_name + else + $redis_cache.hset(owner_common_key, "name", @name) + $redis_cache.hset(owner_common_key_by_id, "name", @name) + end end - end - if @email.present? - if $redis_cache.hget(owner_common_key, "email").nil? - reset_owner_email - else - $redis_cache.hset(owner_common_key, "email", @email) - $redis_cache.hset(owner_common_key_by_id, "email", @email) + if @email.present? + if $redis_cache.hget(owner_common_key, "email").nil? + reset_owner_email + else + # 更改邮箱这里把旧数据删除 + $redis_cache.del("v2-owner-common:#{@login}-*") + $redis_cache.hset(owner_common_key, "email", @email) + $redis_cache.hset(owner_common_key_by_id, "email", @email) + end + end + if @avatar_url.present? + if $redis_cache.hget(owner_common_key, "avatar_url").nil? + reset_owner_avatar_url + else + $redis_cache.hset(owner_common_key, "avatar_url", @avatar_url) + $redis_cache.hset(owner_common_key_by_id, "avatar_url", @avatar_url) + end + end end @@ -88,20 +106,30 @@ class Cache::V2::OwnerCommonService < ApplicationService def reset_owner_name $redis_cache.hset(owner_common_key, "name", owner&.real_name) - $redis_cache.hset(owner_common_key, "avatar_url", url_to_avatar(owner)) $redis_cache.hset(owner_common_key_by_id, "name", owner&.real_name) + end + + def reset_owner_avatar_url + $redis_cache.hset(owner_common_key, "avatar_url", url_to_avatar(owner)) $redis_cache.hset(owner_common_key_by_id, "avatar_url", url_to_avatar(owner)) end def reset_owner_common - load_owner - $redis_cache.del(owner_common_key) + clear_owner_common reset_owner_id reset_owner_type reset_owner_login reset_owner_email reset_owner_name + reset_owner_avatar_url $redis_cache.hgetall(owner_common_key) end + + def clear_owner_common + load_owner + return if @owner.nil? + $redis_cache.del(owner_common_key) + $redis_cache.del(owner_common_key_by_id) + end end \ No newline at end of file diff --git a/app/services/cache/v2/platform_statistic_service.rb b/app/services/cache/v2/platform_statistic_service.rb index bc6621a38..5bf4f4a74 100644 --- a/app/services/cache/v2/platform_statistic_service.rb +++ b/app/services/cache/v2/platform_statistic_service.rb @@ -64,7 +64,9 @@ class Cache::V2::PlatformStatisticService < ApplicationService end def platform_statistic - $redis_cache.hgetall(platform_statistic_key).blank? ? reset_platform_statistic : $redis_cache.hgetall(platform_statistic_key) + result = $redis_cache.hgetall(platform_statistic_key) + + result.blank? ? reset_platform_statistic : result end def set_platform_statistic diff --git a/app/services/cache/v2/project_common_service.rb b/app/services/cache/v2/project_common_service.rb index 77a7d27b7..760c6d05b 100644 --- a/app/services/cache/v2/project_common_service.rb +++ b/app/services/cache/v2/project_common_service.rb @@ -28,6 +28,10 @@ class Cache::V2::ProjectCommonService < ApplicationService reset_project_common end + def clear + clear_project_common + end + private def load_project @project = Project.find_by_id(project_id) @@ -78,109 +82,75 @@ class Cache::V2::ProjectCommonService < ApplicationService end def project_common - $redis_cache.hgetall(project_common_key).blank? ? reset_project_common : $redis_cache.hgetall(project_common_key) + result = $redis_cache.hgetall(project_common_key) + result.blank? ? reset_project_common : result end def set_project_common if $redis_cache.hgetall(project_common_key).blank? reset_project_common return - end - load_project - return unless @project.is_full_public - if @owner_id.present? - if $redis_cache.hget(project_common_key, owner_id_key).nil? - reset_project_owner_id - else - $redis_cache.hset(project_common_key, owner_id_key, @owner_id) + else + load_project + return unless @project.is_full_public + if @owner_id.present? + if $redis_cache.hget(project_common_key, owner_id_key).nil? + reset_project_owner_id + else + $redis_cache.hset(project_common_key, owner_id_key, @owner_id) + end end - end - if @name.present? - if $redis_cache.hget(project_common_key, name_key).nil? - reset_project_name - else - $redis_cache.hset(project_common_key, name_key, @name) + if @name.present? + if $redis_cache.hget(project_common_key, name_key).nil? + reset_project_name + else + $redis_cache.hset(project_common_key, name_key, @name) + end end - end - if @identifier.present? - if $redis_cache.hget(project_common_key, identifier_key).nil? - reset_project_identifier - else - $redis_cache.hset(project_common_key, identifier_key, @identifier) + if @identifier.present? + if $redis_cache.hget(project_common_key, identifier_key).nil? + reset_project_identifier + else + $redis_cache.hset(project_common_key, identifier_key, @identifier) + end end - end - if @description.present? - if $redis_cache.hget(project_common_key, description_key).nil? - reset_project_description - else - $redis_cache.hset(project_common_key, description_key, @description) + if @description.present? + if $redis_cache.hget(project_common_key, description_key).nil? + reset_project_description + else + $redis_cache.hset(project_common_key, description_key, @description) + end end - end - if @visits.present? - if $redis_cache.hget(project_common_key, visits_key).nil? - reset_project_visits - Cache::V2::ProjectRankService.call(@project_id, {visits: @visits}) - Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {visits: @visits}) - else - puts project_common_key - puts visits_key - puts @visits + if @visits.present? $redis_cache.hincrby(project_common_key, visits_key, @visits.to_s) Cache::V2::ProjectRankService.call(@project_id, {visits: @visits}) Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {visits: @visits}) end - end - if @watchers.present? - if $redis_cache.hget(project_common_key, watchers_key).nil? - reset_project_watchers - else + if @watchers.present? $redis_cache.hincrby(project_common_key, watchers_key, @watchers) end - end - if @praises.present? - if $redis_cache.hget(project_common_key, praises_key).nil? - reset_project_praises - Cache::V2::ProjectRankService.call(@project_id, {praises: @praises}) - Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {praises: @praises}) - else + if @praises.present? $redis_cache.hincrby(project_common_key, praises_key, @praises) - Cache::V2::ProjectRankService.call(@project_id, {praises: @praises}) - Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {praises: @praises}) + Cache::V2::ProjectRankService.call(@project_id, {praises: @praises}) + Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {praises: @praises}) end - end - if @forks.present? - if $redis_cache.hget(project_common_key, forks_key).nil? - reset_project_forks - Cache::V2::ProjectRankService.call(@project_id, {forks: @forks}) - Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {forks: @forks}) - else + if @forks.present? $redis_cache.hincrby(project_common_key, forks_key, @forks) Cache::V2::ProjectRankService.call(@project_id, {forks: @forks}) Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {forks: @forks}) end - end - if @issues.present? - if $redis_cache.hget(project_common_key, issues_key).nil? - reset_project_issues - Cache::V2::ProjectRankService.call(@project_id, {issues: @issues}) - Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {issues: @issues}) - else + if @issues.present? $redis_cache.hincrby(project_common_key, issues_key, @issues) Cache::V2::ProjectRankService.call(@project_id, {issues: @issues}) Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {issues: @issues}) end - end - if @pullrequests.present? - if $redis_cache.hget(project_common_key, pullrequests_key).nil? - reset_project_pullrequests - Cache::V2::ProjectRankService.call(@project_id, {pullrequests: @pullrequests}) - Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {pullrequests: @pullrequests}) - else + if @pullrequests.present? $redis_cache.hincrby(project_common_key, pullrequests_key, @pullrequests) Cache::V2::ProjectRankService.call(@project_id, {pullrequests: @pullrequests}) Cache::V2::ProjectDateRankService.call(@project_id, Date.today, {pullrequests: @pullrequests}) end end + $redis_cache.hgetall(project_common_key) end @@ -241,4 +211,9 @@ class Cache::V2::ProjectCommonService < ApplicationService $redis_cache.hgetall(project_common_key) end + + def clear_project_common + $redis_cache.del(project_common_key) + Cache::V2::ProjectRankService.new(@project_id).clear + end end \ No newline at end of file diff --git a/app/services/cache/v2/project_rank_service.rb b/app/services/cache/v2/project_rank_service.rb index 45484dc08..7e5d323bf 100644 --- a/app/services/cache/v2/project_rank_service.rb +++ b/app/services/cache/v2/project_rank_service.rb @@ -23,6 +23,10 @@ class Cache::V2::ProjectRankService < ApplicationService reset_project_rank end + def clear + clear_project_rank + end + private def load_project_common @project_common = Cache::V2::ProjectCommonService.new(@project_id).read @@ -33,7 +37,8 @@ class Cache::V2::ProjectRankService < ApplicationService end def project_rank - $redis_cache.zscore(project_rank_key, @project_id).blank? ? reset_project_rank : $redis_cache.zscore(project_rank_key, @project_id) + result = $redis_cache.zscore(project_rank_key, @project_id) + result.blank? ? reset_project_rank : result end def set_project_rank @@ -41,23 +46,24 @@ class Cache::V2::ProjectRankService < ApplicationService if $redis_cache.zscore(project_rank_key, @project_id).blank? reset_project_rank return + else + if @visits.present? + $redis_cache.zincrby(project_rank_key, @visits.to_i * 1, @project_id) + end + if @praises.present? + $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) + end + if @forks.present? + $redis_cache.zincrby(project_rank_key, @forks.to_i * 5, @project_id) + end + if @issues.present? + $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) + end + if @pullrequests.present? + $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) + end + reset_user_project_rank end - if @visits.present? - $redis_cache.zincrby(project_rank_key, @visits.to_i * 1, @project_id) - end - if @praises.present? - $redis_cache.zincrby(project_rank_key, @praises.to_i * 5, @project_id) - end - if @forks.present? - $redis_cache.zincrby(project_rank_key, @forks.to_i * 5, @project_id) - end - if @issues.present? - $redis_cache.zincrby(project_rank_key, @issues.to_i * 10, @project_id) - end - if @pullrequests.present? - $redis_cache.zincrby(project_rank_key, @pullrequests.to_i * 10, @project_id) - end - reset_user_project_rank $redis_cache.zscore(project_rank_key, @project_id) end @@ -74,4 +80,8 @@ class Cache::V2::ProjectRankService < ApplicationService def reset_user_project_rank $redis_cache.zadd("v2-user-project-rank:#{@project_common["owner_id"]}", $redis_cache.zscore(project_rank_key, @project_id), @project_id) end + + def clear_project_rank + $redis_cache.sadd('v2-project-rank-deleted', @project_id) + end end \ No newline at end of file diff --git a/app/services/cache/v2/user_statistic_service.rb b/app/services/cache/v2/user_statistic_service.rb index 8caa66d88..b82797d84 100644 --- a/app/services/cache/v2/user_statistic_service.rb +++ b/app/services/cache/v2/user_statistic_service.rb @@ -12,6 +12,7 @@ class Cache::V2::UserStatisticService < ApplicationService @project_praise_count = params[:project_praise_count] @project_watcher_count = params[:project_watcher_count] @pullrequest_count = params[:pullrequest_count] + Cache::V2::OwnerCommonService.new(user_id).read end def read @@ -65,7 +66,8 @@ class Cache::V2::UserStatisticService < ApplicationService end def user_statistic - $redis_cache.hgetall(user_statistic_key).blank? ? reset_user_statistic : $redis_cache.hgetall(user_statistic_key) + result = $redis_cache.hgetall(user_statistic_key) + result.blank? ? reset_user_statistic : result end def set_user_statistic From 28c3b4dda41ca419ff11765c4fa7c8b17226abe0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 1 Nov 2021 16:48:57 +0800 Subject: [PATCH 30/41] add: repo commit user use cache data --- app/helpers/application_helper.rb | 8 ++++++++ app/helpers/repositories_helper.rb | 4 ++++ app/views/projects/branches.json.jbuilder | 4 ++-- .../projects/branches_slice.json.jbuilder | 4 ++-- app/views/pull_requests/_commit.json.jbuilder | 6 ++---- app/views/repositories/_commit.json.jbuilder | 4 ++-- .../repositories/_commit_author.json.jbuilder | 20 +++++++++++++------ app/views/repositories/commits.json.jbuilder | 4 ++-- app/views/repositories/tags.json.jbuilder | 6 +++--- 9 files changed, 39 insertions(+), 21 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c37fd59da..01ffa41f1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -442,6 +442,14 @@ module ApplicationHelper User.find_by(gitea_uid: gitea_uid) end + def find_user_in_redis_cache(login, email) + $redis_cache.hgetall("v2-owner-common:#{login}-#{email}") + end + + def find_user_in_redis_cache_by_id(id) + $redis_cache.hgetall("v2-owner-common:#{id}") + end + def render_base64_decoded(str) return nil if str.blank? Base64.decode64 str diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 1096d1d21..fe5a636eb 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -35,6 +35,10 @@ module RepositoriesHelper end end + def render_cache_commit_author(author_json) + find_user_in_redis_cache(author_json['name'], author_json['email']) + end + def readme_render_decode64_content(str, path) return nil if str.blank? begin diff --git a/app/views/projects/branches.json.jbuilder b/app/views/projects/branches.json.jbuilder index ad4f4328a..c7c2025b3 100644 --- a/app/views/projects/branches.json.jbuilder +++ b/app/views/projects/branches.json.jbuilder @@ -12,10 +12,10 @@ json.array! @branches do |branch| json.timestamp render_unix_time(branch['commit']['timestamp']) json.time_from_now time_from_now(branch['commit']['timestamp']) json.author do - json.partial! 'repositories/commit_author', user: render_commit_author(branch['commit']['author']), name: branch['commit']['author']['name'] + json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['author']), name: branch['commit']['author']['name'] end json.committer do - json.partial! 'repositories/commit_author', user: render_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name'] + json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name'] end end end diff --git a/app/views/projects/branches_slice.json.jbuilder b/app/views/projects/branches_slice.json.jbuilder index 31c662a13..963bca0a8 100644 --- a/app/views/projects/branches_slice.json.jbuilder +++ b/app/views/projects/branches_slice.json.jbuilder @@ -14,10 +14,10 @@ json.array! @branches_slice do |branch_slice| json.timestamp render_unix_time(branch['commit']['timestamp']) json.time_from_now time_from_now(branch['commit']['timestamp']) json.author do - json.partial! 'repositories/commit_author', user: render_commit_author(branch['commit']['author']), name: branch['commit']['author']['name'] + json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['author']), name: branch['commit']['author']['name'] end json.committer do - json.partial! 'repositories/commit_author', user: render_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name'] + json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name'] end end end diff --git a/app/views/pull_requests/_commit.json.jbuilder b/app/views/pull_requests/_commit.json.jbuilder index 7a9232efe..52b776008 100644 --- a/app/views/pull_requests/_commit.json.jbuilder +++ b/app/views/pull_requests/_commit.json.jbuilder @@ -1,11 +1,9 @@ json.author do - author = User.find_by(mail: commit['Author']['Email']) - json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] } + json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Author']), name: commit['Author']['Name'] } end json.committer do - author = User.find_by(mail: commit['Committer']['Email']) - json.partial! 'repositories/commit_author', locals: { user: author, name: commit['Committer']['Name'] } + json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] } end json.timestamp render_unix_time(commit['Committer']['When']) json.time_from_now time_from_now(commit['Committer']['When']) diff --git a/app/views/repositories/_commit.json.jbuilder b/app/views/repositories/_commit.json.jbuilder index 95cb03412..9c29116e9 100644 --- a/app/views/repositories/_commit.json.jbuilder +++ b/app/views/repositories/_commit.json.jbuilder @@ -26,9 +26,9 @@ if @project.forge? end json.author do - json.partial! 'commit_author', user: render_commit_author(commit['commit']['author']), name: commit['commit']['author']['name'] + json.partial! 'commit_author', user: render_cache_commit_author(commit['commit']['author']), name: commit['commit']['author']['name'] end json.committer do - json.partial! 'commit_author', user: render_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name'] + json.partial! 'commit_author', user: render_cache_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name'] end end diff --git a/app/views/repositories/_commit_author.json.jbuilder b/app/views/repositories/_commit_author.json.jbuilder index c63edf9b1..83935709a 100644 --- a/app/views/repositories/_commit_author.json.jbuilder +++ b/app/views/repositories/_commit_author.json.jbuilder @@ -1,9 +1,17 @@ -if user - json.id user.id - json.login user.login - json.name user.real_name - json.type user&.type - json.image_url url_to_avatar(user) +if user.present? + if user.is_a?(Hash) + json.id user["id"] + json.login user["login"] + json.name user["name"] + json.type user["type"] + json.image_url user["avatar_url"] + else + json.id user.id + json.login user.login + json.name user.real_name + json.type user&.type + json.image_url url_to_avatar(user) + end else json.id nil json.login name diff --git a/app/views/repositories/commits.json.jbuilder b/app/views/repositories/commits.json.jbuilder index cf4a409f5..33406e6a5 100644 --- a/app/views/repositories/commits.json.jbuilder +++ b/app/views/repositories/commits.json.jbuilder @@ -28,10 +28,10 @@ else # end # end json.author do - json.partial! 'commit_author', user: render_commit_author(commit['commit']['author']), name: commit['commit']['author']['name'] + json.partial! 'commit_author', user: render_cache_commit_author(commit['commit']['author']), name: commit['commit']['author']['name'] end json.committer do - json.partial! 'commit_author', user: render_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name'] + json.partial! 'commit_author', user: render_cache_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name'] end end end diff --git a/app/views/repositories/tags.json.jbuilder b/app/views/repositories/tags.json.jbuilder index d1ee3671e..eaf11058e 100644 --- a/app/views/repositories/tags.json.jbuilder +++ b/app/views/repositories/tags.json.jbuilder @@ -5,7 +5,7 @@ json.array! @tags do |tag| json.zipball_url render_zip_url(@owner, @repository, tag['name']) json.tarball_url render_tar_url(@owner, @repository, tag['name']) json.tagger do - json.partial! 'commit_author', user: render_commit_author(tag['tagger']), name: tag['tagger']['name'] + json.partial! 'commit_author', user: render_cache_commit_author(tag['tagger']), name: tag['tagger']['name'] end json.time_ago time_from_now(tag['tagger']['date'].to_time) json.created_at_unix tag['tagger']['date'].to_time.to_i @@ -16,10 +16,10 @@ json.array! @tags do |tag| json.time_ago time_from_now(tag['commit']['commiter']['date'].to_time) json.created_at_unix tag['commit']['commiter']['date'].to_time.to_i json.committer do - json.partial! 'commit_author', user: render_commit_author(tag['commit']['commiter']), name: tag['commit']['commiter']['name'] + json.partial! 'commit_author', user: render_cache_commit_author(tag['commit']['commiter']), name: tag['commit']['commiter']['name'] end json.author do - json.partial! 'commit_author', user: render_commit_author(tag['commit']['author']), name: tag['commit']['author']['name'] + json.partial! 'commit_author', user: render_cache_commit_author(tag['commit']['author']), name: tag['commit']['author']['name'] end end end From 7193323be9ed5ddf184f4684bc85812dc5eda09f Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 1 Nov 2021 17:09:25 +0800 Subject: [PATCH 31/41] fix: field upper but --- app/helpers/repositories_helper.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index fe5a636eb..cc50c8d66 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -36,7 +36,13 @@ module RepositoriesHelper end def render_cache_commit_author(author_json) - find_user_in_redis_cache(author_json['name'], author_json['email']) + Rails.logger.info author_json['Email'] + if author_json["name"].present? && author_json["email"].present? + return find_user_in_redis_cache(author_json['name'], author_json['email']) + end + if author_json["Name"].present? && author_json["Email"].present? + return find_user_in_redis_cache(author_json['Name'], author_json['Email']) + end end def readme_render_decode64_content(str, path) From 890fe7d629af3c37211d0b18ad8ea3e3d4e9174c Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 2 Nov 2021 09:51:38 +0800 Subject: [PATCH 32/41] fix --- app/controllers/project_rank_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/project_rank_controller.rb b/app/controllers/project_rank_controller.rb index 025e29717..7bd62987e 100644 --- a/app/controllers/project_rank_controller.rb +++ b/app/controllers/project_rank_controller.rb @@ -2,7 +2,8 @@ class ProjectRankController < ApplicationController # 根据时间获取热门项目 def index $redis_cache.zunionstore("recent-days-project-rank", get_timeable_key_names) - $redis_cache.zrem("recent-days-project-rank", $redis_cache.smembers("v2-project-rank-deleted")) + deleted_data = $redis_cache.smembers("v2-project-rank-deleted") + $redis_cache.zrem("recent-days-project-rank", deleted_data) unless deleted_data.blank? @project_rank = $redis_cache.zrevrange("recent-days-project-rank", 0, 4, withscores: true) rescue Exception => e @project_rank = [] From 1b47f51550406412174627e3835869bfad7afaee Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 2 Nov 2021 10:03:13 +0800 Subject: [PATCH 33/41] fix --- app/views/user_rank/_detail.json.jbuilder | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/user_rank/_detail.json.jbuilder b/app/views/user_rank/_detail.json.jbuilder index 11eda3fc7..caefa7d31 100644 --- a/app/views/user_rank/_detail.json.jbuilder +++ b/app/views/user_rank/_detail.json.jbuilder @@ -1,4 +1,6 @@ owner_common = $redis_cache.hgetall("v2-owner-common:#{item[0]}") +deleted_data = $redis_cache.smembers("v2-project-rank-deleted") +$redis_cache.zrem("v2-user-project-rank:#{item[0]}", delete_data) unless deleted_data.blank? popular_project = $redis_cache.zrevrange("v2-user-project-rank:#{item[0]}", 0, 1, withscores: true)[0] json.id item[0] json.score item[1] From 282d3d012226506ba86a62355260f556cc242db3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 2 Nov 2021 10:15:35 +0800 Subject: [PATCH 34/41] fix --- app/docs/slate/source/images/logo.png | Bin 3591 -> 9662 bytes .../docs/slate/source/images/trustie_logo.png | Bin public/docs/api.html | 2 +- public/docs/images/logo-cf8353ee.png | Bin 0 -> 9662 bytes public/docs/images/trustie_logo-b38b63e6.png | Bin 0 -> 3591 bytes 5 files changed, 1 insertion(+), 1 deletion(-) rename public/docs/images/logo-b38b63e6.png => app/docs/slate/source/images/trustie_logo.png (100%) create mode 100644 public/docs/images/logo-cf8353ee.png create mode 100644 public/docs/images/trustie_logo-b38b63e6.png diff --git a/app/docs/slate/source/images/logo.png b/app/docs/slate/source/images/logo.png index 30affed0b2b040748b2c6c45cd2f2cc4f8d7a6f2..2f34775dc28c4a675d898c39b044a174e090f8ed 100644 GIT binary patch literal 9662 zcmchd33OD|8OLu35Xek20R*jhfC>uQ<0-Y;Qmck#mV~gAvWXm!r9CQE#L~^OSSu6@ z#ae*^0(4se_QZ}til`p1-KyM9 zi$ZxDIDP=;(~$ZI*-d@uS0AI#ra*_@)T6Txw~Ng16-PomY&R9{{~c1(MsAbeEX(lx zZrI^L-}uCC-jvSK!|SAvC-eaKqiF9Cq`aNnCcjzcV%-12?MxWxaV098cSv`@*2?cl zj6v+U5Ao%7Ff*o@ZFY2d19g7}_StCH>V*!`jt!5?sKSkNy<(WmYESX*WA{htK$?-Y!)c zzm|rY!;nK#Uv)roe)KKL7}IWk>c7S7u=FH14}7NWpFqhuF*^H z*u9s*4*&7bx=XSbkBH7rhJ9-gW6~jw{C3N0QSsB(Q~Jxbf4>BOe?DmAru>TyzsH!) zS^ltG`*f8QY@6BGUuK`1vC911N{KmXK^XtWi1@+aP3vRWlJ%oa@8tec@x{y1P(BzG z48{rC!@L$KJ*hUiyyr>Ded$p_o)Y9QKeusaO5W;ZW30dins1yN@=J& zDy4s0jyeQ{{Ov&esb!T|NpQJQ~SI6w7f46OET(DP5xp+%av zEBM)VZQ%~B2j_7Aj5|ZeV=a8=d-R{|35hBmqX6tX!ubn#&e3rs@0Vkxu6UOe9a`9> z{Ops4>j(Ax!I(h4fN;$>9fF*+kGecHmV&tdL)sLTAH{==M! zeW1tL_@vNzp&Gt3nf~L$x;85%F&6B5!}$xgOgH8fXvXY;BB0>MJ$$eAD&Z|e4==m>e-reF!O^U#Op4NTb zJpbt>!Tcd){$;Fh68|}WAs^(}V=h4^_CMD@%%1}M<*>h#`5Wzzz001s?v2IpU_Q_B9aLb4a!(|Z0B#$TPi33Km0WBxMp2gA=b z4>`{NcofDT#;|ey8u;zx_i$gzl^BQXe++zQ=orX%g4Y7|8Trp@#M2`>HZec)PU>gm zKOAetyCwhkQ*|EMnE!|6Z=w8i2FulVpO%8n)1@|lo8+w-ZR9^DKTGD3jboQOl)-<- zaQzYxuG`-YXKm@TCnZq|-Zf=V?}-S0X=Up556ToxERma-^|Ic z99R$@XH0vCm!;rN*7nyrB=iRB@s@a7x<(!JI*UH#w93_EOY}U`K>H(Cx$vsvruMJ= z-?}FGv#vjor&9;^Z%b{4T`L9qW90Y2|1+IB{_hLBCz5(}eqHjx54G(pPQ4T`_D-&bS&I4+whAfeiF*ex3~(~`QG?+h|iZR+#KdQcCp3Gj|5;(jz3Om6cz@*`Gr-%9F_ z3Fi>g{=vG#pD~}kb$J?`_cQkiJ-EN`cO_x()0&PpG9X+dM{OheI@igiAH66S);gQ} zdfV$J&q=T+dy;!9z9R@fGE@4h{8=N|5BDOs_$}^l*FGrMmU@j3e`${`@N5BOBe?E9 zJtUKd5 zHtq!b&mrfd(1Gvh@EZy17`#itUVhVfZno8#CEp8XIc?qGtKR_2E(qgAsBK$1$KH+Q z6L8M}vlZu^i5OAc9>g_BZ}4DG;HK~7x#xNYF=Z+48{iuqquj2fi0bc(n|yp{K2DE~ zJHYrNSigYKN4QtxgRiXz_wej=Ta0&n$Nfe?q%=-MDUlN~M#*zXgHp*XuPbF^nWI!3 z%hmWj5lVcm)GDQJupF#ZDN9U?IV|G>Wvo&s_&KKI%hiE;JGwj(sMjoW_!)ZW5_*|> gntH<&+75EUunX-Ji;F?KnRetgEhl1)(y;sg0S5}vVE_OC literal 3591 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 N002ovPDHLkV1f$w(pCTf diff --git a/public/docs/images/logo-b38b63e6.png b/app/docs/slate/source/images/trustie_logo.png similarity index 100% rename from public/docs/images/logo-b38b63e6.png rename to app/docs/slate/source/images/trustie_logo.png diff --git a/public/docs/api.html b/public/docs/api.html index 5df230a28..495e6b9dc 100644 --- a/public/docs/api.html +++ b/public/docs/api.html @@ -296,7 +296,7 @@
- +
Shell JavaScript diff --git a/public/docs/images/logo-cf8353ee.png b/public/docs/images/logo-cf8353ee.png new file mode 100644 index 0000000000000000000000000000000000000000..2f34775dc28c4a675d898c39b044a174e090f8ed GIT binary patch literal 9662 zcmchd33OD|8OLu35Xek20R*jhfC>uQ<0-Y;Qmck#mV~gAvWXm!r9CQE#L~^OSSu6@ z#ae*^0(4se_QZ}til`p1-KyM9 zi$ZxDIDP=;(~$ZI*-d@uS0AI#ra*_@)T6Txw~Ng16-PomY&R9{{~c1(MsAbeEX(lx zZrI^L-}uCC-jvSK!|SAvC-eaKqiF9Cq`aNnCcjzcV%-12?MxWxaV098cSv`@*2?cl zj6v+U5Ao%7Ff*o@ZFY2d19g7}_StCH>V*!`jt!5?sKSkNy<(WmYESX*WA{htK$?-Y!)c zzm|rY!;nK#Uv)roe)KKL7}IWk>c7S7u=FH14}7NWpFqhuF*^H z*u9s*4*&7bx=XSbkBH7rhJ9-gW6~jw{C3N0QSsB(Q~Jxbf4>BOe?DmAru>TyzsH!) zS^ltG`*f8QY@6BGUuK`1vC911N{KmXK^XtWi1@+aP3vRWlJ%oa@8tec@x{y1P(BzG z48{rC!@L$KJ*hUiyyr>Ded$p_o)Y9QKeusaO5W;ZW30dins1yN@=J& zDy4s0jyeQ{{Ov&esb!T|NpQJQ~SI6w7f46OET(DP5xp+%av zEBM)VZQ%~B2j_7Aj5|ZeV=a8=d-R{|35hBmqX6tX!ubn#&e3rs@0Vkxu6UOe9a`9> z{Ops4>j(Ax!I(h4fN;$>9fF*+kGecHmV&tdL)sLTAH{==M! zeW1tL_@vNzp&Gt3nf~L$x;85%F&6B5!}$xgOgH8fXvXY;BB0>MJ$$eAD&Z|e4==m>e-reF!O^U#Op4NTb zJpbt>!Tcd){$;Fh68|}WAs^(}V=h4^_CMD@%%1}M<*>h#`5Wzzz001s?v2IpU_Q_B9aLb4a!(|Z0B#$TPi33Km0WBxMp2gA=b z4>`{NcofDT#;|ey8u;zx_i$gzl^BQXe++zQ=orX%g4Y7|8Trp@#M2`>HZec)PU>gm zKOAetyCwhkQ*|EMnE!|6Z=w8i2FulVpO%8n)1@|lo8+w-ZR9^DKTGD3jboQOl)-<- zaQzYxuG`-YXKm@TCnZq|-Zf=V?}-S0X=Up556ToxERma-^|Ic z99R$@XH0vCm!;rN*7nyrB=iRB@s@a7x<(!JI*UH#w93_EOY}U`K>H(Cx$vsvruMJ= z-?}FGv#vjor&9;^Z%b{4T`L9qW90Y2|1+IB{_hLBCz5(}eqHjx54G(pPQ4T`_D-&bS&I4+whAfeiF*ex3~(~`QG?+h|iZR+#KdQcCp3Gj|5;(jz3Om6cz@*`Gr-%9F_ z3Fi>g{=vG#pD~}kb$J?`_cQkiJ-EN`cO_x()0&PpG9X+dM{OheI@igiAH66S);gQ} zdfV$J&q=T+dy;!9z9R@fGE@4h{8=N|5BDOs_$}^l*FGrMmU@j3e`${`@N5BOBe?E9 zJtUKd5 zHtq!b&mrfd(1Gvh@EZy17`#itUVhVfZno8#CEp8XIc?qGtKR_2E(qgAsBK$1$KH+Q z6L8M}vlZu^i5OAc9>g_BZ}4DG;HK~7x#xNYF=Z+48{iuqquj2fi0bc(n|yp{K2DE~ zJHYrNSigYKN4QtxgRiXz_wej=Ta0&n$Nfe?q%=-MDUlN~M#*zXgHp*XuPbF^nWI!3 z%hmWj5lVcm)GDQJupF#ZDN9U?IV|G>Wvo&s_&KKI%hiE;JGwj(sMjoW_!)ZW5_*|> gntH<&+75EUunX-Ji;F?KnRetgEhl1)(y;sg0S5}vVE_OC literal 0 HcmV?d00001 diff --git a/public/docs/images/trustie_logo-b38b63e6.png b/public/docs/images/trustie_logo-b38b63e6.png new file mode 100644 index 0000000000000000000000000000000000000000..30affed0b2b040748b2c6c45cd2f2cc4f8d7a6f2 GIT binary patch literal 3591 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 N002ovPDHLkV1f$w(pCTf literal 0 HcmV?d00001 From 43c683e83f3fae333c9434e38954862383f47895 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 2 Nov 2021 11:27:17 +0800 Subject: [PATCH 35/41] fix: contributor load cache data --- .../repositories/_contributor.json.jbuilder | 16 ++++++++++++++++ .../repositories/contributors.json.jbuilder | 12 +----------- app/views/repositories/detail.json.jbuilder | 12 +----------- 3 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 app/views/repositories/_contributor.json.jbuilder diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder new file mode 100644 index 000000000..56fa9ce86 --- /dev/null +++ b/app/views/repositories/_contributor.json.jbuilder @@ -0,0 +1,16 @@ +user = $redis_cache.hgetall("v2-owner-common:#{contributor["login"]}-#{contributor["email"]}") +if user.blank? + json.contributions contributor["contributions"] + # json.gid contributor["id"] + json.login contributor["login"] + json.type nil + json.name contributor["login"] + json.image_url User::Avatar.get_letter_avatar_url(contributor["login"]) +else + json.contributions contributor["contributions"] + # json.gid contributor["id"] + json.login user["login"] + json.type user["type"] + json.name user["name"] + json.image_url user["avatar_url"] +end diff --git a/app/views/repositories/contributors.json.jbuilder b/app/views/repositories/contributors.json.jbuilder index 9165cf948..fa52475a5 100644 --- a/app/views/repositories/contributors.json.jbuilder +++ b/app/views/repositories/contributors.json.jbuilder @@ -1,16 +1,6 @@ total_count = @contributors.size json.contributors @contributors.each do |contributor| - user = User.find_by(gitea_uid: contributor["id"]) - if contributor["login"] == "root" - total_count -= 1 - next - end - json.contributions contributor["contributions"] - # json.gid contributor["id"] - json.login user.login - json.type user&.type - json.name user.real_name - json.image_url url_to_avatar(user) + json.partial! 'contributor', locals: { contributor: contributor } end json.total_count total_count diff --git a/app/views/repositories/detail.json.jbuilder b/app/views/repositories/detail.json.jbuilder index c489cf47a..20faea44c 100644 --- a/app/views/repositories/detail.json.jbuilder +++ b/app/views/repositories/detail.json.jbuilder @@ -56,17 +56,7 @@ json.tags_count @result[:branch_tag_total_count]['tag_count'] || 0 json.contributors do total_count = @result[:contributor].size json.list @result[:contributor].each do |contributor| - user = User.find_by(gitea_uid: contributor["id"]) - if contributor["login"] == "root" || user.nil? - total_count -= 1 - next - end - json.contributions contributor["contributions"] - json.gid contributor["id"] - json.login user.login - json.type user&.type - json.name user.real_name - json.image_url url_to_avatar(user) + json.partial! 'contributor', locals: { contributor: contributor } end json.total_count total_count end From 26f6738d29a41378ec1269569df84cdd15108bb9 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 2 Nov 2021 13:52:57 +0800 Subject: [PATCH 36/41] fix: email template html --- public/images/email_logo.png | Bin 0 -> 25051 bytes public/message_template/issue_assigned.html | 11 +++-------- public/message_template/issue_changed.html | 11 +++-------- public/message_template/issue_deleted.html | 11 +++-------- .../message_template/organization_joined.html | 11 +++-------- public/message_template/organization_left.html | 11 +++-------- public/message_template/organization_role.html | 11 +++-------- public/message_template/project_issue.html | 11 +++-------- public/message_template/project_joined.html | 11 +++-------- public/message_template/project_left.html | 11 +++-------- .../message_template/project_member_joined.html | 11 +++-------- .../message_template/project_member_left.html | 11 +++-------- .../message_template/project_pull_request.html | 11 +++-------- public/message_template/project_role.html | 11 +++-------- .../project_setting_changed.html | 11 +++-------- .../message_template/pull_request_assigned.html | 11 +++-------- .../message_template/pull_request_changed.html | 11 +++-------- .../message_template/pull_request_closed.html | 11 +++-------- .../message_template/pull_request_merged.html | 11 +++-------- 19 files changed, 54 insertions(+), 144 deletions(-) create mode 100644 public/images/email_logo.png diff --git a/public/images/email_logo.png b/public/images/email_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ac07686b77aa6d2a9b35e4c785d6ca2618e3a364 GIT binary patch literal 25051 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 JM&3H|e*r_wATj^| literal 0 HcmV?d00001 diff --git a/public/message_template/issue_assigned.html b/public/message_template/issue_assigned.html index 8b78dbdaf..649e16d76 100755 --- a/public/message_template/issue_assigned.html +++ b/public/message_template/issue_assigned.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ {nickname1}在 {nickname2}/{repository} 指派给你一个易修：{title}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/issue_changed.html b/public/message_template/issue_changed.html index 5f8d796b4..fa69362fb 100755 --- a/public/message_template/issue_changed.html +++ b/public/message_template/issue_changed.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -44,16 +44,11 @@ {ifduedate}{nickname1}将结束日期从 {duedate1} 修改为 {duedate2}{endduedate}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/issue_deleted.html b/public/message_template/issue_deleted.html index 1eb40c81c..1fe5e3cf8 100755 --- a/public/message_template/issue_deleted.html +++ b/public/message_template/issue_deleted.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ {nickname}已将易修 {title} 删除

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/organization_joined.html b/public/message_template/organization_joined.html index cc0c68ed2..f5aa20e1a 100755 --- a/public/message_template/organization_joined.html +++ b/public/message_template/organization_joined.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ 你已加入 {organization} 组织

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/organization_left.html b/public/message_template/organization_left.html index 5355129fd..833a56e6f 100755 --- a/public/message_template/organization_left.html +++ b/public/message_template/organization_left.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ 你已被移出 {organization} 组织

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/organization_role.html b/public/message_template/organization_role.html index 661698b8a..ac1bd63ce 100755 --- a/public/message_template/organization_role.html +++ b/public/message_template/organization_role.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ 组织 {organization} 已把你的角色修改为 {role}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/project_issue.html b/public/message_template/project_issue.html index d9999e70c..944a5e3b7 100755 --- a/public/message_template/project_issue.html +++ b/public/message_template/project_issue.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ {nickname1}在 {nickname2}/{repository} 新建了一个易修：{title}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/project_joined.html b/public/message_template/project_joined.html index c144da01a..db1719bf3 100755 --- a/public/message_template/project_joined.html +++ b/public/message_template/project_joined.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ 你已加入 {nickname}/{repository} 项目

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/project_left.html b/public/message_template/project_left.html index 5a87e8ba4..672b00c24 100755 --- a/public/message_template/project_left.html +++ b/public/message_template/project_left.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ 你已被移出 {nickname}/{repository} 项目

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/project_member_joined.html b/public/message_template/project_member_joined.html index 9f376d4f3..6776ccb6f 100755 --- a/public/message_template/project_member_joined.html +++ b/public/message_template/project_member_joined.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ {nickname1} 已加入项目 {nickname2}/{repository}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/project_member_left.html b/public/message_template/project_member_left.html index f1c6b6d95..e8d1c3abd 100755 --- a/public/message_template/project_member_left.html +++ b/public/message_template/project_member_left.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ {nickname1} 已被移出项目 {nickname2}/{repository}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/project_pull_request.html b/public/message_template/project_pull_request.html index c342894b0..d1e03b802 100755 --- a/public/message_template/project_pull_request.html +++ b/public/message_template/project_pull_request.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ {nickname1}在 {nickname2}/{repository} 提交了一个合并请求：{title}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/project_role.html b/public/message_template/project_role.html index db64a4f76..3c68e1185 100755 --- a/public/message_template/project_role.html +++ b/public/message_template/project_role.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ 项目 {nickname}/{repository} 已把你的角色修改为 {role}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/project_setting_changed.html b/public/message_template/project_setting_changed.html index ef5af71fd..593ef9685 100755 --- a/public/message_template/project_setting_changed.html +++ b/public/message_template/project_setting_changed.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -41,16 +41,11 @@ {ifnavbar}将项目导航更改为"{navbar}"{endnavbar}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/pull_request_assigned.html b/public/message_template/pull_request_assigned.html index fe139ec1b..1ce243d72 100755 --- a/public/message_template/pull_request_assigned.html +++ b/public/message_template/pull_request_assigned.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ {nickname1}在 {nickname2}/{repository} 指派给你一个合并请求：{title}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/pull_request_changed.html b/public/message_template/pull_request_changed.html index 5cafdc47e..298db18c1 100755 --- a/public/message_template/pull_request_changed.html +++ b/public/message_template/pull_request_changed.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -38,16 +38,11 @@ {ifpriority}{nickname1}将优先级从 {priority1} 修改为 {priority2}{endpriority}

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/pull_request_closed.html b/public/message_template/pull_request_closed.html index d0828c19a..e93b82252 100755 --- a/public/message_template/pull_request_closed.html +++ b/public/message_template/pull_request_closed.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ 你提交的合并请求：{title} 被拒绝；

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

diff --git a/public/message_template/pull_request_merged.html b/public/message_template/pull_request_merged.html index e1f028a7e..61a8e5434 100755 --- a/public/message_template/pull_request_merged.html +++ b/public/message_template/pull_request_merged.html @@ -24,8 +24,8 @@
- -

确实让创新更美好

+ +

确实开源，协同创新

@@ -34,16 +34,11 @@ 你提交的合并请求：{title} 已通过；

- -

- 扫一扫，关注trustie微信公众号，更方便获取平台动态，消息推送等提醒
- 想了解更多信息，请访问 www.trustie.net -

如果您在使用中有任何的疑问和建议，欢迎您给我们反馈意见
QQ群：1071514693

-

Trustie团队

+

GitLink团队

From e2411b350f925b5e906672cfd95a1f1f60de6d2b Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 2 Nov 2021 14:31:33 +0800 Subject: [PATCH 37/41] fix --- public/message_template/issue_assigned.html | 2 +- public/message_template/issue_changed.html | 2 +- public/message_template/issue_deleted.html | 2 +- public/message_template/organization_joined.html | 2 +- public/message_template/organization_left.html | 2 +- public/message_template/organization_role.html | 2 +- public/message_template/project_issue.html | 2 +- public/message_template/project_joined.html | 2 +- public/message_template/project_left.html | 2 +- public/message_template/project_member_joined.html | 2 +- public/message_template/project_member_left.html | 2 +- public/message_template/project_pull_request.html | 2 +- public/message_template/project_role.html | 2 +- public/message_template/project_setting_changed.html | 2 +- public/message_template/pull_request_assigned.html | 2 +- public/message_template/pull_request_changed.html | 2 +- public/message_template/pull_request_closed.html | 2 +- public/message_template/pull_request_merged.html | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/public/message_template/issue_assigned.html b/public/message_template/issue_assigned.html index 649e16d76..c32363ac7 100755 --- a/public/message_template/issue_assigned.html +++ b/public/message_template/issue_assigned.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/issue_changed.html b/public/message_template/issue_changed.html index fa69362fb..97f0994f3 100755 --- a/public/message_template/issue_changed.html +++ b/public/message_template/issue_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/issue_deleted.html b/public/message_template/issue_deleted.html index 1fe5e3cf8..61fe0cfd6 100755 --- a/public/message_template/issue_deleted.html +++ b/public/message_template/issue_deleted.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_joined.html b/public/message_template/organization_joined.html index f5aa20e1a..eadc62239 100755 --- a/public/message_template/organization_joined.html +++ b/public/message_template/organization_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_left.html b/public/message_template/organization_left.html index 833a56e6f..997db9e5e 100755 --- a/public/message_template/organization_left.html +++ b/public/message_template/organization_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_role.html b/public/message_template/organization_role.html index ac1bd63ce..90370e5b3 100755 --- a/public/message_template/organization_role.html +++ b/public/message_template/organization_role.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_issue.html b/public/message_template/project_issue.html index 944a5e3b7..ded810135 100755 --- a/public/message_template/project_issue.html +++ b/public/message_template/project_issue.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_joined.html b/public/message_template/project_joined.html index db1719bf3..84889e43f 100755 --- a/public/message_template/project_joined.html +++ b/public/message_template/project_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_left.html b/public/message_template/project_left.html index 672b00c24..c1176b6a4 100755 --- a/public/message_template/project_left.html +++ b/public/message_template/project_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_member_joined.html b/public/message_template/project_member_joined.html index 6776ccb6f..f03dc9462 100755 --- a/public/message_template/project_member_joined.html +++ b/public/message_template/project_member_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_member_left.html b/public/message_template/project_member_left.html index e8d1c3abd..b459ca9cf 100755 --- a/public/message_template/project_member_left.html +++ b/public/message_template/project_member_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_pull_request.html b/public/message_template/project_pull_request.html index d1e03b802..c8686ecdd 100755 --- a/public/message_template/project_pull_request.html +++ b/public/message_template/project_pull_request.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_role.html b/public/message_template/project_role.html index 3c68e1185..e290ec990 100755 --- a/public/message_template/project_role.html +++ b/public/message_template/project_role.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_setting_changed.html b/public/message_template/project_setting_changed.html index 593ef9685..737e12b7c 100755 --- a/public/message_template/project_setting_changed.html +++ b/public/message_template/project_setting_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_assigned.html b/public/message_template/pull_request_assigned.html index 1ce243d72..71ca2b8de 100755 --- a/public/message_template/pull_request_assigned.html +++ b/public/message_template/pull_request_assigned.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_changed.html b/public/message_template/pull_request_changed.html index 298db18c1..7d125d073 100755 --- a/public/message_template/pull_request_changed.html +++ b/public/message_template/pull_request_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_closed.html b/public/message_template/pull_request_closed.html index e93b82252..67d7b0b33 100755 --- a/public/message_template/pull_request_closed.html +++ b/public/message_template/pull_request_closed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_merged.html b/public/message_template/pull_request_merged.html index 61a8e5434..fd9f93822 100755 --- a/public/message_template/pull_request_merged.html +++ b/public/message_template/pull_request_merged.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

From 6adcb89829e1c7134efc14650fc36144fd945c0e Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 2 Nov 2021 14:34:02 +0800 Subject: [PATCH 38/41] fix --- public/message_template/issue_assigned.html | 2 +- public/message_template/issue_changed.html | 2 +- public/message_template/issue_deleted.html | 2 +- public/message_template/organization_joined.html | 2 +- public/message_template/organization_left.html | 2 +- public/message_template/organization_role.html | 2 +- public/message_template/project_issue.html | 2 +- public/message_template/project_joined.html | 2 +- public/message_template/project_left.html | 2 +- public/message_template/project_member_joined.html | 2 +- public/message_template/project_member_left.html | 2 +- public/message_template/project_pull_request.html | 2 +- public/message_template/project_role.html | 2 +- public/message_template/project_setting_changed.html | 2 +- public/message_template/pull_request_assigned.html | 2 +- public/message_template/pull_request_changed.html | 2 +- public/message_template/pull_request_closed.html | 2 +- public/message_template/pull_request_merged.html | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/public/message_template/issue_assigned.html b/public/message_template/issue_assigned.html index c32363ac7..86952dd14 100755 --- a/public/message_template/issue_assigned.html +++ b/public/message_template/issue_assigned.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/issue_changed.html b/public/message_template/issue_changed.html index 97f0994f3..52219de58 100755 --- a/public/message_template/issue_changed.html +++ b/public/message_template/issue_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/issue_deleted.html b/public/message_template/issue_deleted.html index 61fe0cfd6..4174d179e 100755 --- a/public/message_template/issue_deleted.html +++ b/public/message_template/issue_deleted.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_joined.html b/public/message_template/organization_joined.html index eadc62239..e3848f473 100755 --- a/public/message_template/organization_joined.html +++ b/public/message_template/organization_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_left.html b/public/message_template/organization_left.html index 997db9e5e..32b1dc30e 100755 --- a/public/message_template/organization_left.html +++ b/public/message_template/organization_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_role.html b/public/message_template/organization_role.html index 90370e5b3..b411c7340 100755 --- a/public/message_template/organization_role.html +++ b/public/message_template/organization_role.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_issue.html b/public/message_template/project_issue.html index ded810135..98d645a11 100755 --- a/public/message_template/project_issue.html +++ b/public/message_template/project_issue.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_joined.html b/public/message_template/project_joined.html index 84889e43f..dfafd5d92 100755 --- a/public/message_template/project_joined.html +++ b/public/message_template/project_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_left.html b/public/message_template/project_left.html index c1176b6a4..94a0e9862 100755 --- a/public/message_template/project_left.html +++ b/public/message_template/project_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_member_joined.html b/public/message_template/project_member_joined.html index f03dc9462..d2fec456d 100755 --- a/public/message_template/project_member_joined.html +++ b/public/message_template/project_member_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_member_left.html b/public/message_template/project_member_left.html index b459ca9cf..8dfca4a2e 100755 --- a/public/message_template/project_member_left.html +++ b/public/message_template/project_member_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_pull_request.html b/public/message_template/project_pull_request.html index c8686ecdd..78aa5c2d4 100755 --- a/public/message_template/project_pull_request.html +++ b/public/message_template/project_pull_request.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_role.html b/public/message_template/project_role.html index e290ec990..17f53e37b 100755 --- a/public/message_template/project_role.html +++ b/public/message_template/project_role.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_setting_changed.html b/public/message_template/project_setting_changed.html index 737e12b7c..4d1f9762d 100755 --- a/public/message_template/project_setting_changed.html +++ b/public/message_template/project_setting_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_assigned.html b/public/message_template/pull_request_assigned.html index 71ca2b8de..c12924d1b 100755 --- a/public/message_template/pull_request_assigned.html +++ b/public/message_template/pull_request_assigned.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_changed.html b/public/message_template/pull_request_changed.html index 7d125d073..ab9c3f6a1 100755 --- a/public/message_template/pull_request_changed.html +++ b/public/message_template/pull_request_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_closed.html b/public/message_template/pull_request_closed.html index 67d7b0b33..dca5e1c7d 100755 --- a/public/message_template/pull_request_closed.html +++ b/public/message_template/pull_request_closed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_merged.html b/public/message_template/pull_request_merged.html index fd9f93822..8c6e3469c 100755 --- a/public/message_template/pull_request_merged.html +++ b/public/message_template/pull_request_merged.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

From e27ba76f33feec076ea74d2418c53fcc4dfa3cc2 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 3 Nov 2021 14:43:17 +0800 Subject: [PATCH 39/41] fix: project identifier regex --- app/forms/projects/update_form.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/forms/projects/update_form.rb b/app/forms/projects/update_form.rb index ae93abf30..3048bc079 100644 --- a/app/forms/projects/update_form.rb +++ b/app/forms/projects/update_form.rb @@ -3,11 +3,12 @@ class Projects::UpdateForm < BaseForm validates :name, presence: true validates :name, length: { maximum: 50 } validates :description, length: { maximum: 200 } + validates :identifier, format: { with: CustomRegexp::REPOSITORY_NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" } + validate do check_project_category(project_category_id) check_project_language(project_language_id) - Rails.logger.info project_identifier - Rails.logger.info identifier + check_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier end From 1a449d1dc64697250085ecba814eaf9f9dfe13da Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 20 Oct 2021 09:39:21 +0800 Subject: [PATCH 40/41] add: atme service --- app/controllers/application_controller.rb | 4 ++ app/controllers/issues_controller.rb | 10 +++- app/controllers/journals_controller.rb | 51 +++++++++++---------- app/controllers/pull_requests_controller.rb | 5 ++ app/services/atme_service.rb | 37 +++++++++++++++ 5 files changed, 82 insertions(+), 25 deletions(-) create mode 100644 app/services/atme_service.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3f0fbcc7d..7fa65e941 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -855,4 +855,8 @@ class ApplicationController < ActionController::Base HotSearchKeyword.add(keyword) end + def find_atme_receivers + @atme_receivers = User.where(login: params[:receivers_login]) + end + end diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 446c699e2..45a8530a3 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -9,7 +9,7 @@ class IssuesController < ApplicationController before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue] before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue] - before_action :check_token_enough, only: [:create, :update] + before_action :check_token_enough, :find_atme_receivers, only: [:create, :update] include ApplicationHelper include TagChosenHelper @@ -142,6 +142,10 @@ class IssuesController < ApplicationController end @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create") + + Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" + AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0 + render json: {status: 0, message: "创建成", id: @issue.id} else normal_status(-1, "创建失败") @@ -244,6 +248,10 @@ class IssuesController < ApplicationController post_to_chain(change_type, change_token.abs, current_user.try(:login)) end @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id) if @issue.previous_changes.present? + + Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" + AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0 + normal_status(0, "更新成功") else normal_status(-1, "更新失败") diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index ab00628d9..8fbe46924 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -1,6 +1,6 @@ class JournalsController < ApplicationController before_action :require_login, except: [:index, :get_children_journals] - before_action :require_profile_completed, only: [:create] + before_action :require_profile_completed, :find_atme_receivers, only: [:create] before_action :set_issue before_action :check_issue_permission before_action :set_journal, only: [:destroy, :edit, :update] @@ -22,32 +22,35 @@ class JournalsController < ApplicationController if notes.blank? normal_status(-1, "评论内容不能为空") else - journal_params = { - journalized_id: @issue.id , - journalized_type: "Issue", - user_id: current_user.id , - notes: notes.to_s.strip, - parent_id: params[:parent_id] - } - journal = Journal.new journal_params - if journal.save - if params[:attachment_ids].present? - params[:attachment_ids].each do |id| - attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id) - unless attachment.blank? - attachment.container = journal - attachment.author_id = current_user.id - attachment.description = "" - attachment.save + ActiveRecord::Base.transaction do + journal_params = { + journalized_id: @issue.id , + journalized_type: "Issue", + user_id: current_user.id , + notes: notes.to_s.strip, + parent_id: params[:parent_id] + } + journal = Journal.new journal_params + if journal.save + if params[:attachment_ids].present? + params[:attachment_ids].each do |id| + attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id) + unless attachment.blank? + attachment.container = journal + attachment.author_id = current_user.id + attachment.description = "" + attachment.save + end end end + Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" + AtmeService.call(current_user, @atme_receivers, journal) if @atme_receivers.size > 0 + # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal") + render :json => { status: 0, message: "评论成功", id: journal.id} + # normal_status(0, "评论成功") + else + normal_status(-1, "评论失败") end - - # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal") - render :json => { status: 0, message: "评论成功", id: journal.id} - # normal_status(0, "评论成功") - else - normal_status(-1, "评论失败") end end end diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 342f063d2..675c6523b 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -5,6 +5,7 @@ class PullRequestsController < ApplicationController before_action :check_menu_authorize before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits] before_action :load_pull_request, only: [:files, :commits] + before_action :find_atme_receivers, only: [:create, :update] include TagChosenHelper include ApplicationHelper @@ -61,6 +62,8 @@ class PullRequestsController < ApplicationController @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"]) SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id) if Site.has_notice_menu? SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) if Site.has_notice_menu? + Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" + AtmeService.call(current_user, @atme_receivers, @pull_request) if @atme_receivers.size > 0 else render_error("create pull request error: #{@gitea_pull_request[:status]}") raise ActiveRecord::Rollback @@ -106,6 +109,8 @@ class PullRequestsController < ApplicationController if params[:status_id].to_i == 5 @issue.issue_times.update_all(end_time: Time.now) end + Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" + AtmeService.call(current_user, @atme_receivers, @pull_request) if @atme_receivers.size > 0 normal_status(0, "PullRequest更新成功") else normal_status(-1, "PullRequest更新失败") diff --git a/app/services/atme_service.rb b/app/services/atme_service.rb new file mode 100644 index 000000000..623b32c09 --- /dev/null +++ b/app/services/atme_service.rb @@ -0,0 +1,37 @@ +class AtmeService < ApplicationService + Error = Class.new(StandardError) + + attr_reader :user, :receivers, :atmeable + + def initialize(user, receivers, atmeable) + @user = user + @receivers = receivers + @atmeable = atmeable + end + + def call + Rails.logger.info "[ATME] service args: [user]=>#{user}, [receivers]=>#{receivers}, [atmeable]=>#{atmeable}" + return if atmeable.nil? + Rails.logger.info "[ATME] atmeable class name is: #{ atmeable.class.name}" + case atmeable.class.name + when 'Issue' + message_source = 'IssueAtme' + when 'PullRequest' + message_source = 'PullRequestAtme' + when 'Journal' + journal = Journal.find_by_id(atmeable.id) + if journal.present? + if journal&.issue&.pull_request.present? + @atmeable = journal&.issue&.pull_request + message_source = 'PullRequestAtme' + else + @atmeable = journal&.issue + message_source = 'IssueAtme' + end + end + else + return + end + SendTemplateMessageJob.perform_now(message_source, receivers, user.id, @atmeable.id) if Site.has_notice_menu? + end +end From eb18a1e7aa93f82d5633862315837078da9f3e49 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 22 Oct 2021 14:34:08 +0800 Subject: [PATCH 41/41] add: project members api and update forks api --- app/controllers/projects/members_controller.rb | 6 ++++++ app/views/projects/members/index.json.jbuilder | 4 ++++ config/routes.rb | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 app/controllers/projects/members_controller.rb create mode 100644 app/views/projects/members/index.json.jbuilder diff --git a/app/controllers/projects/members_controller.rb b/app/controllers/projects/members_controller.rb new file mode 100644 index 000000000..9c78229dd --- /dev/null +++ b/app/controllers/projects/members_controller.rb @@ -0,0 +1,6 @@ +class Projects::MembersController < Projects::BaseController + def index + users = @project.all_collaborators.like(params[:search]).includes(:user_extension) + @users = kaminari_paginate(users) + end +end \ No newline at end of file diff --git a/app/views/projects/members/index.json.jbuilder b/app/views/projects/members/index.json.jbuilder new file mode 100644 index 000000000..0f605b69c --- /dev/null +++ b/app/views/projects/members/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @users.total_count +json.users do + json.partial! 'users/user_small', users: @users +end diff --git a/config/routes.rb b/config/routes.rb index 5d40ca42c..05681b14a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -429,7 +429,7 @@ Rails.application.routes.draw do get :simple get :watchers, to: 'projects#watch_users' get :stargazers, to: 'projects#praise_users' - get :members, to: 'projects#fork_users' + get :forks, to: 'projects#fork_users' match :about, :via => [:get, :put, :post] end end @@ -585,6 +585,7 @@ Rails.application.routes.draw do end scope module: :projects do + resources :members, only: [:index] resources :teams, only: [:index, :create, :destroy] resources :project_units, only: [:index, :create] resources :applied_transfer_projects, only: [:create] do