Refactor common code into EventStream.default_group_names_and_levels

ManageIQ · Nov 19, 2021 · 066954e · 066954e
1 parent afa9c4b
commit 066954e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/app/models/ems_event.rb b/app/models/ems_event.rb
@@ -21,10 +21,7 @@ def self.class_group_levels
   end
 
   def self.group_names_and_levels
-    result = {:description => description}
-    result[:group_names] = {DEFAULT_GROUP_NAME => DEFAULT_GROUP_NAME.to_s.capitalize}
-
-    event_groups.each_with_object(result) do |(group_name, group_details), hash|
+    event_groups.each_with_object(default_group_names_and_levels) do |(group_name, group_details), hash|
       hash[:group_names][group_name] = group_details[:name]
 
       group_details.each_key do |level|

diff --git a/app/models/event_stream.rb b/app/models/event_stream.rb
@@ -120,6 +120,13 @@ def self.timeline_classes
     EventStream.subclasses.select { |e| e.respond_to?(:group_names_and_levels) }
   end
 
+  def self.default_group_names_and_levels
+    { :description  => description,
+      :group_names  => {DEFAULT_GROUP_NAME => DEFAULT_GROUP_NAME.to_s.capitalize},
+      :group_levels => {}
+    }.freeze
+  end
+
   def self.timeline_options
     timeline_classes.map { |c| [c.name.to_sym, c.group_names_and_levels] }.to_h
   end

diff --git a/app/models/miq_event.rb b/app/models/miq_event.rb
@@ -35,12 +35,9 @@ def self.description
   end
 
   def self.group_names_and_levels
-    hash = {:description => description}
-    hash[:group_names] = {DEFAULT_GROUP_NAME => DEFAULT_GROUP_NAME.to_s.capitalize}
+    hash = default_group_names_and_levels
     hash[:group_names].merge!(MiqEventDefinitionSet.all.pluck(:name, :description).to_h.symbolize_keys)
-
     group_levels.each do |level|
-      hash[:group_levels] ||= {}
       hash[:group_levels][level] ||= level.to_s.capitalize
     end
     hash