Advanced_settings assoc for google refresh #17890
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
InventoryCollection defininition for Google graph refresh needs this association
3 tasks
slemrmartin
changed the title
agrare
reviewed
Aug 22, 2018
app/models/vm_or_template.rb
Outdated
| @@ -102,7 +102,7 @@ class VmOrTemplate < ApplicationRecord | |||
|
|
|||
| has_many :scan_histories, :dependent => :destroy | |||
| has_many :lifecycle_events, :class_name => "LifecycleEvent" | |||
| has_many :advanced_settings, :as => :resource, :dependent => :destroy | |||
| has_many :advanced_settings, -> { where(:resource_type => "VmOrTemplate") }, :as => :resource, :dependent => :destroy | |||
There was a problem hiding this comment.
Is this necessary? Doesn't the query for advanced_settings already have where resource_id = id AND resource_type = VmOrTemplate?
>> vm.advanced_settings
AdvancedSetting Load (0.3ms) SELECT "advanced_settings".* FROM "advanced_settings" WHERE "advanced_settings"."resource_id" = $1 AND "advanced_settings"."resource_type" = $2 [["resource_id", 1], ["resource_type", "VmOrTemplate"]]
And with your change:
>> vm.advanced_settings
AdvancedSetting Load (1.7ms) SELECT "advanced_settings".* FROM "advanced_settings" WHERE "advanced_settings"."resource_id" = $1 AND "advanced_settings"."resource_type" = $2 AND "advanced_settings"."resource_type" = $3 [["resource_id", 1], ["resource_type", "VmOrTemplate"], ["resource_type", "VmOrTemplate"]]
looks like an extra duplicated where clause.
There was a problem hiding this comment.
you're right, I thought it's needed by ems's association, but it's not
Ladas
reviewed
Aug 23, 2018
app/models/ext_management_system.rb
Outdated
| @@ -77,6 +77,8 @@ def self.api_allowed_attributes | |||
| has_many :miq_events, :as => :target, :dependent => :destroy | |||
| has_many :cloud_subnets, :foreign_key => :ems_id, :dependent => :destroy | |||
|
|
|||
| has_many :advanced_settings, :through => :vms_and_templates | |||
There was a problem hiding this comment.
lets call it :vms_and_templates_advanced_settings ?
has_many :vms_and_templates_advanced_settings, :through => :vms_and_templates, :as => :advanced_settings
|
Checked commits slemrmartin/manageiq@a6decbd~...0399e89 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
EMS needs
advanced_settingsassociation for creatingInventoryCollectionnamedadvanced_settings.Used in Google (GCE cloud_manager's) graph refresh