Skip to content

Commit

Permalink
Change mixed string / symbol keys to all symbol keys
Browse files Browse the repository at this point in the history
Before:

```
{"EmsEvent"=>
  {"description"=>"Management Events",
   "group_names"=>
    {:addition=>"Creation/Addition",
...
     :security=>"Security"},
   "group_levels"=>
    {"critical"=>"Critical", "detail"=>"Detail", "warning"=>"Warning"}},
 "MiqEvent"=>
  {"description"=>"Policy Events",
   "group_names"=>
    {"vm_process"=>"VM Lifecycle",
...
     "auth_validation"=>"Authentication Validation (Provider)"},
   "group_levels"=>{"success"=>"Success", "failure"=>"Failure"}}}
```

After:

```
{:EmsEvent=>
  {:description=>"Management Events",
   :group_names=>
    {:addition=>"Creation/Addition",
...
     :security=>"Security"},
   :group_levels=>
    {:critical=>"Critical", :detail=>"Detail", :warning=>"Warning"}},
 :MiqEvent=>
  {:description=>"Policy Events",
   :group_names=>
    {:vm_process=>"VM Lifecycle",
...
     :auth_validation=>"Authentication Validation (Provider)"},
   :group_levels=>{:success=>"Success", :failure=>"Failure"}}}
```
  • Loading branch information
jrafanie committed Nov 11, 2021
1 parent 721caa0 commit 7451687
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
10 changes: 5 additions & 5 deletions app/models/ems_event.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ def self.description
end

def self.group_names_and_levels
result = {'description' => description}
result = {:description => description}
event_groups.each_with_object(result) do |(group_name, group_details), hash|
hash["group_names"] ||= {}
hash["group_names"][group_name] = group_details[:name]
hash[:group_names] ||= {}
hash[:group_names][group_name] = group_details[:name]

group_details.each_key do |level|
level = level.to_s
next if level == 'name'
hash["group_levels"] ||= {}
hash["group_levels"][level] ||= level.capitalize
hash[:group_levels] ||= {}
hash[:group_levels][level.to_sym] ||= level.capitalize
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/models/event_stream.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,6 @@ def self.timeline_classes
end

def self.timeline_options
timeline_classes.map { |c| [c.name, c.group_names_and_levels] }.to_h
timeline_classes.map { |c| [c.name.to_sym, c.group_names_and_levels] }.to_h
end
end
6 changes: 3 additions & 3 deletions app/models/miq_event.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ def self.description
end

def self.group_names_and_levels
hash = {'description' => description}
hash["group_names"] = MiqEventDefinitionSet.all.pluck(:name, :description).to_h
hash["group_levels"] =[MiqPolicy::CONDITION_ALLOW, MiqPolicy::CONDITION_DENY].map {|c| [c.downcase, c]}.to_h
hash = {:description => description}
hash[:group_names] = MiqEventDefinitionSet.all.pluck(:name, :description).to_h.symbolize_keys
hash[:group_levels] =[MiqPolicy::CONDITION_ALLOW, MiqPolicy::CONDITION_DENY].map {|c| [c.downcase.to_sym, c]}.to_h
hash
end

Expand Down
18 changes: 9 additions & 9 deletions spec/models/event_stream_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
it "has correct structure" do
MiqEventDefinitionSet.seed
options = described_class.timeline_options
expect(options.keys.sort).to eq %w[EmsEvent MiqEvent]
expect(options.keys.sort).to eq %i[EmsEvent MiqEvent]

expect(options["EmsEvent"].keys.sort).to eq %w[description group_levels group_names]
expect(options["EmsEvent"]["description"]).to eq(EmsEvent.description)
expect(options["EmsEvent"]["group_levels"].keys.sort).to eq %w[critical detail warning]
expect(options["EmsEvent"]["group_names"].keys).to include *%i[addition configuration console deletion devices]
expect(options[:EmsEvent].keys.sort).to eq %i[description group_levels group_names]
expect(options[:EmsEvent][:description]).to eq(EmsEvent.description)
expect(options[:EmsEvent][:group_levels].keys.sort).to eq %i[critical detail warning]
expect(options[:EmsEvent][:group_names].keys).to include *%i[addition configuration console deletion devices]

expect(options["MiqEvent"].keys.sort).to eq %w[description group_levels group_names]
expect(options["MiqEvent"]["description"]).to eq(MiqEvent.description)
expect(options["MiqEvent"]["group_levels"].keys.sort).to eq %w[failure success]
expect(options["MiqEvent"]["group_names"].keys).to include *%w[auth_validation authentication compliance container_operations ems_operations evm_operations]
expect(options[:MiqEvent].keys.sort).to eq %i[description group_levels group_names]
expect(options[:MiqEvent][:description]).to eq(MiqEvent.description)
expect(options[:MiqEvent][:group_levels].keys.sort).to eq %i[failure success]
expect(options[:MiqEvent][:group_names].keys).to include *%i[auth_validation authentication compliance container_operations ems_operations evm_operations]
end
end
end

0 comments on commit 7451687

Please sign in to comment.