Merge branch 'refactoring-ee-entities-13' into 'master'

Separate user, entity and project modules into own files

See merge request gitlab-org/gitlab!27771

ee/changelogs/unreleased/refactoring-ee-entities-13.yml

+---
+title: Separate user, project and entity helper modules into own class files
+merge_request: 27771
+author: Rajendra Kadam
+type: added

ee/lib/ee/api/entities.rb

@@ -3,56 +3,6 @@
 module EE
   module API
     module Entities
-      module EntityHelpers
-        def can_read(attr, &block)
-          ->(obj, opts) { Ability.allowed?(opts[:user], "read_#{attr}".to_sym, yield(obj)) }
-        end
-
-        def can_destroy(attr, &block)
-          ->(obj, opts) { Ability.allowed?(opts[:user], "destroy_#{attr}".to_sym, yield(obj)) }
-        end
-
-        def expose_restricted(attr, &block)
-          expose attr, if: can_read(attr, &block)
-        end
-      end
-
-      module UserPublic
-        extend ActiveSupport::Concern
-
-        prepended do
-          expose :shared_runners_minutes_limit
-          expose :extra_shared_runners_minutes_limit
-        end
-      end
-
-      module UserWithAdmin
-        extend ActiveSupport::Concern
-
-        prepended do
-          expose :note
-        end
-      end
-
-      module Project
-        extend ActiveSupport::Concern
-
-        prepended do
-          expose :approvals_before_merge, if: ->(project, _) { project.feature_available?(:merge_request_approvers) }
-          expose :mirror, if: ->(project, _) { project.feature_available?(:repository_mirrors) }
-          expose :mirror_user_id, if: ->(project, _) { project.mirror? }
-          expose :mirror_trigger_builds, if: ->(project, _) { project.mirror? }
-          expose :only_mirror_protected_branches, if: ->(project, _) { project.mirror? }
-          expose :mirror_overwrites_diverged_branches, if: ->(project, _) { project.mirror? }
-          expose :external_authorization_classification_label,
-                 if: ->(_, _) { License.feature_available?(:external_authorization_service_api_management) }
-          expose :packages_enabled, if: ->(project, _) { project.feature_available?(:packages) }
-          expose :service_desk_enabled, if: ->(project, _) { project.feature_available?(:service_desk) }
-          expose :service_desk_address, if: ->(project, _) { project.feature_available?(:service_desk) }
-          expose :marked_for_deletion_at, if: ->(project, _) { project.feature_available?(:adjourned_deletion_for_projects_and_groups) }
-        end
-      end
-
       module Group
         extend ActiveSupport::Concern
 

ee/lib/ee/api/entities/entity_helpers.rb

+# frozen_string_literal: true
+
+module EE
+  module API
+    module Entities
+      module EntityHelpers
+        def can_read(attr, &block)
+          ->(obj, opts) { Ability.allowed?(opts[:user], "read_#{attr}".to_sym, yield(obj)) }
+        end
+
+        def can_destroy(attr, &block)
+          ->(obj, opts) { Ability.allowed?(opts[:user], "destroy_#{attr}".to_sym, yield(obj)) }
+        end
+
+        def expose_restricted(attr, &block)
+          expose attr, if: can_read(attr, &block)
+        end
+      end
+    end
+  end
+end

ee/lib/ee/api/entities/project.rb

+# frozen_string_literal: true
+
+module EE
+  module API
+    module Entities
+      module Project
+        extend ActiveSupport::Concern
+
+        prepended do
+          expose :approvals_before_merge, if: ->(project, _) { project.feature_available?(:merge_request_approvers) }
+          expose :mirror, if: ->(project, _) { project.feature_available?(:repository_mirrors) }
+          expose :mirror_user_id, if: ->(project, _) { project.mirror? }
+          expose :mirror_trigger_builds, if: ->(project, _) { project.mirror? }
+          expose :only_mirror_protected_branches, if: ->(project, _) { project.mirror? }
+          expose :mirror_overwrites_diverged_branches, if: ->(project, _) { project.mirror? }
+          expose :external_authorization_classification_label,
+                 if: ->(_, _) { License.feature_available?(:external_authorization_service_api_management) }
+          expose :packages_enabled, if: ->(project, _) { project.feature_available?(:packages) }
+          expose :service_desk_enabled, if: ->(project, _) { project.feature_available?(:service_desk) }
+          expose :service_desk_address, if: ->(project, _) { project.feature_available?(:service_desk) }
+          expose :marked_for_deletion_at, if: ->(project, _) { project.feature_available?(:adjourned_deletion_for_projects_and_groups) }
+        end
+      end
+    end
+  end
+end

ee/lib/ee/api/entities/user_public.rb

+# frozen_string_literal: true
+
+module EE
+  module API
+    module Entities
+      module UserPublic
+        extend ActiveSupport::Concern
+
+        prepended do
+          expose :shared_runners_minutes_limit
+          expose :extra_shared_runners_minutes_limit
+        end
+      end
+    end
+  end
+end

ee/lib/ee/api/entities/user_with_admin.rb

+# frozen_string_literal: true
+
+module EE
+  module API
+    module Entities
+      module UserWithAdmin
+        extend ActiveSupport::Concern
+
+        prepended do
+          expose :note
+        end
+      end
+    end
+  end
+end