Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More tests for custom grain #1664

Open
wants to merge 4 commits into
base: court/custom-offset10
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -881,3 +881,11 @@ metric:
offset_window: 1 alien_day
alias: bookings_offset
- name: bookings
---
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit to remove extra +---

metric:
name: bookings_on_first_alien_day
description: tests a metric filter using a custom grain
type: simple
type_params:
measure: bookings
filter: "{{ TimeDimension('metric_time', 'alien_day') }}"
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ docstring:
'listing__booking__listing__bookings_fill_nulls_with_0_without_time_spine',
'listing__booking__listing__bookings_join_to_time_spine',
'listing__booking__listing__bookings_join_to_time_spine_with_tiered_filters',
'listing__booking__listing__bookings_on_first_alien_day',
'listing__booking__listing__bookings_per_booker',
'listing__booking__listing__bookings_per_dollar',
'listing__booking__listing__derived_bookings_0',
Expand Down Expand Up @@ -72,6 +73,7 @@ docstring:
'listing__bookings_fill_nulls_with_0_without_time_spine',
'listing__bookings_join_to_time_spine',
'listing__bookings_join_to_time_spine_with_tiered_filters',
'listing__bookings_on_first_alien_day',
'listing__bookings_per_booker',
'listing__bookings_per_dollar',
'listing__bookings_per_listing',
Expand Down Expand Up @@ -290,6 +292,7 @@ docstring:
'user__listing__user__bookings_fill_nulls_with_0_without_time_spine',
'user__listing__user__bookings_join_to_time_spine',
'user__listing__user__bookings_join_to_time_spine_with_tiered_filters',
'user__listing__user__bookings_on_first_alien_day',
'user__listing__user__bookings_per_booker',
'user__listing__user__bookings_per_dollar',
'user__listing__user__bookings_per_listing',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Model Join-Path Entity Links
('listings_latest',) ("('listing',)", "('booking', 'listing')") bookings_fill_nulls_with_0_without_time_spine ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('booking', 'listing')") bookings_join_to_time_spine ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('booking', 'listing')") bookings_join_to_time_spine_with_tiered_filters ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('booking', 'listing')") bookings_on_first_alien_day ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('booking', 'listing')") bookings_per_booker ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('booking', 'listing')") bookings_per_dollar ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('booking', 'listing')") derived_bookings_0 ['JOINED', 'METRIC']
Expand Down Expand Up @@ -83,6 +84,7 @@ Model Join-Path Entity Links
('listings_latest',) ("('listing',)", "('listing',)") bookings_fill_nulls_with_0_without_time_spine ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('listing',)") bookings_join_to_time_spine ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('listing',)") bookings_join_to_time_spine_with_tiered_filters ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('listing',)") bookings_on_first_alien_day ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('listing',)") bookings_per_booker ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('listing',)") bookings_per_dollar ['JOINED', 'METRIC']
('listings_latest',) ("('listing',)", "('listing',)") bookings_per_listing ['JOINED', 'METRIC']
Expand Down Expand Up @@ -148,6 +150,7 @@ Model Join-Path Entity Links
('listings_latest',) ("('user',)", "('listing', 'user')") bookings_fill_nulls_with_0_without_time_spine ['JOINED', 'METRIC']
('listings_latest',) ("('user',)", "('listing', 'user')") bookings_join_to_time_spine ['JOINED', 'METRIC']
('listings_latest',) ("('user',)", "('listing', 'user')") bookings_join_to_time_spine_with_tiered_filters ['JOINED', 'METRIC']
('listings_latest',) ("('user',)", "('listing', 'user')") bookings_on_first_alien_day ['JOINED', 'METRIC']
('listings_latest',) ("('user',)", "('listing', 'user')") bookings_per_booker ['JOINED', 'METRIC']
('listings_latest',) ("('user',)", "('listing', 'user')") bookings_per_dollar ['JOINED', 'METRIC']
('listings_latest',) ("('user',)", "('listing', 'user')") bookings_per_listing ['JOINED', 'METRIC']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ docstring:
'company__listing__user__company__bookings_fill_nulls_with_0_without_time_spine',
'company__listing__user__company__bookings_join_to_time_spine',
'company__listing__user__company__bookings_join_to_time_spine_with_tiered_filters',
'company__listing__user__company__bookings_on_first_alien_day',
'company__listing__user__company__bookings_per_booker',
'company__listing__user__company__bookings_per_dollar',
'company__listing__user__company__bookings_per_view',
Expand Down Expand Up @@ -155,6 +156,7 @@ docstring:
'guest__booking__guest__bookings_fill_nulls_with_0_without_time_spine',
'guest__booking__guest__bookings_join_to_time_spine',
'guest__booking__guest__bookings_join_to_time_spine_with_tiered_filters',
'guest__booking__guest__bookings_on_first_alien_day',
'guest__booking__guest__bookings_per_booker',
'guest__booking__guest__bookings_per_dollar',
'guest__booking__guest__derived_bookings_0',
Expand Down Expand Up @@ -193,6 +195,7 @@ docstring:
'guest__bookings_fill_nulls_with_0_without_time_spine',
'guest__bookings_join_to_time_spine',
'guest__bookings_join_to_time_spine_with_tiered_filters',
'guest__bookings_on_first_alien_day',
'guest__bookings_per_booker',
'guest__bookings_per_dollar',
'guest__derived_bookings_0',
Expand Down Expand Up @@ -242,6 +245,7 @@ docstring:
'host__booking__host__bookings_fill_nulls_with_0_without_time_spine',
'host__booking__host__bookings_join_to_time_spine',
'host__booking__host__bookings_join_to_time_spine_with_tiered_filters',
'host__booking__host__bookings_on_first_alien_day',
'host__booking__host__bookings_per_booker',
'host__booking__host__bookings_per_dollar',
'host__booking__host__derived_bookings_0',
Expand Down Expand Up @@ -280,6 +284,7 @@ docstring:
'host__bookings_fill_nulls_with_0_without_time_spine',
'host__bookings_join_to_time_spine',
'host__bookings_join_to_time_spine_with_tiered_filters',
'host__bookings_on_first_alien_day',
'host__bookings_per_booker',
'host__bookings_per_dollar',
'host__derived_bookings_0',
Expand Down Expand Up @@ -330,6 +335,7 @@ docstring:
'listing__booking__listing__bookings_fill_nulls_with_0_without_time_spine',
'listing__booking__listing__bookings_join_to_time_spine',
'listing__booking__listing__bookings_join_to_time_spine_with_tiered_filters',
'listing__booking__listing__bookings_on_first_alien_day',
'listing__booking__listing__bookings_per_booker',
'listing__booking__listing__bookings_per_dollar',
'listing__booking__listing__derived_bookings_0',
Expand Down Expand Up @@ -369,6 +375,7 @@ docstring:
'listing__bookings_fill_nulls_with_0_without_time_spine',
'listing__bookings_join_to_time_spine',
'listing__bookings_join_to_time_spine_with_tiered_filters',
'listing__bookings_on_first_alien_day',
'listing__bookings_per_booker',
'listing__bookings_per_dollar',
'listing__bookings_per_listing',
Expand Down Expand Up @@ -445,6 +452,7 @@ docstring:
'lux_listing__listing__lux_listing__bookings_fill_nulls_with_0_without_time_spine',
'lux_listing__listing__lux_listing__bookings_join_to_time_spine',
'lux_listing__listing__lux_listing__bookings_join_to_time_spine_with_tiered_filters',
'lux_listing__listing__lux_listing__bookings_on_first_alien_day',
'lux_listing__listing__lux_listing__bookings_per_booker',
'lux_listing__listing__lux_listing__bookings_per_dollar',
'lux_listing__listing__lux_listing__bookings_per_listing',
Expand Down Expand Up @@ -599,6 +607,7 @@ docstring:
'user__listing__user__bookings_fill_nulls_with_0_without_time_spine',
'user__listing__user__bookings_join_to_time_spine',
'user__listing__user__bookings_join_to_time_spine_with_tiered_filters',
'user__listing__user__bookings_on_first_alien_day',
'user__listing__user__bookings_per_booker',
'user__listing__user__bookings_per_dollar',
'user__listing__user__bookings_per_listing',
Expand Down
56 changes: 51 additions & 5 deletions tests_metricflow/query_rendering/test_custom_granularity.py
Original file line number Diff line number Diff line change
Expand Up @@ -690,11 +690,6 @@ def test_custom_offset_window_with_only_window_grain( # noqa: D103
)


