Browse Source

修复:部分issue

pull/343/head
yystopf 3 years ago
parent
commit
16dbb87526
6 changed files with 6 additions and 5 deletions
  1. +1
    -1
      app/models/issue.rb
  2. +1
    -1
      app/services/api/v1/issues/update_service.rb
  3. +1
    -1
      app/services/webhook/client.rb
  4. +1
    -0
      app/services/webhook/issue_client.rb
  5. +1
    -1
      app/services/webhook/issue_comment_client.rb
  6. +1
    -1
      app/services/webhook/pull_comment_client.rb

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

@@ -219,7 +219,7 @@ class Issue < ApplicationRecord

def to_builder
Jbuilder.new do |issue|
issue.(self, :id, :project_issues_index, :subject, :description)
issue.(self, :id, :project_issues_index, :subject, :description, :branch_name, :start_date, :due_date)
issue.created_at self.created_on.strftime("%Y-%m-%d %H:%M")
issue.updated_at self.updated_on.strftime("%Y-%m-%d %H:%M")
issue.tags self.show_issue_tags.map{|t| JSON.parse(t.to_builder.target!)}


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

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

def build_previous_issue_changes
@previous_issue_changes.merge!(@updated_issue.previous_changes.slice("status_id", "priority_id", "fixed_version_id", "issue_tags_value", "branch_name").symbolize_keys)
@previous_issue_changes.merge!(@updated_issue.previous_changes.slice("status_id", "priority_id", "fixed_version_id", "issue_tags_value", "branch_name", "subject", "description").symbolize_keys)
if @updated_issue.previous_changes[:start_date].present?
@previous_issue_changes.merge!(start_date: [@updated_issue.previous_changes[:start_date][0].to_s, @updated_issue.previous_changes[:start_date][1].to_s])
end


+ 1
- 1
app/services/webhook/client.rb View File

@@ -55,7 +55,7 @@ module Webhook::Client

@response_content["status"] = response.code
@response_content["headers"] = response.headers
@response_content["body"] = response.body.to_json
@response_content["body"] = response.body

rescue => e
@response_content["status"] = 500


+ 1
- 0
app/services/webhook/issue_client.rb View File

@@ -89,6 +89,7 @@ class Webhook::IssueClient
{
"action": @changes["assigners"].blank? ? "unassigned" : "assigned",
"number": @issue.project_issues_index,
"changes": @changes,
"issue": JSON.parse(@issue.to_builder.target!),
"project": JSON.parse(@issue.project.to_builder.target!),
"sender": JSON.parse(@sender.to_builder.target!)


+ 1
- 1
app/services/webhook/issue_comment_client.rb View File

@@ -7,7 +7,7 @@ class Webhook::IssueCommentClient
def initialize(webhook, issue, journal, sender, event, action_type, comment_json={})
@webhook = webhook
@issue = issue.reload
@journal = journal.reload
@journal = journal.present? ? journal.reload : nil
@sender = sender.reload
@event = event
@action_type = action_type


+ 1
- 1
app/services/webhook/pull_comment_client.rb View File

@@ -6,7 +6,7 @@ class Webhook::PullCommentClient
def initialize(webhook, pull, journal, sender, event, action_type='created', comment_json={})
@webhook = webhook
@pull = pull.reload
@journal = journal.reload
@journal = journal.present? ? journal.reload : nil
@sender = sender.reload
@event = event
@action_type = action_type


Loading…
Cancel
Save