Move tag services to `Tags` namespace

CreateTagService and DeleteTagService where in root namespace, by
following service code organization I moved them in Tags::CreateService
and Tags::DestroyService

9 files changed, 86 insertions, 78 deletions

diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index e2d9d5ed460..33379659d73 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -27,7 +27,7 @@ class Projects::TagsController < Projects::ApplicationController
   end
 
   def create
-    result = CreateTagService.new(@project, current_user).
+    result = Tags::CreateService.new(@project, current_user).
       execute(params[:tag_name], params[:ref], params[:message], params[:release_description])
 
     if result[:status] == :success
@@ -41,7 +41,7 @@ class Projects::TagsController < Projects::ApplicationController
   end
 
   def destroy
-    DeleteTagService.new(project, current_user).execute(params[:id])
+    Tags::DestroyService.new(project, current_user).execute(params[:id])
 
     respond_to do |format|
       format.html do
diff --git a/app/services/create_tag_service.rb b/app/services/create_tag_service.rb
deleted file mode 100644
index 6c75d1f04ff..00000000000
--- a/app/services/create_tag_service.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class CreateTagService < BaseService
-  def execute(tag_name, target, message, release_description = nil)
-    valid_tag = Gitlab::GitRefValidator.validate(tag_name)
-    return error('Tag name invalid') unless valid_tag
-
-    repository = project.repository
-    message&.strip!
-
-    new_tag = nil
-
-    begin
-      new_tag = repository.add_tag(current_user, tag_name, target, message)
-    rescue Rugged::TagError
-      return error("Tag #{tag_name} already exists")
-    rescue GitHooksService::PreReceiveError => ex
-      return error(ex.message)
-    end
-
-    if new_tag
-      if release_description
-        CreateReleaseService.new(@project, @current_user).
-          execute(tag_name, release_description)
-      end
-      
-      success.merge(tag: new_tag)
-    else
-      error("Target #{target} is invalid")
-    end
-  end
-end
diff --git a/app/services/delete_tag_service.rb b/app/services/delete_tag_service.rb
deleted file mode 100644
index eb726cb04b1..00000000000
--- a/app/services/delete_tag_service.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-class DeleteTagService < BaseService
-  def execute(tag_name)
-    repository = project.repository
-    tag = repository.find_tag(tag_name)
-
-    unless tag
-      return error('No such tag', 404)
-    end
-
-    if repository.rm_tag(current_user, tag_name)
-      release = project.releases.find_by(tag: tag_name)
-      release&.destroy
-
-      push_data = build_push_data(tag)
-      EventCreateService.new.push(project, current_user, push_data)
-      project.execute_hooks(push_data.dup, :tag_push_hooks)
-      project.execute_services(push_data.dup, :tag_push_hooks)
-
-      success('Tag was removed')
-    else
-      error('Failed to remove tag')
-    end
-  end
-
-  def error(message, return_code = 400)
-    super(message).merge(return_code: return_code)
-  end
-
-  def success(message)
-    super().merge(message: message)
-  end
-
-  def build_push_data(tag)
-    Gitlab::DataBuilder::Push.build(
-      project,
-      current_user,
-      tag.dereferenced_target.sha,
-      Gitlab::Git::BLANK_SHA,
-      "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}",
-      [])
-  end
-end
diff --git a/app/services/tags/create_service.rb b/app/services/tags/create_service.rb
new file mode 100644
index 00000000000..1756da9e519
--- /dev/null
+++ b/app/services/tags/create_service.rb
@@ -0,0 +1,32 @@
+module Tags
+  class CreateService < BaseService
+    def execute(tag_name, target, message, release_description = nil)
+      valid_tag = Gitlab::GitRefValidator.validate(tag_name)
+      return error('Tag name invalid') unless valid_tag
+
+      repository = project.repository
+      message&.strip!
+
+      new_tag = nil
+
+      begin
+        new_tag = repository.add_tag(current_user, tag_name, target, message)
+      rescue Rugged::TagError
+        return error("Tag #{tag_name} already exists")
+      rescue GitHooksService::PreReceiveError => ex
+        return error(ex.message)
+      end
+
+      if new_tag
+        if release_description
+          CreateReleaseService.new(@project, @current_user).
+            execute(tag_name, release_description)
+        end
+
+        success.merge(tag: new_tag)
+      else
+        error("Target #{target} is invalid")
+      end
+    end
+  end
+end
diff --git a/app/services/tags/destroy_service.rb b/app/services/tags/destroy_service.rb
new file mode 100644
index 00000000000..910b4f5e361
--- /dev/null
+++ b/app/services/tags/destroy_service.rb
@@ -0,0 +1,44 @@
+module Tags
+  class DestroyService < BaseService
+    def execute(tag_name)
+      repository = project.repository
+      tag = repository.find_tag(tag_name)
+
+      unless tag
+        return error('No such tag', 404)
+      end
+
+      if repository.rm_tag(current_user, tag_name)
+        release = project.releases.find_by(tag: tag_name)
+        release&.destroy
+
+        push_data = build_push_data(tag)
+        EventCreateService.new.push(project, current_user, push_data)
+        project.execute_hooks(push_data.dup, :tag_push_hooks)
+        project.execute_services(push_data.dup, :tag_push_hooks)
+
+        success('Tag was removed')
+      else
+        error('Failed to remove tag')
+      end
+    end
+
+    def error(message, return_code = 400)
+      super(message).merge(return_code: return_code)
+    end
+
+    def success(message)
+      super().merge(message: message)
+    end
+
+    def build_push_data(tag)
+      Gitlab::DataBuilder::Push.build(
+        project,
+        current_user,
+        tag.dereferenced_target.sha,
+        Gitlab::Git::BLANK_SHA,
+        "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}",
+        [])
+    end
+  end
+end
diff --git a/changelogs/unreleased/move_tags_service_to_namespace.yml b/changelogs/unreleased/move_tags_service_to_namespace.yml
new file mode 100644
index 00000000000..ba76f291162
--- /dev/null
+++ b/changelogs/unreleased/move_tags_service_to_namespace.yml
@@ -0,0 +1,4 @@
+---
+title: Move tag services to Tags namespace
+merge_request:
+author: dixpac
diff --git a/lib/api/tags.rb b/lib/api/tags.rb
index 5b345db3a41..b6fd8f569a9 100644
--- a/lib/api/tags.rb
+++ b/lib/api/tags.rb
@@ -40,7 +40,7 @@ module API
       post ':id/repository/tags' do
         authorize_push_project
 
