forked from Gitlink/forgeplus
add: transfer project
This commit is contained in:
parent
8c71a72fce
commit
1e081b5a3e
|
@ -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[:owner_id])
|
||||
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
|
|
@ -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
|
|
@ -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
|
||||
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
|
|
@ -27,11 +27,18 @@ 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
|
||||
@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
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
class SendTransferProjectAppliedMessageJob < ApplicationJob
|
||||
queue_as :default
|
||||
|
||||
def perform(applied_transfer_project, applied_user, message_status)
|
||||
project = applied_transfer_project.project
|
||||
owner = applied_transfer_project.owner
|
||||
return unless project.present?
|
||||
return unless owner.present?
|
||||
receivers = project.managers + owner.team_users.joins(:team).where(teams: {authorize: %w(owner admin)})
|
||||
receivers.each do |rec|
|
||||
AppliedMessage.create!(user_id: rec.user_id,
|
||||
applied: applied_transfer_project,
|
||||
status: message_status,
|
||||
name: build_name(project.name, owner.real_name, message_status),
|
||||
applied_user_id: applied_user.id,
|
||||
project_id: project.id)
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
def build_name(repo_name, owner_name, message_status)
|
||||
case message_status
|
||||
when 'canceled'
|
||||
return "取消转移【#{repo_name}】仓库"
|
||||
when 'common'
|
||||
return "正在将【#{repo_name}】仓库转移给【#{owner_name}】"
|
||||
when 'successed'
|
||||
return "【#{repo_name}】仓库成功转移给【#{owner_name}】"
|
||||
when 'failure'
|
||||
return "【#{repo_name}】仓库转移失败"
|
||||
end
|
||||
""
|
||||
end
|
||||
end
|
|
@ -19,5 +19,10 @@
|
|||
class AppliedMessage < ApplicationRecord
|
||||
belongs_to :user
|
||||
belongs_to :applied, polymorphic: true
|
||||
belongs_to :project
|
||||
belongs_to :applied_user, class_name: 'User'
|
||||
|
||||
enum viewed: {waiting: 0, viewed: 1}
|
||||
enum status: {canceled: -1, common: 0, successed: 1, failure: 2} # -1 已取消 0 正在操作 1 操作成功 2 操作失败
|
||||
|
||||
end
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
# == Schema Information
|
||||
#
|
||||
# Table name: applied_transfer_projects
|
||||
#
|
||||
# id :integer not null, primary key
|
||||
# project_id :integer
|
||||
# owner_id :integer
|
||||
# user_id :integer
|
||||
# status :integer default("0")
|
||||
# created_at :datetime not null
|
||||
# updated_at :datetime not null
|
||||
#
|
||||
# Indexes
|
||||
#
|
||||
# index_applied_transfer_projects_on_owner_id (owner_id)
|
||||
# index_applied_transfer_projects_on_project_id (project_id)
|
||||
# index_applied_transfer_projects_on_user_id (user_id)
|
||||
#
|
||||
|
||||
class AppliedTransferProject < ApplicationRecord
|
||||
belongs_to :project
|
||||
belongs_to :user # 操作者
|
||||
belongs_to :owner # 接收个人或组织
|
||||
|
||||
has_many :applied_messages, as: :applied, dependent: :destroy
|
||||
|
||||
enum status: {canceled: -1, common: 0, accepted: 1, refused: 2} # -1 已取消 0 待操作 1 已接收 2 已拒绝
|
||||
end
|
|
@ -66,4 +66,6 @@ class Owner < ApplicationRecord
|
|||
|
||||
has_many :projects, foreign_key: :user_id, dependent: :destroy
|
||||
has_many :repositories, foreign_key: :user_id, dependent: :destroy
|
||||
has_many :applied_transfer_projects, dependent: :destroy
|
||||
|
||||
end
|
||||
|
|
|
@ -112,6 +112,7 @@ class Project < ApplicationRecord
|
|||
has_one :project_detail, dependent: :destroy
|
||||
has_many :team_projects, dependent: :destroy
|
||||
has_many :project_units, dependent: :destroy
|
||||
has_one :applied_transfer_project, dependent: :destroy
|
||||
|
||||
after_save :check_project_members
|
||||
scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
|
||||
|
@ -295,4 +296,7 @@ class Project < ApplicationRecord
|
|||
update_column(:updated_on, time)
|
||||
end
|
||||
|
||||
def is_transfering
|
||||
applied_transfer_project&.common? ? true : false
|
||||
end
|
||||
end
|
||||
|
|
|
@ -147,9 +147,11 @@ class User < Owner
|
|||
has_many :trail_auth_apply_actions, -> { where(container_type: 'TrialAuthorization') }, class_name: 'ApplyAction'
|
||||
|
||||
# has_many :attendances
|
||||
|
||||
has_many :applied_messages, dependent: :destroy
|
||||
has_many :operate_applied_messages, class_name: 'AppliedMessage', dependent: :destroy
|
||||
# 项目
|
||||
has_many :applied_projects, dependent: :destroy
|
||||
has_many :operate_applied_transfer_projects, class_name: 'AppliedTransferProject', dependent: :destroy
|
||||
|
||||
# 教学案例
|
||||
# has_many :libraries, dependent: :destroy
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
class Projects::AcceptTransferService < ApplicationService
|
||||
attr_accessor :applied_transfer_project
|
||||
attr_reader :user, :project
|
||||
|
||||
def initialize(user, project)
|
||||
@user = user
|
||||
@project = project
|
||||
@applied_transfer_project = project.applied_transfer_project
|
||||
end
|
||||
|
||||
def call
|
||||
Rails.logger.info("###### Project accept_transfer_service begin ######")
|
||||
ActiveRecord::Base.transaction do
|
||||
validate!
|
||||
update_apply
|
||||
operate_project
|
||||
send_apply_message
|
||||
end
|
||||
|
||||
Rails.logger.info("##### Project accept_transfer_service end ######")
|
||||
|
||||
|
||||
return @applied_transfer_project
|
||||
end
|
||||
|
||||
private
|
||||
def validate!
|
||||
raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
|
||||
raise Error, '未拥有接受转移权限' unless @user.admin? || @project.is_admin?(@user)
|
||||
end
|
||||
|
||||
def update_apply
|
||||
@applied_transfer_project.update!(status: 'accepted')
|
||||
end
|
||||
|
||||
def operate_project
|
||||
@project = Projects::TransferService.call(@project, @applied_transfer_project.owner)
|
||||
end
|
||||
|
||||
def send_apply_message
|
||||
SendTransferProjectAppliedMessageJob.perform_now(@applied_transfer_project, @user, 'successed')
|
||||
end
|
||||
end
|
|
@ -0,0 +1,41 @@
|
|||
class Projects::ApplyTransferService < ApplicationService
|
||||
attr_accessor :owner, :applied_transfer_project
|
||||
attr_reader :user, :project, :owner_id
|
||||
|
||||
def initialize(user, project, owner_id)
|
||||
@user = user
|
||||
@project = project
|
||||
@owner_id = owner_id
|
||||
@owner = Owner.find_by_id(owner_id)
|
||||
end
|
||||
|
||||
def call
|
||||
Rails.logger.info("###### Project apply_transfer_service begin ######")
|
||||
validate!
|
||||
create_apply
|
||||
send_apply_message
|
||||
Rails.logger.info("###### Project apply_transfer_service end ######")
|
||||
|
||||
return @applied_transfer_project
|
||||
end
|
||||
|
||||
private
|
||||
def validate!
|
||||
raise Error, '该仓库正在迁移' if @project.is_transfering
|
||||
raise Error, '新拥有者不存在' unless @owner.present?
|
||||
raise Error, '未拥有转移权限' unless is_permit_owner
|
||||
end
|
||||
|
||||
def is_permit_owner
|
||||
return true unless @owner.is_a?(Organization)
|
||||
return @owner.is_owner?(@user)
|
||||
end
|
||||
|
||||
def create_apply
|
||||
@applied_transfer_project = AppliedTransferProject.create!(user_id: user.id, project_id: project.id, owner_id: owner_id)
|
||||
end
|
||||
|
||||
def send_apply_message
|
||||
SendTransferProjectAppliedMessageJob.perform_now(@applied_transfer_project, @user, 'common')
|
||||
end
|
||||
end
|
|
@ -0,0 +1,33 @@
|
|||
class Projects::CancelTransferService < ApplicationService
|
||||
attr_accessor :applied_transfer_project
|
||||
attr_reader :user, :project
|
||||
|
||||
def initialize(user, project)
|
||||
@user = user
|
||||
@project = project
|
||||
@applied_transfer_project = project.applied_transfer_project
|
||||
end
|
||||
|
||||
def call
|
||||
Rails.logger.info("###### Project cancel_transfer_service begin ######")
|
||||
validate!
|
||||
update_apply
|
||||
send_apply_message
|
||||
Rails.logger.info("###### Project cancel_transfer_service end ######")
|
||||
|
||||
return @applied_transfer_project
|
||||
end
|
||||
|
||||
private
|
||||
def validate!
|
||||
raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
|
||||
end
|
||||
|
||||
def update_apply
|
||||
@applied_transfer_project.update!(status: 'canceled')
|
||||
end
|
||||
|
||||
def send_apply_message
|
||||
SendTransferProjectAppliedMessageJob.perform_now(@applied_transfer_project, @user, 'canceled')
|
||||
end
|
||||
end
|
|
@ -0,0 +1,33 @@
|
|||
class Projects::RefuseTransferService < ApplicationService
|
||||
attr_accessor :applied_transfer_project
|
||||
attr_reader :user, :project
|
||||
|
||||
def initialize(user, project)
|
||||
@user = user
|
||||
@project = project
|
||||
@applied_transfer_project = project.applied_transfer_project
|
||||
end
|
||||
|
||||
def call
|
||||
Rails.logger.info("###### Project refuse_transfer_service begin ######")
|
||||
validate!
|
||||
update_apply
|
||||
send_apply_message
|
||||
Rails.logger.info("###### Project refuse_transfer_service end ######")
|
||||
|
||||
return @applied_transfer_project
|
||||
end
|
||||
|
||||
private
|
||||
def validate!
|
||||
raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
|
||||
end
|
||||
|
||||
def update_apply
|
||||
@applied_transfer_project.update!(status: 'refused')
|
||||
end
|
||||
|
||||
def send_apply_message
|
||||
SendTransferProjectAppliedMessageJob.perform_now(@applied_transfer_project, @user, 'failure')
|
||||
end
|
||||
end
|
|
@ -0,0 +1,5 @@
|
|||
json.id organization.id
|
||||
json.name organization.login
|
||||
json.nickname organization.nickname.blank? ? organization.name : organization.nickname
|
||||
json.description organization.description
|
||||
json.avatar_url url_to_avatar(organization)
|
|
@ -0,0 +1,21 @@
|
|||
project = object.project
|
||||
json.project do
|
||||
json.id project.id
|
||||
json.identifier project.identifier
|
||||
json.name project.name
|
||||
json.description project.description
|
||||
json.is_public project.is_public
|
||||
json.owner do
|
||||
json.partial! "/users/user_simple", locals: {user: project.owner}
|
||||
end
|
||||
end
|
||||
json.user do
|
||||
json.partial! "/users/user_simple", locals: {user: object.user}
|
||||
end
|
||||
json.owner do
|
||||
json.partial! "/users/user_simple", locals: {user: object.owner}
|
||||
end
|
||||
json.id object.id
|
||||
json.status object.status
|
||||
json.created_at format_time(object.created_at)
|
||||
json.time_ago time_from_now(object.created_at)
|
|
@ -0,0 +1 @@
|
|||
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}
|
|
@ -0,0 +1 @@
|
|||
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}
|
|
@ -0,0 +1,4 @@
|
|||
json.total_count @organizations.size
|
||||
json.organizations @organizations do |org|
|
||||
json.partial! "/organizations/organizations/simple", locals: {organization: org}
|
||||
end
|
|
@ -7,4 +7,6 @@ json.project_language_id @project.project_language_id
|
|||
json.private !@project.is_public
|
||||
json.website @project.website
|
||||
json.project_units @project.project_units.pluck(:unit_type)
|
||||
json.lesson_url @project.lesson_url
|
||||
json.lesson_url @project.lesson_url
|
||||
json.permission render_permission(current_user, @project)
|
||||
json.is_transfering @project.is_transfering
|
|
@ -1,4 +1,5 @@
|
|||
json.id user.id
|
||||
json.type user.type
|
||||
json.name user.real_name
|
||||
json.login user.login
|
||||
json.image_url url_to_avatar(user)
|
|
@ -0,0 +1,25 @@
|
|||
project = object.project
|
||||
json.project do
|
||||
json.id project.id
|
||||
json.identifier project.identifier
|
||||
json.name project.name
|
||||
json.description project.description
|
||||
json.is_public project.is_public
|
||||
json.owner do
|
||||
json.partial! "/users/user_simple", locals: {user: project.owner}
|
||||
end
|
||||
end
|
||||
json.user do
|
||||
json.partial! "/users/user_simple", locals: {user: object.user}
|
||||
end
|
||||
json.applied do
|
||||
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: object.applied}
|
||||
end
|
||||
json.applied_user do
|
||||
json.partial! "/users/user_simple", locals: {user: object.applied_user}
|
||||
end
|
||||
json.name object.name
|
||||
json.viewed object.viewed
|
||||
json.status object.status
|
||||
json.created_at format_time(object.created_at)
|
||||
json.time_ago time_from_now(object.created_at)
|
|
@ -0,0 +1,4 @@
|
|||
json.total_count @applied_messages.total_count
|
||||
json.applied_messages @applied_messages do |message|
|
||||
json.partial! "/users/applied_messages/detail", locals: {object: message}
|
||||
end
|
|
@ -0,0 +1 @@
|
|||
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}
|
|
@ -0,0 +1,4 @@
|
|||
json.total_count @applied_transfer_projects.total_count
|
||||
json.applied_transfer_projects @applied_transfer_projects do |apply|
|
||||
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: apply}
|
||||
end
|
|
@ -0,0 +1 @@
|
|||
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}
|
|
@ -257,6 +257,13 @@ Rails.application.routes.draw do
|
|||
end
|
||||
|
||||
scope module: :users do
|
||||
resources :applied_messages, only: [:index]
|
||||
resources :applied_transfer_projects, only: [:index] do
|
||||
member do
|
||||
post :accept
|
||||
post :refuse
|
||||
end
|
||||
end
|
||||
resources :organizations, only: [:index]
|
||||
# resources :projects, only: [:index]
|
||||
# resources :subjects, only: [:index]
|
||||
|
@ -532,6 +539,12 @@ Rails.application.routes.draw do
|
|||
scope module: :projects do
|
||||
resources :teams, only: [:index, :create, :destroy]
|
||||
resources :project_units, only: [:index, :create]
|
||||
resources :applied_transfer_projects, only: [:create] do
|
||||
collection do
|
||||
get :organizations
|
||||
post :cancel
|
||||
end
|
||||
end
|
||||
scope do
|
||||
get(
|
||||
'/blob/*id/diff',
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
class CreateAppliedTransferProjects < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
create_table :applied_transfer_projects do |t|
|
||||
t.references :project
|
||||
t.references :owner
|
||||
t.references :user
|
||||
t.integer :status, default: 0
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue