From 120a33bc8ab5ae09c79fb589c6eecb3a50269513 Mon Sep 17 00:00:00 2001
From: "vilet.yy" <yystopf@163.com>
Date: Tue, 27 Apr 2021 15:43:37 +0800
Subject: [PATCH] add: undo count

---
 app/controllers/users_controller.rb                   | 2 ++
 app/jobs/send_transfer_project_applied_message_job.rb | 6 +++---
 app/views/users/show.json.jbuilder                    | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c6ac626a3..395a5a6d9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -32,6 +32,8 @@ class UsersController < ApplicationController
         @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
         @undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size
       else 
+        @waiting_applied_messages = AppliedMessage.none
+        @common_applied_transfer_projects = AppliedTransferProject.none
         @undo_events = 0
       end
       #用户的组织数量
diff --git a/app/jobs/send_transfer_project_applied_message_job.rb b/app/jobs/send_transfer_project_applied_message_job.rb
index 5f0c24c65..92ea306d1 100644
--- a/app/jobs/send_transfer_project_applied_message_job.rb
+++ b/app/jobs/send_transfer_project_applied_message_job.rb
@@ -16,7 +16,7 @@ class SendTransferProjectAppliedMessageJob < ApplicationJob
       AppliedMessage.create!(user_id: rec.user_id, 
                              applied: applied_transfer_project,
                              status: message_status,
-                             name: build_name(project.name, applied_transfer_project&.owner&.real_name, message_status),
+                             name: build_name(project.name, applied_transfer_project&.owner&.real_name, message_status, applied_user&.real_name),
                              applied_user_id: applied_user.id, 
                              project_id: project.id)
     end
@@ -31,7 +31,7 @@ class SendTransferProjectAppliedMessageJob < ApplicationJob
   end
 
   private 
-  def build_name(repo_name, owner_name, message_status)
+  def build_name(repo_name, owner_name, message_status, applied_name="")
     case message_status
     when 'canceled'
       return "取消转移【#{repo_name}】仓库"
@@ -40,7 +40,7 @@ class SendTransferProjectAppliedMessageJob < ApplicationJob
     when 'successed'
       return "【#{repo_name}】仓库成功转移给【#{owner_name}】"
     when 'failure'
-      return "【#{repo_name}】仓库转移失败"
+      return "拒绝转移【#{repo_name}】仓库"
     end
     ""
   end
diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
index 54f85c5c2..e80ac7494 100644
--- a/app/views/users/show.json.jbuilder
+++ b/app/views/users/show.json.jbuilder
@@ -10,6 +10,8 @@ json.user_identity @user.identity
 json.is_watch current_user&.watched?(@user)
 json.watched_count @user.fan_count   #粉丝
 json.watching_count @user.follow_count   #关注数
+json.undo_messages @waiting_applied_messages.size 
+json.undo_transfer_projects @common_applied_transfer_projects.size
 json.undo_events @undo_events
 json.user_composes_count @user_composes_count
 json.user_org_count @user_org_count