Merge branch 'develop' into standalone_develop

app/controllers/users/template_message_settings_controller.rb

@@ -22,9 +22,9 @@ class Users::TemplateMessageSettingsController < Users::BaseController
 
   def get_current_setting
     @current_setting = @_observed_user.user_template_message_setting
+    @current_setting = UserTemplateMessageSetting.build(@_observed_user.id) if @current_setting.nil?
     @current_setting.notification_body.merge!(UserTemplateMessageSetting.init_notification_body.except(*@current_setting.notification_body.keys))
     @current_setting.email_body.merge!(UserTemplateMessageSetting.init_email_body.except(*@current_setting.email_body.keys))
-    @current_setting = UserTemplateMessageSetting.build(@_observed_user.id) if @current_setting.nil?
   end
 
   def setting_params 

app/jobs/cache_async_clear_job.rb

@@ -7,6 +7,8 @@ class CacheAsyncClearJob < ApplicationJob
       Cache::V2::ProjectCommonService.new(id).clear
     when "owner_common_service"
       Cache::V2::OwnnerCommonService.new(id).clear
+    when "project_rank_service"
+      Cache::V2::ProjectRankService.new(id).clear
     end
   end
 end

app/jobs/send_template_message_job.rb

@@ -52,6 +52,10 @@ class SendTemplateMessageJob < ApplicationJob
       receivers = User.where(id: [issue&.assigned_to_id, issue&.author_id])
       receivers_string, content, notification_url = MessageTemplate::IssueExpire.get_message_content(receivers, issue)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {issue_id: issue.id})
+      receivers.find_each do |receiver|
+        receivers_email_string, email_title, email_content = MessageTemplate::IssueExpire.get_email_message_content(receiver, issue)
+        Notice::Write::EmailCreateService.call(receivers_email_string, email_title, email_content)
+      end
     when 'IssueDeleted'
       operator_id, issue_title, issue_assigned_to_id, issue_author_id = args[0], args[1], args[2], args[3]
       operator = User.find_by_id(operator_id)

app/models/issue.rb

@@ -76,7 +76,7 @@ class Issue < ApplicationRecord
   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_save :change_versions_count
+  after_save :change_versions_count, :send_update_message_to_notice_system
   after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic
 
   def incre_project_common
@@ -200,4 +200,8 @@ class Issue < ApplicationRecord
     self.project.decrement!(:closed_issues_count) if self.status_id == 5
   end
 
+  def send_update_message_to_notice_system
+    SendTemplateMessageJob.perform_later('IssueExpire', self.id) if Site.has_notice_menu? && self.due_date == Date.today + 1.days
+  end
+
 end

app/models/message_template/issue_expire.rb

@@ -16,18 +16,21 @@
 class MessageTemplate::IssueExpire < MessageTemplate
 
   # MessageTemplate::IssueCreatorExpire.get_message_content(User.where(login: 'yystopf'), Issue.last)
