Merge branch 'develop' into dev_trustie_server

app/controllers/projects/applied_transfer_projects_controller.rb

@@ -0,0 +1,26 @@
+class Projects::AppliedTransferProjectsController < Projects::BaseController
+  before_action :check_auth
+
+  def organizations 
+    @organizations = Organization.includes(:organization_extension).joins(team_users: :team).where(team_users: {user_id: current_user.id}, teams: {authorize: %w(admin owner)})
+  end
+
+  def create 
+    @applied_transfer_project = Projects::ApplyTransferService.call(current_user, @project, params)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def cancel 
+    @applied_transfer_project = Projects::CancelTransferService.call(current_user, @project)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def check_auth 
+    return render_forbidden unless current_user.admin? ||@project.owner?(current_user)
+  end
+end

app/controllers/users/applied_messages_controller.rb

@@ -0,0 +1,18 @@
+class Users::AppliedMessagesController < Users::BaseController 
+  before_action :check_auth 
+  after_action :view_messages, only: [:index]
+
+  def index 
+    @applied_messages = @_observed_user.applied_messages.order(viewed: :asc, created_at: :desc)
+    @applied_messages = paginate @applied_messages
+  end
+
+  private 
+  def check_auth 
+    return render_forbidden unless observed_logged_user?
+  end
+
+  def view_messages
+    @applied_messages.update_all(viewed: 'viewed')
+  end
+end

app/controllers/users/applied_transfer_projects_controller.rb

@@ -0,0 +1,41 @@
+class Users::AppliedTransferProjectsController < Users::BaseController 
+  before_action :check_auth
+  before_action :find_applied_transfer_project, except: [:index]
+  before_action :find_project, except: [:index]
+
+  def index 
+    user_collection_sql = AppliedTransferProject.where(owner_id: @_observed_user.id).to_sql 
+    org_collection_sql = AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @_observed_user.id}, teams: {authorize: %w(admin owner)} )).to_sql 
+    @applied_transfer_projects = AppliedTransferProject.from("( #{ user_collection_sql } UNION #{ org_collection_sql } ) AS applied_transfer_projects")
+    @applied_transfer_projects = paginate @applied_transfer_projects.order("created_at desc")
+  end
+
+  # 接受迁移
+  def accept 
+    @applied_transfer_project = Projects::AcceptTransferService.call(current_user, @project)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  # 拒绝迁移
+  def refuse 
+    @applied_transfer_project = Projects::RefuseTransferService.call(current_user, @project)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def check_auth 
+    return render_forbidden unless observed_logged_user?
+  end
+
+  def find_applied_transfer_project 
+    @applied_transfer_project = AppliedTransferProject.find_by_id params[:id]
+  end
+
+  def find_project 
+    @project = @applied_transfer_project.project
+  end
+end

app/controllers/users_controller.rb

@@ -27,11 +27,20 @@ class UsersController < ApplicationController
 
   def show
       #待办事项，现在未做
-      @undo_events = 0
+      if User.current.login == @user.login 
+        @waiting_applied_messages = @user.applied_messages.waiting
+        @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
       #用户的组织数量
       # @user_composes_count =  @user.composes.size
       @user_composes_count = 0
-      @user_org_count = User.current.logged? ? @user.organizations.with_visibility(%w(common limited)).size + @user.organizations.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).size : @user.organizations.with_visibility("common").size
+      user_organizations =  User.current.logged? ? @user.organizations.with_visibility(%w(common limited)) + @user.organizations.with_visibility("privacy").joins(:team_users).where(team_users: {user_id: current_user.id}) : @user.organizations.with_visibility("common")
+      @user_org_count = user_organizations.size
       user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? @user.projects : @user.projects.visible
       @projects_common_count = user_projects.common.size
       @projects_mirrior_count = user_projects.mirror.size