diff --git a/app/jobs/send_template_message_job.rb b/app/jobs/send_template_message_job.rb index 125ed3e0b..900e8b84d 100644 --- a/app/jobs/send_template_message_job.rb +++ b/app/jobs/send_template_message_job.rb @@ -37,6 +37,7 @@ class SendTemplateMessageJob < ApplicationJob issue = Issue.find_by_id(issue_id) return unless operator.present? && issue.present? # receivers = receivers.where.not(id: operator&.id) + receivers = User.where(id: receivers) receivers_string, content, notification_url = MessageTemplate::IssueAtme.get_message_content(receivers, operator, issue) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_id: issue.id}, 2, operator_id) when 'IssueChanged' @@ -235,6 +236,7 @@ class SendTemplateMessageJob < ApplicationJob pull_request = PullRequest.find_by_id(pull_request_id) return unless operator.present? && pull_request.present? # receivers = receivers.where.not(id: operator&.id) + receivers = User.where(id: receivers) receivers_string, content, notification_url = MessageTemplate::PullRequestAtme.get_message_content(receivers, operator, pull_request) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, pull_request_id: pull_request.id}, 2, operator_id) when 'PullRequestChanged' diff --git a/app/models/issue.rb b/app/models/issue.rb index 6b81219b3..47445245e 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -155,7 +155,7 @@ class Issue < ApplicationRecord end def is_collaborators? - self.assigned_to_id.present? ? self.project.members.where(user_id: self.assigned_to_id).present? : false + self.assigned_to_id.present? ? self.project.member?(self.assigned_to_id) : false end def get_issue_tags_name diff --git a/app/services/atme_service.rb b/app/services/atme_service.rb index 623b32c09..f93314e47 100644 --- a/app/services/atme_service.rb +++ b/app/services/atme_service.rb @@ -32,6 +32,6 @@ class AtmeService < ApplicationService else return end - SendTemplateMessageJob.perform_now(message_source, receivers, user.id, @atmeable.id) if Site.has_notice_menu? + SendTemplateMessageJob.perform_later(message_source, receivers.pluck(:id), user.id, @atmeable.id) if Site.has_notice_menu? end end diff --git a/app/services/notice/write/client_service.rb b/app/services/notice/write/client_service.rb index c76691cfb..d9dc841f6 100644 --- a/app/services/notice/write/client_service.rb +++ b/app/services/notice/write/client_service.rb @@ -59,6 +59,8 @@ class Notice::Write::ClientService < ApplicationService req.request :url_encoded req.headers['Content-Type'] = 'application/json' req.adapter Faraday.default_adapter + req.options.timeout = 100 # open/read timeout in seconds + req.options.open_timeout = 10 # connection open timeout in seconds end end