Reduce remaining diff with EE in app/services

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

2 files changed, 16 insertions, 16 deletions

diff --git a/app/services/protected_branches/api_service.rb b/app/services/protected_branches/api_service.rb
index 9b85e13107b..1b13dace5f2 100644
--- a/app/services/protected_branches/api_service.rb
+++ b/app/services/protected_branches/api_service.rb
@@ -3,16 +3,15 @@
 module ProtectedBranches
   class ApiService < BaseService
     def create
-      @push_params = AccessLevelParams.new(:push, params)
-      @merge_params = AccessLevelParams.new(:merge, params)
+      ::ProtectedBranches::CreateService.new(@project, @current_user, protected_branch_params).execute
+    end
 
-      protected_branch_params = {
+    def protected_branch_params
+      {
         name: params[:name],
-        push_access_levels_attributes: @push_params.access_levels,
-        merge_access_levels_attributes: @merge_params.access_levels
+        push_access_levels_attributes: AccessLevelParams.new(:push, params).access_levels,
+        merge_access_levels_attributes: AccessLevelParams.new(:merge, params).access_levels
       }
-
-      ::ProtectedBranches::CreateService.new(@project, @current_user, protected_branch_params).execute
     end
   end
 end
diff --git a/app/services/protected_branches/legacy_api_update_service.rb b/app/services/protected_branches/legacy_api_update_service.rb
index da8bf2ce02a..7cb8d41818f 100644
--- a/app/services/protected_branches/legacy_api_update_service.rb
+++ b/app/services/protected_branches/legacy_api_update_service.rb
@@ -6,30 +6,31 @@
 # lives in this service.
 module ProtectedBranches
   class LegacyApiUpdateService < BaseService
+    attr_reader :protected_branch, :developers_can_push, :developers_can_merge
+
     def execute(protected_branch)
+      @protected_branch = protected_branch
       @developers_can_push = params.delete(:developers_can_push)
       @developers_can_merge = params.delete(:developers_can_merge)
 
-      @protected_branch = protected_branch
-
       protected_branch.transaction do
         delete_redundant_access_levels
 
-        case @developers_can_push
+        case developers_can_push
         when true
           params[:push_access_levels_attributes] = [{ access_level: Gitlab::Access::DEVELOPER }]
         when false
           params[:push_access_levels_attributes] = [{ access_level: Gitlab::Access::MAINTAINER }]
         end
 
-        case @developers_can_merge
+        case developers_can_merge
         when true
           params[:merge_access_levels_attributes] = [{ access_level: Gitlab::Access::DEVELOPER }]
         when false
           params[:merge_access_levels_attributes] = [{ access_level: Gitlab::Access::MAINTAINER }]
         end
 
-        service = ProtectedBranches::UpdateService.new(@project, @current_user, @params)
+        service = ProtectedBranches::UpdateService.new(project, current_user, params)
         service.execute(protected_branch)
       end
     end
@@ -37,12 +38,12 @@ module ProtectedBranches
     private
 
     def delete_redundant_access_levels
-      unless @developers_can_merge.nil?
-        @protected_branch.merge_access_levels.destroy_all # rubocop: disable DestroyAll
+      unless developers_can_merge.nil?
+        protected_branch.merge_access_levels.destroy_all # rubocop: disable DestroyAll
       end
 
-      unless @developers_can_push.nil?
-        @protected_branch.push_access_levels.destroy_all # rubocop: disable DestroyAll
+      unless developers_can_push.nil?
+        protected_branch.push_access_levels.destroy_all # rubocop: disable DestroyAll
       end
     end
   end