-        result = CreateTagService.new(user_project, current_user).
+        result = ::Tags::CreateService.new(user_project, current_user).
           execute(params[:tag_name], params[:ref], params[:message], params[:release_description])
 
         if result[:status] == :success
@@ -59,7 +59,7 @@ module API
       delete ":id/repository/tags/:tag_name", requirements: { tag_name: /.+/ } do
         authorize_push_project
 
-        result = DeleteTagService.new(user_project, current_user).
+        result = ::Tags::DestroyService.new(user_project, current_user).
           execute(params[:tag_name])
 
         if result[:status] == :success
diff --git a/spec/services/create_tag_service_spec.rb b/spec/services/tags/create_service_spec.rb
index 7dc43c50b0d..5478b8c9ec0 100644
--- a/spec/services/create_tag_service_spec.rb
+++ b/spec/services/tags/create_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CreateTagService, services: true do
+describe Tags::CreateService, services: true do
   let(:project) { create(:project) }
   let(:repository) { project.repository }
   let(:user) { create(:user) }
diff --git a/spec/services/delete_tag_service_spec.rb b/spec/services/tags/destroy_service_spec.rb
index 477551f5036..a388c93379a 100644
--- a/spec/services/delete_tag_service_spec.rb
+++ b/spec/services/tags/destroy_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DeleteTagService, services: true do
+describe Tags::DestroyService, services: true do
   let(:project) { create(:project) }
   let(:repository) { project.repository }
   let(:user) { create(:user) }