From 77577618c81ba6342234fb0f6ff23444a60e9ba6 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 11 Mar 2020 17:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0pull=5Frequests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/tasks/sync_user_forge_task.rb | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/tasks/sync_user_forge_task.rb b/app/tasks/sync_user_forge_task.rb
index 11e858457..3a4837f7a 100644
--- a/app/tasks/sync_user_forge_task.rb
+++ b/app/tasks/sync_user_forge_task.rb
@@ -14,15 +14,18 @@ class SyncUserForgeTask
       user_extension_params = u.try(:user_extension).as_json || []
       target_params = []
       if u.projects.present?
-        projects = u.projects.includes(:versions,:project_score,:commits, issues: [:journals,:commit_issues],owner: [:user_extension], members: [roles: [:member_roles]])
+        projects = u.projects.includes(:versions,:project_score,:commits, :pull_requests, issues: [:journals,:commit_issues],owner: [:user_extension], members: [roles: [:member_roles]])
         projects.find_each do |p|
           member_params = get_members(p.members,p)
           project_params = p.as_json
           issue_params = get_issues(p, u.id)
           versions_params = get_versions(p)
           project_score_params = get_scores(p)
-          pull_request_params = get_prs(p)  #pull_request的，但是目前educoder没有pull_request表
+          commit_params = get_commits(p)
+          pull_request_params = get_prs(p)
+
           repo_params = get_repository(p)  #repository的内容
+
           relate_project_params = {
             project_params: project_params,
             member_params: member_params,
@@ -30,7 +33,8 @@ class SyncUserForgeTask
             versions_params: versions_params,
             project_score_params: project_score_params,
             pull_request_params: pull_request_params,
-            repo_params: repo_params
+            repo_params: repo_params,
+            commit_params: commit_params
           }
           target_params.push(relate_project_params)
         end
@@ -84,8 +88,7 @@ class SyncUserForgeTask
     project.try(:project_score).as_json || []
   end
 
-  #pull_reqeust的内容,以前为commits表
-  def get_prs(project)
+  def get_commits(project)
     pr_params = []
     prs = project.commits
     prs.find_each do |i|
@@ -94,6 +97,15 @@ class SyncUserForgeTask
     pr_params
   end
 
+  def get_prs(project)
+    pr_params = []
+    prs = project.pull_requests
+    prs.find_each do |i|
+      pr_params.push(i.as_json)
+    end
+    pr_params
+  end
+
 
   #repository的内容
   def get_repository(project)