diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-02-26 20:26:26 +0300 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-03-13 15:33:35 +0300 |
commit | 7d5ee4181a63318dd3a981fef9c12ce93e732fdb (patch) | |
tree | fb2c05c6beee188c1cf73112d7e4f502e3c87d98 | |
parent | f06a649ced952bcc439a5b3d36d96df178aabd66 (diff) |
Refactor groups and projects boards actions
Move common functionality to BoardsActions concern
-rw-r--r-- | app/controllers/concerns/boards_actions.rb | 54 | ||||
-rw-r--r-- | app/controllers/groups/boards_controller.rb | 39 | ||||
-rw-r--r-- | app/controllers/projects/boards_controller.rb | 39 | ||||
-rw-r--r-- | spec/controllers/groups/boards_controller_spec.rb | 4 | ||||
-rw-r--r-- | spec/controllers/projects/boards_controller_spec.rb | 4 |
5 files changed, 58 insertions, 82 deletions
diff --git a/app/controllers/concerns/boards_actions.rb b/app/controllers/concerns/boards_actions.rb new file mode 100644 index 00000000000..2cf0ba7c086 --- /dev/null +++ b/app/controllers/concerns/boards_actions.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: true + +module BoardsActions + include Gitlab::Utils::StrongMemoize + extend ActiveSupport::Concern + + included do + include BoardsResponses + + before_action :redirect_to_recent_board, only: :index + before_action :boards, only: :index + before_action :board, only: :show + end + + def index + respond_with_boards + end + + def show + # Add / update the board in the recent visits table + Boards::Visits::CreateService.new(parent, current_user).execute(board) if request.format.html? + + respond_with_board + end + + private + + def redirect_to_recent_board + return if request.format.json? + + if recently_visited = Boards::Visits::LatestService.new(board_parent, current_user).execute + board_path = case board_parent + when Project + namespace_project_board_path(id: recently_visited.board_id) + when Group + group_board_path(id: recently_visited.board_id) + end + + redirect_to board_path + end + end + + def boards + strong_memoize(:boards) do + Boards::ListService.new(parent, current_user).execute + end + end + + def board + strong_memoize(:board) do + boards.find(params[:id]) + end + end +end diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb index 51fdb6c05fb..40b8d5ed72c 100644 --- a/app/controllers/groups/boards_controller.rb +++ b/app/controllers/groups/boards_controller.rb @@ -1,53 +1,16 @@ # frozen_string_literal: true class Groups::BoardsController < Groups::ApplicationController - include BoardsResponses + include BoardsActions include RecordUserLastActivity before_action :assign_endpoint_vars - before_action :boards, only: :index - before_action :redirect_to_recent_board, only: :index - - def index - respond_with_boards - end - - def show - @board = boards.find(params[:id]) - - # add/update the board in the recent visited table - Boards::Visits::CreateService.new(@board.group, current_user).execute(@board) if request.format.html? - - respond_with_board - end private - def boards - @boards ||= Boards::ListService.new(group, current_user).execute - end - def assign_endpoint_vars @boards_endpoint = group_boards_url(group) @namespace_path = group.to_param @labels_endpoint = group_labels_url(group) end - - def serialize_as_json(resource) - resource.as_json(only: [:id]) - end - - def includes_board?(board_id) - boards.any? { |board| board.id == board_id } - end - - def redirect_to_recent_board - return if request.format.json? - - recently_visited = Boards::Visits::LatestService.new(group, current_user).execute - - if recently_visited && includes_board?(recently_visited.board_id) - redirect_to(group_board_path(id: recently_visited.board_id), status: :found) - end - end end diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb index 8189b5d182a..95897aaf980 100644 --- a/app/controllers/projects/boards_controller.rb +++ b/app/controllers/projects/boards_controller.rb @@ -1,34 +1,15 @@ # frozen_string_literal: true class Projects::BoardsController < Projects::ApplicationController - include BoardsResponses + include BoardsActions include IssuableCollections before_action :check_issues_available! before_action :authorize_read_board!, only: [:index, :show] - before_action :boards, only: :index before_action :assign_endpoint_vars - before_action :redirect_to_recent_board, only: :index - - def index - respond_with_boards - end - - def show - @board = boards.find(params[:id]) - - # add/update the board in the recent visited table - Boards::Visits::CreateService.new(@board.project, current_user).execute(@board) if request.format.html? - - respond_with_board - end private - def boards - @boards ||= Boards::ListService.new(project, current_user).execute - end - def assign_endpoint_vars @boards_endpoint = project_boards_path(project) @bulk_issues_path = bulk_update_project_issues_path(project) @@ -39,22 +20,4 @@ class Projects::BoardsController < Projects::ApplicationController def authorize_read_board! access_denied! unless can?(current_user, :read_board, project) end - - def serialize_as_json(resource) - resource.as_json(only: [:id]) - end - - def includes_board?(board_id) - boards.any? { |board| board.id == board_id } - end - - def redirect_to_recent_board - return if request.format.json? - - recently_visited = Boards::Visits::LatestService.new(project, current_user).execute - - if recently_visited && includes_board?(recently_visited.board_id) - redirect_to(namespace_project_board_path(id: recently_visited.board_id), status: :found) - end - end end diff --git a/spec/controllers/groups/boards_controller_spec.rb b/spec/controllers/groups/boards_controller_spec.rb index 4228e727b52..2f4a00561ac 100644 --- a/spec/controllers/groups/boards_controller_spec.rb +++ b/spec/controllers/groups/boards_controller_spec.rb @@ -33,11 +33,9 @@ describe Groups::BoardsController do it 'renders template if visited board is not found' do temporary_board = create(:board, group: group) - visited = create(:board_group_recent_visit, group: temporary_board.group, board: temporary_board, user: user) + create(:board_group_recent_visit, group: temporary_board.group, board: temporary_board, user: user) temporary_board.delete - allow_any_instance_of(Boards::Visits::LatestService).to receive(:execute).and_return(visited) - list_boards expect(response).to render_template :index diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb index 09199067024..3cf948498b7 100644 --- a/spec/controllers/projects/boards_controller_spec.rb +++ b/spec/controllers/projects/boards_controller_spec.rb @@ -39,11 +39,9 @@ describe Projects::BoardsController do it 'renders template if visited board is not found' do temporary_board = create(:board, project: project) - visited = create(:board_project_recent_visit, project: temporary_board.project, board: temporary_board, user: user) + create(:board_project_recent_visit, project: temporary_board.project, board: temporary_board, user: user) temporary_board.delete - allow_any_instance_of(Boards::Visits::LatestService).to receive(:execute).and_return(visited) - list_boards expect(response).to render_template :index |