Skip to content

Commit

Permalink
Merge pull request #313 from gl3nn/reference-filter-unused-metric
Browse files Browse the repository at this point in the history
Ignore reference filters applied on unused metrics
  • Loading branch information
gl3nn committed Jul 29, 2020
2 parents 01a9629 + 1088e9c commit 9a24598
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
7 changes: 4 additions & 3 deletions fireant/reference_helpers.py
Expand Up @@ -74,8 +74,9 @@ def reference_suffix(metric, reference):
def apply_reference_filters(df, reference):
for reference_filter in reference.filters:
df_column_key = alias_selector(reference_alias(reference_filter.metric, reference))
column = df[df_column_key]
dataframe_filter = ComparisonOperator.eval(column, reference_filter.operator, reference_filter.value)
df = df.loc[dataframe_filter]
if df_column_key in df:
column = df[df_column_key]
dataframe_filter = ComparisonOperator.eval(column, reference_filter.operator, reference_filter.value)
df = df.loc[dataframe_filter]

return df
18 changes: 18 additions & 0 deletions fireant/tests/test_reference_helpers.py
Expand Up @@ -31,6 +31,12 @@ def setUpClass(cls):
definition=t0.metric,
data_type=DataType.number,
),
Field(
"unused_metric",
label="Unused Metric",
definition=t0.unused_metric,
data_type=DataType.number,
),
],
)

Expand Down Expand Up @@ -146,3 +152,15 @@ def test_reference_filter_with_2_filters_combined(self):
result_df.reset_index(drop=True),
pd.DataFrame.from_dict({"$metric0": [2, 3], "$metric0_dod": [5, 9]}),
)

def test_reference_filter_for_an_unselected_metric(self):
reference_filter = ReferenceFilter(
self.dataset.fields.unused_metric, ComparisonOperator.gt, 5
)
reference = DayOverDay(
self.dataset.fields.timestamp, filters=[reference_filter]
)

result_df = apply_reference_filters(self.df, reference)

pd.testing.assert_frame_equal(result_df, self.df)

0 comments on commit 9a24598

Please sign in to comment.