From 3a475a4674a702422651298d7a850e0f63af6314 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Mon, 28 Jun 2021 09:59:47 +0800
Subject: [PATCH] FIX get conflict files bug with  create pr api

---
 app/controllers/pull_requests_controller.rb | 2 +-
 app/controllers/repositories_controller.rb  | 2 +-
 app/models/pull_request.rb                  | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 3d9f32a22..987bb156e 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -56,7 +56,7 @@ class PullRequestsController < ApplicationController
     ActiveRecord::Base.transaction do
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
-        @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"])
+        @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
         render_ok
       else
         render_error("create pull request error: #{@gitea_pull_request[:status]}")
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 062a8f046..f375b636b 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -316,7 +316,7 @@ class RepositoriesController < ApplicationController
         local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: @pull_issue.id))
         if local_requests.save
           gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @owner.login, @project.try(:identifier), requests_params).call
-          if gitea_request[:status] == :success && local_requests.update_attributes(gpid: gitea_request["body"]["number"])
+          if gitea_request[:status] == :success && local_requests.update_attributes(gitea_number: gitea_request["body"]["number"])
             local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
           end
         end
diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
index 5c9004a06..ce0cb04ad 100644
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@@ -54,8 +54,10 @@ class PullRequest < ApplicationRecord
     Project.find_by(id: self.fork_project_id)
   end
 
-  def bind_gitea_pull_request!(gitea_pull_number)
-    update_column(:gitea_number, gitea_pull_number)
+  def bind_gitea_pull_request!(gitea_pull_number, gitea_pull_id)
+    update_columns(
+      gitea_number: gitea_pull_number,
+      gitea_id: gitea_pull_id)
   end
 
   def merge!