-  def self.get_message_content(receiver, issue)
-    if receiver.user_template_message_setting.present? 
-      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::IssueExpire"]
-      project = issue&.project
-      owner = project&.owner
-      content = sys_notice.gsub('{title}', issue&.subject)
-      url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
-  
-      return receivers_string(receivers), content, url
-    else
-      return '', '', ''
+  def self.get_message_content(receivers, issue)
+    receivers.each do |receiver|
+      if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["CreateOrAssign::IssueExpire"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["CreateOrAssign::IssueExpire"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
+      end
     end
+    return '', '', '' if receivers.blank?
+    project = issue&.project
+    owner = project&.owner
+    content = sys_notice.gsub('{title}', issue&.subject)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+
+    return receivers_string(receivers), content, url
   rescue => e
     Rails.logger.info("MessageTemplate::IssueExpire.get_message_content [ERROR] #{e}")
     return '', '', ''
@@ -35,9 +38,12 @@ class MessageTemplate::IssueExpire < MessageTemplate
 
   def self.get_email_message_content(receiver, issue)
     if receiver.user_template_message_setting.present? 
-      return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::IssueExpire"]
+      send_setting = receiver.user_template_message_setting.email_body["CreateOrAssign::IssueExpire"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["CreateOrAssign::IssueExpire"] : send_setting
+      return '', '', '' unless send_setting
       project = issue&.project
       owner = project&.owner 
+      title = email_title
 
       content = email
       content.gsub!('{receiver}', receiver&.real_name)

app/models/message_template/project_forked.rb

@@ -19,7 +19,9 @@ class MessageTemplate::ProjectForked < MessageTemplate
   def self.get_message_content(receivers, user, project)
     receivers.each do |receiver|
       if receiver.user_template_message_setting.present? 
-        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::Forked"]
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Forked"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Forked"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
       end
     end
     return '', '', '' if receivers.blank?

app/models/message_template/project_milestone.rb

@@ -19,6 +19,8 @@ class MessageTemplate::ProjectMilestone < MessageTemplate
   def self.get_message_content(receivers, operator, milestone)
     receivers.each do |receiver|
       if receiver.user_template_message_setting.present? 
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Milestone"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Milestone"] : send_setting
         receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::Milestone"]
       end
     end
@@ -36,7 +38,9 @@ class MessageTemplate::ProjectMilestone < MessageTemplate
 
   def self.get_email_message_content(receiver, operator, milestone)
     if receiver.user_template_message_setting.present? 
-      return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::Milestone"]
+      send_setting = receiver.user_template_message_setting.email_body["ManageProject::Milestone"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::Milestone"] : send_setting
+      return '', '', '' unless send_setting
       project = milestone&.project 
       owner = project&.owner 
       title = email_title

app/models/message_template/project_milestone_completed.rb

@@ -19,7 +19,9 @@ class MessageTemplate::ProjectMilestoneCompleted < MessageTemplate
   def self.get_message_content(receivers, milestone)
     receivers.each do |receiver|
       if receiver.user_template_message_setting.present? 
-        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::MilestoneCompleted"]
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneCompleted"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneCompleted"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
       end
     end
     return '', '', '' if receivers.blank?
@@ -36,7 +38,9 @@ class MessageTemplate::ProjectMilestoneCompleted < MessageTemplate
 
   def self.get_email_message_content(receiver, milestone)
     if receiver.user_template_message_setting.present? 
-      return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::MilestoneCompleted"]
+      send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneCompleted"]
+      send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneCompleted"] : send_setting
+      return '', '', '' unless send_setting
       project = milestone&.project 
       owner = project&.owner 
       title = email_title

app/models/message_template/project_praised.rb

@@ -19,7 +19,9 @@ class MessageTemplate::ProjectPraised < MessageTemplate
   def self.get_message_content(receivers, user, project)
     receivers.each do |receiver|
       if receiver.user_template_message_setting.present? 
-        receivers = receivers.where.not(id: receiver.id) unless receiver.user_template_message_setting.notification_body["ManageProject::Praised"]
+        send_setting = receiver.user_template_message_setting.notification_body["ManageProject::Praised"]
+        send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::Praised"] : send_setting
+        receivers = receivers.where.not(id: receiver.id) unless send_setting
       end
     end
     return '', '', '' if receivers.blank?

app/models/project.rb

@@ -128,8 +128,8 @@ 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 :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
+  after_save :check_project_members
+  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data
   before_destroy :decre_project_common, :decre_forked_from_project_count
   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, :description, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
@@ -153,7 +153,7 @@ class Project < ApplicationRecord
   end
 
   def reset_cache_data 
-    CacheAsyncResetJob.perform_later("project_common_service", self.id)
+    CacheAsyncResetJob.set(wait: 5.seconds).perform_later("project_common_service", self.id)
     if changes[:user_id].present?
       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)
@@ -166,6 +166,14 @@ class Project < ApplicationRecord
       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
+    if changes[:is_public].present?
+      if changes[:is_public][0] && !changes[:is_public][1]
+        CacheAsyncClearJob.perform_later('project_rank_service', self.id)
+      end
+      if !changes[:is_public][0] && changes[:is_public][1]
+        $redis_cache.srem("v2-project-rank-deleted", self.id)
+      end
+    end
   end
 
   def decre_project_common