Abstracts ProjectMoved and ProjectCreated into a BaseProject

3 files changed, 58 insertions, 65 deletions

diff --git a/lib/gitlab/checks/base_project.rb b/lib/gitlab/checks/base_project.rb
new file mode 100644
index 00000000000..dd6c007b356
--- /dev/null
+++ b/lib/gitlab/checks/base_project.rb
@@ -0,0 +1,46 @@
+module Gitlab
+  module Checks
+    class BaseProject
+      def initialize(project, user, protocol)
+        @project = project
+        @user = user
+        @protocol = protocol
+      end
+
+      def self.fetch_message(user_id, project_id)
+        key = message_key(user_id, project_id)
+
+        Gitlab::Redis::SharedState.with do |redis|
+          message = redis.get(key)
+          redis.del(key)
+          message
+        end
+      end
+
+      def add_message
+        return unless user.present? && project.present?
+
+        Gitlab::Redis::SharedState.with do |redis|
+          key = self.class.message_key(user.id, project.id)
+          redis.setex(key, 5.minutes, message)
+        end
+      end
+
+      def message
+        raise NotImplementedError
+      end
+
+      protected
+
+      attr_reader :project, :user, :protocol
+
+      def self.message_key(user_id, project_id)
+        raise NotImplementedError
+      end
+
+      def url_to_repo
+        protocol == 'ssh' ? project.ssh_url_to_repo : project.http_url_to_repo
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/checks/project_created.rb b/lib/gitlab/checks/project_created.rb
index f05e8b4a7e8..bd1e204bc81 100644
--- a/lib/gitlab/checks/project_created.rb
+++ b/lib/gitlab/checks/project_created.rb
@@ -1,40 +1,15 @@
 module Gitlab
   module Checks
-    class ProjectCreated
+    class ProjectCreated < BaseProject
       PROJECT_CREATED = "project_created".freeze
 
-      def initialize(user, project, protocol)
-        @user = user
-        @project = project
-        @protocol = protocol
-      end
-
-      def self.fetch_project_created_message(user_id, project_id)
-        project_created_key = project_created_message_key(user_id, project_id)
-
-        Gitlab::Redis::SharedState.with do |redis|
-          message = redis.get(project_created_key)
-          redis.del(project_created_key)
-          message
-        end
-      end
-
-      def add_project_created_message
-        return unless user.present? && project.present?
-
-        Gitlab::Redis::SharedState.with do |redis|
-          key = self.class.project_created_message_key(user.id, project.id)
-          redis.setex(key, 5.minutes, project_created_message)
-        end
-      end
-
-      def project_created_message
+      def message
         <<~MESSAGE.strip_heredoc
 
         The private project #{project.full_path} was created.
 
         To configure the remote, run:
-          git remote add origin #{git_url}
+          git remote add origin #{url_to_repo}
 
         To view the project, visit:
           #{project_url}
@@ -44,19 +19,13 @@ module Gitlab
 
       private
 
-      attr_reader :project, :user, :protocol
-
-      def self.project_created_message_key(user_id, project_id)
+      def self.message_key(user_id, project_id)
         "#{PROJECT_CREATED}:#{user_id}:#{project_id}"
       end
 
       def project_url
         Gitlab::Routing.url_helpers.project_url(project)
       end
-
-      def git_url
-        protocol == 'ssh' ? project.ssh_url_to_repo : project.http_url_to_repo
-      end
     end
   end
 end
diff --git a/lib/gitlab/checks/project_moved.rb b/lib/gitlab/checks/project_moved.rb
index dfb2f4d4054..eca59e88e24 100644
--- a/lib/gitlab/checks/project_moved.rb
+++ b/lib/gitlab/checks/project_moved.rb
@@ -1,37 +1,15 @@
 module Gitlab
   module Checks
-    class ProjectMoved
+    class ProjectMoved < BaseProject
       REDIRECT_NAMESPACE = "redirect_namespace".freeze
 
-      def initialize(project, user, redirected_path, protocol)
-        @project = project
-        @user = user
+      def initialize(project, user, protocol, redirected_path)
         @redirected_path = redirected_path
-        @protocol = protocol
-      end
-
-      def self.fetch_redirect_message(user_id, project_id)
-        redirect_key = redirect_message_key(user_id, project_id)
 
-        Gitlab::Redis::SharedState.with do |redis|
-          message = redis.get(redirect_key)
-          redis.del(redirect_key)
-          message
-        end
-      end
-
-      def add_redirect_message
-        # Don't bother with sending a redirect message for anonymous clones
-        # because they never see it via the `/internal/post_receive` endpoint
-        return unless user.present? && project.present?
-
-        Gitlab::Redis::SharedState.with do |redis|
-          key = self.class.redirect_message_key(user.id, project.id)
-          redis.setex(key, 5.minutes, redirect_message)
-        end
+        super(project, user, protocol)
       end
 
-      def redirect_message(rejected: false)
+      def message(rejected: false)
         <<~MESSAGE.strip_heredoc
         Project '#{redirected_path}' was moved to '#{project.full_path}'.
 
@@ -47,17 +25,17 @@ module Gitlab
 
       private
 
-      attr_reader :project, :redirected_path, :protocol, :user
+      attr_reader :redirected_path
 
-      def self.redirect_message_key(user_id, project_id)
+      def self.message_key(user_id, project_id)
         "#{REDIRECT_NAMESPACE}:#{user_id}:#{project_id}"
       end
 
       def remote_url_message(rejected)
         if rejected
-          "git remote set-url origin #{url} and try again."
+          "git remote set-url origin #{url_to_repo} and try again."
         else
-          "git remote set-url origin #{url}"
+          "git remote set-url origin #{url_to_repo}"
         end
       end