Browse Source

修复:atme和issue category 无法正常搜索

pull/342/head
yystopf 3 years ago
parent
commit
2e0b32f86b
3 changed files with 10 additions and 10 deletions
  1. +1
    -1
      app/services/api/v1/issues/create_service.rb
  2. +8
    -8
      app/services/api/v1/issues/list_service.rb
  3. +1
    -1
      app/services/api/v1/issues/update_service.rb

+ 1
- 1
app/services/api/v1/issues/create_service.rb View File

@@ -109,7 +109,7 @@ class Api::V1::Issues::CreateService < ApplicationService
end

def build_atme_participants
atme_receivers.each do |receiver|
@atme_receivers.each do |receiver|
@created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id})
end
end


+ 8
- 8
app/services/api/v1/issues/list_service.rb View File

@@ -28,13 +28,13 @@ class Api::V1::Issues::ListService < ApplicationService

def call
raise Error, errors.full_messages.join(", ") unless valid?
begin
# begin
issue_query_data

return {data: queried_issues, total_issues_count: @total_issues_count, closed_issues_count: @closed_issues_count, opened_issues_count: @opened_issues_count}
rescue
raise Error, "服务器错误,请联系系统管理员!"
end
# rescue
# raise Error, "服务器错误,请联系系统管理员!"
# end
end

private
@@ -43,13 +43,13 @@ class Api::V1::Issues::ListService < ApplicationService

case participant_category
when 'aboutme' # 关于我的
issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(authored assigned atme)},users: {id: current_user&.id})
issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: %(authored assigned atme), participant_id: current_user&.id})
when 'authoredme' # 我创建的
issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'assigned'},users: {id: current_user&.id})
issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'authored', participant_id: current_user&.id})
when 'assignedme' # 我负责的
issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'assigned'},users: {id: current_user&.id})
issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'assigned', participant_id: current_user&.id})
when 'atme' # @我的
issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'atme'},users: {id: current_user&.id})
issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'atme', participant_id: current_user&.id})
end

# author_id


+ 1
- 1
app/services/api/v1/issues/update_service.rb View File

@@ -111,7 +111,7 @@ class Api::V1::Issues::UpdateService < ApplicationService
end

def build_atme_participants
atme_receivers.each do |receiver|
@atme_receivers.each do |receiver|
next if @updated_issue.issue_participants.exists?(participant_type: "atme", participant_id: receiver.id)
@updated_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id})
end


Loading…
Cancel
Save