Factorize #request_access and #approve_access_request into a new AccessRequestActions controller concern

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/controllers/concerns/access_request_actions.rb

@@ -0,0 +1,38 @@
+module AccessRequestActions
+  extend ActiveSupport::Concern
+
+  def request_access
+    access_requestable_resource.request_access(current_user)
+
+    redirect_to access_requestable_resource_path,
+                notice: 'Your request for access has been queued for review.'
+  end
+
+  def approve
+    @member = access_requestable_resource.public_send(member_entity_name.pluralize).request.find(params[:id])
+
+    return render_403 unless can?(current_user, :"update_#{member_entity_name}", @member)
+
+    @member.accept_request
+
+    redirect_to access_requestable_resource_members_path
+  end
+
+  protected
+
+  def access_requestable_resource
+    raise NotImplementedError
+  end
+
+  def access_requestable_resource_path
+    access_requestable_resource
+  end
+
+  def access_requestable_resource_members_path
+    [access_requestable_resource, 'members']
+  end
+
+  def member_entity_name
+    "#{access_requestable_resource.class.to_s.underscore}_member"
+  end
+end

app/controllers/groups/group_members_controller.rb

@@ -1,4 +1,6 @@
 class Groups::GroupMembersController < Groups::ApplicationController
+  include AccessRequestActions
+
   # Authorize
   before_action :authorize_admin_group_member!, except: [:index, :leave, :request_access]
 
@@ -82,25 +84,22 @@ class Groups::GroupMembersController < Groups::ApplicationController
     end
   end
 
-  def request_access
-    @group.request_access(current_user)
-
-    redirect_to group_path(@group), notice: 'Your request for access has been queued for review.'
-  end
-
-  def approve
-    @group_member = @group.group_members.request.find(params[:id])
-
-    return render_403 unless can?(current_user, :update_group_member, @group_member)
-
-    @group_member.accept_request
-
-    redirect_to group_group_members_path(@group)
-  end
-
   protected
 
   def member_params
     params.require(:group_member).permit(:access_level, :user_id)
   end
+
+  # AccessRequestActions concern
+  def access_requestable_resource
+    @group
+  end
+
+  def access_requestable_resource_path
+    group_path(@group)
+  end
+
+  def access_requestable_resource_members_path
+    group_group_members_path(@group)
+  end
 end

app/controllers/projects/project_members_controller.rb

@@ -1,4 +1,6 @@
 class Projects::ProjectMembersController < Projects::ApplicationController
+  include AccessRequestActions
+
   # Authorize
   before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
 
@@ -99,23 +101,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     end
   end
 
-  def request_access
-    @project.request_access(current_user)
-
-    redirect_to namespace_project_path(@project.namespace, @project),
-                notice: 'Your request for access has been queued for review.'
-  end
-
-  def approve
-    @project_member = @project.project_members.request.find(params[:id])
-
-    return render_403 unless can?(current_user, :update_project_member, @project_member)
-
-    @project_member.accept_request
-
-    redirect_to namespace_project_project_members_path(@project.namespace, @project)
-  end
-
   def apply_import
     source_project = Project.find(params[:source_project_id])
 
@@ -135,4 +120,17 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   def member_params
     params.require(:project_member).permit(:user_id, :access_level)
   end
+
+  # AccessRequestActions concern
+  def access_requestable_resource
+    @project
+  end
+
+  def access_requestable_resource_path
+    namespace_project_path(@project.namespace, @project)
+  end
+
+  def access_requestable_resource_members_path
+    namespace_project_project_members_path(@project.namespace, @project)
+  end
 end

config/routes.rb

@@ -30,6 +30,11 @@ Rails.application.routes.draw do
     mount LetterOpenerWeb::Engine, at: '/rails/letter_opener'
   end
 
+  concern :access_requestable do
+    post :request_access, on: :collection
+    post :approve_access_request_access_request, on: :member
+  end
+
   namespace :ci do
     # CI API
     Ci::API::API.logger Rails.logger

spec/controllers/groups/group_members_controller_spec.rb

@@ -165,7 +165,7 @@ describe Groups::GroupMembersController do
 
     context 'when member is not found' do
       it 'returns 403' do
-        post :approve, group_id: group,
+        post :approve_access_request, group_id: group,
                        id: 42
 
         expect(response.status).to eq(403)
@@ -187,7 +187,7 @@ describe Groups::GroupMembersController do
         end
 
         it 'returns 403' do
-          post :approve, group_id: group,
+          post :approve_access_request, group_id: group,
                          id: member
 
           expect(response.status).to eq(403)
@@ -202,7 +202,7 @@ describe Groups::GroupMembersController do
         end
 
         it 'adds user to members' do
-          post :approve, group_id: group,
+          post :approve_access_request, group_id: group,
                          id: member
 
           expect(response).to redirect_to(group_group_members_path(group))

spec/controllers/projects/project_members_controller_spec.rb

@@ -224,7 +224,7 @@ describe Projects::ProjectMembersController do
 
     context 'when member is not found' do
       it 'returns 404' do
-        post :approve, namespace_id: project.namespace,
+        post :approve_access_request, namespace_id: project.namespace,
                        project_id: project,
                        id: 42
 
@@ -247,7 +247,7 @@ describe Projects::ProjectMembersController do
         end
 
         it 'returns 404' do
-          post :approve, namespace_id: project.namespace,
+          post :approve_access_request, namespace_id: project.namespace,
                          project_id: project,
                          id: member
 
@@ -263,7 +263,7 @@ describe Projects::ProjectMembersController do
         end
 
         it 'adds user to members' do
-          post :approve, namespace_id: project.namespace,
+          post :approve_access_request, namespace_id: project.namespace,
                          project_id: project,
                          id: member