|
15 | 15 | Client, |
16 | 16 | Currency, |
17 | 17 | DeliveryArea, |
| 18 | + DeliveryDuration, |
18 | 19 | DeliveryPeriod, |
| 20 | + DeliveryTimeFilter, |
19 | 21 | EnergyMarketCodeType, |
| 22 | + Interval, |
20 | 23 | MarketSide, |
21 | 24 | OrderDetail, |
22 | 25 | OrderState, |
@@ -57,7 +60,7 @@ def __init__(self) -> None: |
57 | 60 | ) |
58 | 61 | self.delivery_period = DeliveryPeriod( |
59 | 62 | start=self.delivery_start, |
60 | | - duration=timedelta(minutes=15), |
| 63 | + duration=DeliveryDuration.from_timedelta(timedelta(minutes=15)), |
61 | 64 | ) |
62 | 65 | self.price = Price(amount=Decimal("56"), currency=Currency.EUR) |
63 | 66 | self.quantity = Power(mw=Decimal("0.1")) |
@@ -134,7 +137,7 @@ async def create_test_trade( |
134 | 137 | ) |
135 | 138 | delivery_period = DeliveryPeriod( |
136 | 139 | start=delivery_start, |
137 | | - duration=timedelta(minutes=15), |
| 140 | + duration=DeliveryDuration.from_timedelta(timedelta(minutes=15)), |
138 | 141 | ) |
139 | 142 | buy_order = await create_test_order( |
140 | 143 | trader=trader, |
@@ -236,7 +239,11 @@ async def test_list_gridpool_orders(trader: _TestTrader) -> None: |
236 | 239 | orders = [ |
237 | 240 | order |
238 | 241 | async for order in trader.client.list_gridpool_orders( |
239 | | - gridpool_id=GRIDPOOL_ID, delivery_period=trader.delivery_period |
| 242 | + gridpool_id=GRIDPOOL_ID, |
| 243 | + delivery_time_filter=DeliveryTimeFilter( |
| 244 | + time_interval=Interval(trader.delivery_period.start), |
| 245 | + duration_filters=[trader.delivery_period.duration], |
| 246 | + ), |
240 | 247 | ) |
241 | 248 | ] |
242 | 249 | listed_orders_id = [order.order_id for order in orders] |
@@ -350,12 +357,15 @@ async def test_cancel_all_orders(trader: _TestTrader) -> None: |
350 | 357 |
|
351 | 358 | async def test_list_gridpool_trades(trader: _TestTrader) -> None: |
352 | 359 | """Test listing gridpool trades.""" |
353 | | - buy_order, sell_order = await create_test_trade(trader) |
| 360 | + await create_test_trade(trader) |
354 | 361 | trades = [ |
355 | 362 | trade |
356 | 363 | async for trade in trader.client.list_gridpool_trades( |
357 | 364 | GRIDPOOL_ID, |
358 | | - delivery_period=buy_order.order.delivery_period, |
| 365 | + delivery_time_filter=DeliveryTimeFilter( |
| 366 | + time_interval=Interval(trader.delivery_period.start), |
| 367 | + duration_filters=[trader.delivery_period.duration], |
| 368 | + ), |
359 | 369 | ) |
360 | 370 | ] |
361 | 371 | assert len(trades) >= 1 |
@@ -397,7 +407,10 @@ async def test_receive_public_trades_filter(trader: _TestTrader) -> None: |
397 | 407 | start_time = datetime.now(timezone.utc).replace(second=0, microsecond=0) |
398 | 408 | start_time += timedelta(minutes=30 - start_time.minute % 15) # next 15-minute mark |
399 | 409 |
|
400 | | - delivery_period = DeliveryPeriod(start=start_time, duration=timedelta(minutes=15)) |
| 410 | + delivery_period = DeliveryPeriod( |
| 411 | + start=start_time, |
| 412 | + duration=DeliveryDuration.from_timedelta(timedelta(minutes=15)), |
| 413 | + ) |
401 | 414 |
|
402 | 415 | price = Price(amount=Decimal("808"), currency=Currency.EUR) |
403 | 416 |
|
|
0 commit comments