Namespace and rename ServicePushDataValidations

https://gitlab.com/gitlab-org/gitlab/-/issues/330670#note_575341780

app/models/concerns/integrations/push_data_validations.rb

+# frozen_string_literal: true
+
+# This concern is used by registered integrations such as Integrations::TeamCity and
+# Integrations::DroneCi and adds methods to perform validations on the received
+# data.
+module Integrations
+  module PushDataValidations
+    extend ActiveSupport::Concern
+
+    def merge_request_valid?(data)
+      data.dig(:object_attributes, :state) == 'opened' && merge_request_unchecked?(data)
+    end
+
+    def push_valid?(data)
+      data[:total_commits_count] > 0 &&
+        !branch_removed?(data) &&
+        # prefer merge request trigger over push to avoid double builds
+        !opened_merge_requests?(data)
+    end
+
+    def tag_push_valid?(data)
+      data[:total_commits_count] > 0 && !branch_removed?(data)
+    end
+
+    private
+
+    def branch_removed?(data)
+      Gitlab::Git.blank_ref?(data[:after])
+    end
+
+    def opened_merge_requests?(data)
+      project.merge_requests
+        .opened
+        .from_project(project)
+        .from_source_branches(Gitlab::Git.ref_name(data[:ref]))
+        .exists?
+    end
+
+    def merge_request_unchecked?(data)
+      MergeRequest.state_machines[:merge_status]
+        .check_state?(data.dig(:object_attributes, :merge_status))
+    end
+  end
+end

app/models/concerns/service_push_data_validations.rb

-# frozen_string_literal: true
-
-# This concern is used by registered integrations such as Integrations::TeamCity and
-# Integrations::DroneCi and adds methods to perform validations on the received
-# data.
-
-module ServicePushDataValidations
-  extend ActiveSupport::Concern
-
-  def merge_request_valid?(data)
-    data.dig(:object_attributes, :state) == 'opened' && merge_request_unchecked?(data)
-  end
-
-  def push_valid?(data)
-    data[:total_commits_count] > 0 &&
-      !branch_removed?(data) &&
-      # prefer merge request trigger over push to avoid double builds
-      !opened_merge_requests?(data)
-  end
-
-  def tag_push_valid?(data)
-    data[:total_commits_count] > 0 && !branch_removed?(data)
-  end
-
-  private
-
-  def branch_removed?(data)
-    Gitlab::Git.blank_ref?(data[:after])
-  end
-
-  def opened_merge_requests?(data)
-    project.merge_requests
-      .opened
-      .from_project(project)
-      .from_source_branches(Gitlab::Git.ref_name(data[:ref]))
-      .exists?
-  end
-
-  def merge_request_unchecked?(data)
-    MergeRequest.state_machines[:merge_status]
-      .check_state?(data.dig(:object_attributes, :merge_status))
-  end
-end

app/models/integrations/drone_ci.rb

@@ -3,8 +3,8 @@
 module Integrations
   class DroneCi < BaseCi
     include HasWebHook
+    include PushDataValidations
     include ReactivelyCached
-    include ServicePushDataValidations
     extend Gitlab::Utils::Override
 
     prop_accessor :drone_url, :token

app/models/integrations/teamcity.rb

@@ -2,8 +2,8 @@
 
 module Integrations
   class Teamcity < BaseCi
+    include PushDataValidations
     include ReactivelyCached
-    include ServicePushDataValidations
 
     prop_accessor :teamcity_url, :build_type, :username, :password