From 15444d43cfcb6fbde4240c891cd41f2dc0d8fe15 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 28 Feb 2020 10:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E7=9A=84=E5=90=8E=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/pull_requests_controller.rb      |  4 +---
 app/services/gitea/client_service.rb             | 14 +++++++-------
 app/services/gitea/pull_request/merge_service.rb | 16 +---------------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index d282e9b90..de1aca773 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -277,7 +277,7 @@ class PullRequestsController < ApplicationController
             MergeTitleField: params[:title]
           }
           merge_pr = Gitea::PullRequest::MergeService.new(current_user, @repository.try(:identifier), @pull_request.try(:gpid), requests_params).call
-          if @pull_request.update_attribute(:status, 1) && merge_pr
+          if @pull_request.update_attribute(:status, 1) && merge_pr[:status].to_i == 200
             # @pull_request.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "merge")
             @pull_request&.project_trends&.update_all(action_type: "close")
 
@@ -380,9 +380,7 @@ class PullRequestsController < ApplicationController
   end
 
   def find_pull_request
-    Rails.logger.info("#########___________#######{params[:id]}")
     @pull_request = PullRequest.find_by_id(params[:id])
-    Rails.logger.info("#########________@pull_request___#######{@pull_request}")
     @issue = @pull_request&.issue
     if @pull_request.blank?
       normal_status(-1, "合并请求不存在")
diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb
index 1c5da312c..66cbe5c1b 100644
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@@ -136,13 +136,13 @@ class Gitea::ClientService < ApplicationService
       puts "[gitea] "
       raise Error, "[gitea] delete ok"
     else
-      if response&.body.blank?
-        message = "出现错误"
-      else
-        result = JSON.parse(response&.body)
-        message = result['message']
-      end
-      raise Error, mark + message
+      # if response&.body.blank?
+      #   message = "出现错误"
+      # else
+      #   result = JSON.parse(response&.body)
+      #   message = result['message']
+      # end
+      raise Error, "该请求不存在"
     end
   end
 
diff --git a/app/services/gitea/pull_request/merge_service.rb b/app/services/gitea/pull_request/merge_service.rb
index 7c2a8c7ae..8ccf13d4e 100644
--- a/app/services/gitea/pull_request/merge_service.rb
+++ b/app/services/gitea/pull_request/merge_service.rb
@@ -16,8 +16,7 @@ class Gitea::PullRequest::MergeService < Gitea::ClientService
   end
 
   def call
-    response = post(url, request_params)
-    render_status(response)
+    post(url, request_params)
   end
 
   private
@@ -29,17 +28,4 @@ class Gitea::PullRequest::MergeService < Gitea::ClientService
     Hash.new.merge(token: user.gitea_token, data: params)
   end
 
-  def render_status(response)
-    case response.status
-    when 404
-      raise Error, "合并请求不存在"
-    else
-      if response.body.size > 0
-        JSON.parse(response&.body)
-      else
-        {status: 200}
-      end
-    end
-  end
-
 end