Browse Source

fix: merge from develop

tags/v4.0.0^2
yystopf 4 years ago
parent
commit
8a34699acd
4 changed files with 6 additions and 2 deletions
  1. +2
    -0
      app/jobs/send_template_message_job.rb
  2. +1
    -1
      app/models/issue.rb
  3. +1
    -1
      app/services/atme_service.rb
  4. +2
    -0
      app/services/notice/write/client_service.rb

+ 2
- 0
app/jobs/send_template_message_job.rb View File

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


+ 1
- 1
app/models/issue.rb View File

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


+ 1
- 1
app/services/atme_service.rb View File

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

+ 2
- 0
app/services/notice/write/client_service.rb View File

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



Loading…
Cancel
Save