Use file name numbering on kit upload instead of overwriting files with the same name

CHANGELOG

@@ -1,6 +1,7 @@
 [v#.#.#] ([month] [YYYY])
   - [entity]:
     - [future tense verb] [feature]
+  - Kit Import: Use file name sequencing when a template file with the same name exists
   - Upgraded gems:
     - [gem]
   - Bugs fixes:

app/jobs/kit_import_job.rb

@@ -4,6 +4,7 @@ class KitImportJob < ApplicationJob
     'html_export' => ['html.erb'],
     'word' => ['docm', 'docx']
   }
+  TEMPLATE_TYPES = %w{ methodologies notes plugins projects }
 
   queue_as :dradis_upload
 
@@ -17,6 +18,12 @@ def perform(file_or_folder, logger:, user_id: nil)
     @logger = logger
     @project = nil
     @report_templates_dir = Configuration.paths_templates_reports
+    @templates_dirs = TEMPLATE_TYPES.map do |template_type|
+      [
+        template_type,
+        Pathname.new(Configuration.send("paths_templates_#{template_type}"))
+      ]
+    end.to_h
     @working_dir = Dir.mktmpdir
     @word_rtp = nil
 
@@ -42,7 +49,7 @@ def perform(file_or_folder, logger:, user_id: nil)
   end
 
   private
-  attr_reader :current_user, :logger, :report_templates_dir, :working_dir
+  attr_reader :current_user, :logger, :report_templates_dir, :templates_dirs, :working_dir
 
   def assign_project_rtp
     logger.info { 'Assigning RTP to project...' }
@@ -107,8 +114,6 @@ def import_project_package
   end
 
   def import_plugin_templates
-    return unless File.directory?("#{working_dir}/kit/templates/plugins/")
-
     logger.info { 'Copying Plugin Manager templates...' }
     import_templates('plugins')
   end
@@ -175,13 +180,23 @@ def import_rules
   end
 
   def import_templates(template_type)
-    template_directory = "#{working_dir}/kit/templates/#{template_type}"
-    return unless Dir.exist?(template_directory)
+    kit_template_dir = "#{working_dir}/kit/templates/#{template_type}"
+    return unless Dir.exist?(kit_template_dir)
+    template_pwd = templates_dirs[template_type]
 
-    FileUtils.cp_r(
-      "#{template_directory}/.",
-      Configuration.send("paths_templates_#{template_type}")
-    )
+    if template_type == 'plugins'
+      FileUtils.cp_r("#{kit_template_dir}/.", template_pwd)
+    else
+      Dir["#{kit_template_dir}/*"].each do |file|
+        return unless File.file?(file)
+        file_name = NamingService.name_file(
+          original_filename: File.basename(file),
+          pathname: template_pwd
+        )
+
+        FileUtils.cp(file, "#{template_pwd}/#{file_name}")
+      end
+    end
   end
 
   def unzip(file)

spec/jobs/kit_import_job_spec.rb

@@ -76,6 +76,33 @@
       expect(ProjectTemplate.find_template('dradis-template-no-methodologies')).to_not be_nil
     end
 
+    it 'renames project templates if template with same name already exists' do
+      project_template = ProjectTemplate.new(filename: 'dradis-template-welcome')
+      project_template.save
+
+      described_class.new.perform(@tmp_file, logger: Log.new.write('Testing...'))
+
+      expect(ProjectTemplate.find_template('dradis-template-welcome_copy-01')).to_not be_nil
+    end
+
+    it 'renames note templates if template with same name already exists' do
+      note_template = NoteTemplate.new(filename: 'evidence')
+      note_template.save
+
+      described_class.new.perform(@tmp_file, logger: Log.new.write('Testing...'))
+
+      expect(NoteTemplate.find('evidence_copy-01')).to_not be_nil
+    end
+
+    it 'renames methodology templates if template with same name already exists' do
+      methodology = Methodology.new(filename: 'OWASPv4_Testing_Methodology')
+      methodology.save
+
+      described_class.new.perform(@tmp_file, logger: Log.new.write('Testing...'))
+
+      expect(Methodology.find('OWASPv4_Testing_Methodology_copy-01')).to_not be_nil
+    end
+
     if defined?(Dradis::Pro)
       it 'imports Pro-only content too' do
         described_class.new.perform(@tmp_file, logger: Log.new.write('Testing...'))