EP/myep
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: exclude past dates in price tables

Browse Source
This commit is contained in:
Björn Fromme
2026-08-06 12:19:30 +02:00
parent 577f7445ab
commit b82e017f73
3 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Service/PriceTimelineBuilder.php
+11 -11
View File
@@ -11,16 +11,16 @@ use App\Model\PriceTimelineItem;
class PriceTimelineBuilder
{
/**
* Builds a flat, non-overlapping timeline of effective price rows for the given year.
* Builds a flat, non-overlapping timeline of effective price rows for the given date range.
*
* Base price periods are split wherever an override or discount applies, so each
* returned row represents a contiguous date range with a single effective price.
* Periods with no price configured are omitted. Prices that start before or end after
* the queried year are clamped to its boundaries.
* the queried range are clamped to its boundaries.
*
* The algorithm is an interval sweep:
* 1. Collect every dateFrom and (dateTo + 1 day) from all prices as boundary points,
* plus the year start and (yearEnd + 1 day). This ensures the sweep slices at
* plus the range start and (rangeEnd + 1 day). This ensures the sweep slices at
* every point where the set of active prices changes.
* 2. Walk adjacent boundary pairs [start, end). For each segment, find all prices
* active at `start` and resolve the winner via resolveWinner(), which prefers
@@ -39,20 +39,20 @@ class PriceTimelineBuilder
*/
public function buildTimeline(
array $prices,
\DateTimeImmutable $yearStart,
\DateTimeImmutable $yearEnd,
\DateTimeImmutable $rangeStart,
\DateTimeImmutable $rangeEnd,
string $currency,
): array {
if (empty($prices)) {
return [];
}
$yearEndNext = $yearEnd->modify('+1 day');
$rangeEndNext = $rangeEnd->modify('+1 day');
// Step 1: collect all boundary points, keyed by timestamp for deduplication.
$boundaries = [
$yearStart->getTimestamp() => $yearStart,
$yearEndNext->getTimestamp() => $yearEndNext,
$rangeStart->getTimestamp() => $rangeStart,
$rangeEndNext->getTimestamp() => $rangeEndNext,
];
foreach ($prices as $price) {
$from = $price->getDateFrom();
@@ -73,9 +73,9 @@ class PriceTimelineBuilder
$segStart = $boundaries[$i];
$segEndNext = $boundaries[$i + 1];
// Boundaries from prices outside the year are included to correctly detect
// overlaps at the year edges, but the segments themselves are skipped.
if ($segStart < $yearStart || $segStart >= $yearEndNext) {
// Boundaries from prices outside the range are included to correctly detect
// overlaps at the range edges, but the segments themselves are skipped.
if ($segStart < $rangeStart || $segStart >= $rangeEndNext) {
continue;
}