Removing guard conditions in Chargeback #17463
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
lpichler
force-pushed
the
remove_column_guard_conditions_in_chargeback
branch
from
9a6faf4
to
0a5c61a
Compare
Goal: remove this condition
Goal: Make this condition as is in affects_report_fields and then remove the condition
Calculation with zero rates is usefull and it is not affecting anything.
this filtering is already done in rate_details_relevant_to in ChargebackRateDetail
lpichler
force-pushed
the
remove_column_guard_conditions_in_chargeback
branch
from
0a5c61a
to
f5bc378
Compare
lpichler
changed the title
lpichler
commented
May 22, 2018
app/models/chargeback_rate_detail.rb
Outdated
| @@ -94,7 +94,7 @@ def rate_values(consumption, options) | |||
|
|
|||
| def charge(relevant_fields, consumption, options) | |||
| result = {} | |||
| if (relevant_fields & [metric_key]).present? || (relevant_fields & cost_keys).present? | |||
| if (relevant_fields & [metric_key]).present? || ((cost_keys.to_set & report_cols).present? && !gratis?) | |||
There was a problem hiding this comment.
this is from ChargebackRateDetail#affects_report_fields
this filtering is covered by ChargebackRate#rate_details_relevant_to
|
Checked commits lpichler/manageiq@433c2cc~...7478035 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
jrafanie
changed the title
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.
We have same(on first look apparently) condition on two places.
This is commit based story how to remove condition from one place in
ChargebackRateDetail#chargemethod.Thanks to it method
ChargebackRateDetail#chargeis more clean.follow up after:
#17387
#17414
cc @gtanzillo
@miq-bot assign @jrafanie