Skip to content

fix tariff: ignore stale grid fee when provider is not configured #4112

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.

Sign up for GitHub

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

Merged
LKuemmel merged 1 commit into from
Oct 14, 2026
Merged

fix tariff: ignore stale grid fee when provider is not configured #4112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions packages/modules/common/store/_tariff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,10 @@ def __sum_of_tariff_and_grid_fee(
electricity_pricing = optional_data.data.electricity_pricing
flexible_tariff_prices = {int(float(k)): v for k, v
in electricity_pricing.flexible_tariff.get.prices.items()}
grid_fee_prices = {int(float(k)): v for k, v
in electricity_pricing.grid_fee.get.prices.items()}
grid_fee_prices = (
{int(float(k)): v for k, v in electricity_pricing.grid_fee.get.prices.items()}
if optional_data.grid_fee_module is not None else {}
)

flexible_tariff_prices = __reduce_prices(flexible_tariff_prices)
if len(flexible_tariff_prices) == 0 and len(grid_fee_prices) == 0:
Expand Down
22 changes: 22 additions & 0 deletions packages/modules/common/store/_tariff_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,28 @@ def test_sum_prices(
assert summed == expected_prices


def test_sum_prices_ignores_stale_grid_fee_when_provider_is_not_configured(monkeypatch):
monkeypatch.setattr(
timecheck, "create_timestamp",
Mock(return_value=DEFAULT_START_TIMESTAMP)
)
optional_data = data.data.optional_data
optional_data._grid_fee_module = None
flexible_tariff_prices = {
str(DEFAULT_START_TIMESTAMP): 0.0002856,
str(DEFAULT_START_TIMESTAMP + 900): 0.0002877,
}
optional_data.data.electricity_pricing.flexible_tariff.get.prices = flexible_tariff_prices
optional_data.data.electricity_pricing.grid_fee.get.prices = flexible_tariff_prices.copy()

summed = PriceValueStore().sum_prices()

assert summed == {
DEFAULT_START_TIMESTAMP: 0.0002856,
DEFAULT_START_TIMESTAMP + 900: 0.0002877,
}


@pytest.mark.parametrize(
"flexible_tariff, grid_fee",
[
Expand Down
Loading