# TODO: add more tests
# - with where filter not included in group by
# - nested custom offset


@pytest.mark.sql_engine_snapshot
def test_multiple_time_spines_in_query_for_join_to_time_spine_metric( # noqa: D103
request: FixtureRequest,
Expand Down Expand Up @@ -765,3 +760,54 @@ def test_custom_offset_window_with_multiple_time_spines( # noqa: D103
dataflow_plan_builder=dataflow_plan_builder,
query_spec=query_spec,
)


@pytest.mark.sql_engine_snapshot
def test_custom_offset_window_with_filter_not_in_group_by( # noqa: D103
request: FixtureRequest,
mf_test_configuration: MetricFlowTestConfiguration,
dataflow_plan_builder: DataflowPlanBuilder,
dataflow_to_sql_converter: DataflowToSqlPlanConverter,
sql_client: SqlClient,
query_parser: MetricFlowQueryParser,
) -> None:
query_spec = query_parser.parse_and_validate_query(
metric_names=("bookings_offset_one_alien_day",),
group_by_names=("metric_time__day",),
where_constraints=[
PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'month') }} = '2020-01-01'"))
],
).query_spec

render_and_check(
request=request,
mf_test_configuration=mf_test_configuration,
dataflow_to_sql_converter=dataflow_to_sql_converter,
sql_client=sql_client,
dataflow_plan_builder=dataflow_plan_builder,
query_spec=query_spec,
)


@pytest.mark.sql_engine_snapshot
def test_custom_grain_in_metric_yaml_filter( # noqa: D103
request: FixtureRequest,
mf_test_configuration: MetricFlowTestConfiguration,
dataflow_plan_builder: DataflowPlanBuilder,
dataflow_to_sql_converter: DataflowToSqlPlanConverter,
sql_client: SqlClient,
query_parser: MetricFlowQueryParser,
) -> None:
query_spec = query_parser.parse_and_validate_query(
metric_names=("bookings_on_first_alien_day",),
group_by_names=("metric_time__day",),
).query_spec

render_and_check(
request=request,
mf_test_configuration=mf_test_configuration,
dataflow_to_sql_converter=dataflow_to_sql_converter,
sql_client=sql_client,
dataflow_plan_builder=dataflow_plan_builder,
query_spec=query_spec,
)
Loading