Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

5 files changed, 94 insertions, 52 deletions

diff --git a/lib/gitlab/import_export/project/sample/date_calculator.rb b/lib/gitlab/import_export/project/sample/date_calculator.rb
index 2d989d21166..543fd25d883 100644
--- a/lib/gitlab/import_export/project/sample/date_calculator.rb
+++ b/lib/gitlab/import_export/project/sample/date_calculator.rb
@@ -9,7 +9,6 @@ module Gitlab
 
           def initialize(dates)
             @dates = dates.dup
-            @dates.flatten!
             @dates.compact!
             @dates.sort!
             @dates.map! { |date| date.to_time.to_f }
diff --git a/lib/gitlab/import_export/project/sample/relation_factory.rb b/lib/gitlab/import_export/project/sample/relation_factory.rb
new file mode 100644
index 00000000000..6e59174f9a3
--- /dev/null
+++ b/lib/gitlab/import_export/project/sample/relation_factory.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    module Project
+      module Sample
+        class RelationFactory < Project::RelationFactory
+          DATE_MODELS = %i[issues milestones].freeze
+
+          def initialize(date_calculator:, **args)
+            super(**args)
+
+            @date_calculator = date_calculator
+          end
+
+          private
+
+          def setup_models
+            super
+
+            # Override due date attributes in data hash for Sample Data templates
+            # Dates are moved by taking the closest one to average and moving that (and rest around it) to the date of import
+            override_date_attributes
+          end
+
+          def override_date_attributes
+            return unless DATE_MODELS.include?(@relation_name)
+
+            @relation_hash['start_date'] = calculate_by_closest_date(@relation_hash['start_date']&.to_time)
+            @relation_hash['due_date'] = calculate_by_closest_date(@relation_hash['due_date']&.to_time)
+          end
+
+          def calculate_by_closest_date(date)
+            return unless date
+
+            @date_calculator.calculate_by_closest_date_to_average(date)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/project/sample/relation_tree_restorer.rb b/lib/gitlab/import_export/project/sample/relation_tree_restorer.rb
new file mode 100644
index 00000000000..44ccb67a531
--- /dev/null
+++ b/lib/gitlab/import_export/project/sample/relation_tree_restorer.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    module Project
+      module Sample
+        class RelationTreeRestorer < ImportExport::RelationTreeRestorer
+          def initialize(*args)
+            super
+
+            @date_calculator = Gitlab::ImportExport::Project::Sample::DateCalculator.new(dates)
+          end
+
+          private
+
+          def relation_factory_params(*args)
+            super.merge(date_calculator: @date_calculator)
+          end
+
+          def dates
+            return [] if relation_reader.legacy?
+
+            RelationFactory::DATE_MODELS.flat_map do |tag|
+              relation_reader.consume_relation(@importable_path, tag, mark_as_consumed: false).map do |model|
+                model.first['due_date']
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/project/sample/sample_data_relation_tree_restorer.rb b/lib/gitlab/import_export/project/sample/sample_data_relation_tree_restorer.rb
deleted file mode 100644
index b0c3940b5f9..00000000000
--- a/lib/gitlab/import_export/project/sample/sample_data_relation_tree_restorer.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module ImportExport
-    module Project
-      module Sample
-        class SampleDataRelationTreeRestorer < RelationTreeRestorer
-          DATE_MODELS = %i[issues milestones].freeze
-
-          def initialize(*args)
-            super
-
-            date_calculator
-          end
-
-          private
-
-          def build_relation(relation_key, relation_definition, data_hash)
-            # Override due date attributes in data hash for Sample Data templates
-            # Dates are moved by taking the closest one to average and moving that (and rest around it) to the date of import
-            # TODO: To move this logic to RelationFactory (see: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41699#note_430465333)
-            override_date_attributes!(relation_key, data_hash)
-            super
-          end
-
-          def override_date_attributes!(relation_key, data_hash)
-            return unless DATE_MODELS.include?(relation_key.to_sym)
-
-            data_hash['start_date'] = date_calculator.calculate_by_closest_date_to_average(data_hash['start_date'].to_time) unless data_hash['start_date'].nil?
-            data_hash['due_date'] = date_calculator.calculate_by_closest_date_to_average(data_hash['due_date'].to_time) unless data_hash['due_date'].nil?
-          end
-
-          # TODO: Move clear logic into main comsume_relation method (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41699#note_430465330)
-          def dates
-            unless relation_reader.legacy?
-              DATE_MODELS.map do |tag|
-                relation_reader.consume_relation(@importable_path, tag).map { |model| model.first['due_date'] }.tap do
-                  relation_reader.clear_consumed_relations
-                end
-              end
-            end
-          end
-
-          def date_calculator
-            @date_calculator ||= Gitlab::ImportExport::Project::Sample::DateCalculator.new(dates)
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/import_export/project/sample/tree_restorer.rb b/lib/gitlab/import_export/project/sample/tree_restorer.rb
new file mode 100644
index 00000000000..1d4b5328cb9
--- /dev/null
+++ b/lib/gitlab/import_export/project/sample/tree_restorer.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    module Project
+      module Sample
+        class TreeRestorer < Project::TreeRestorer
+          def relation_tree_restorer_class
+            RelationTreeRestorer
+          end
+
+          def relation_factory
+            RelationFactory
+          end
+        end
+      end
+    end
+  end
+end