fix: correct sort order of pickups and drop-offs

2026-03-16 12:03:00 +01:00
parent f99a2d99a2
commit 44a9de7db7
4 changed files with 331 additions and 9 deletions
@@ -0,0 +1,138 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\BusProNet\XmlLoader;
+
+use App\BusProNet\Model\Pickup;
+use App\BusProNet\Model\Travel;
+use App\BusProNet\XmlLoader\PickupLoader;
+use PHPUnit\Framework\TestCase;
+
+class PickupLoaderTest extends TestCase
+{
+    private PickupLoader $loader;
+
+    protected function setUp(): void
+    {
+        $this->loader = $this->createPartialMock(PickupLoader::class, ['loadById']);
+        $this->loader->method('loadById')->willReturnCallback(function (int $id): Pickup {
+            $pickup = new Pickup();
+            $pickup->id = $id;
+            $pickup->code = 'Z'.$id;
+            $pickup->city = 'City '.$id;
+            $pickup->postalCode = '0000'.$id;
+            $pickup->street = 'Street '.$id;
+
+            return $pickup;
+        });
+    }
+
+    public function testDropOffsAreOrderedInReverseOfSortedPickups(): void
+    {
+        $travel = new Travel();
+
+        // Pickups with times: 10 (18:00), 20 (20:00), 30 (22:00)
+        $p10 = new Pickup();
+        $p10->id = 10;
+        $p10->time = new \DateTimeImmutable('2029-12-30 18:00');
+
+        $p20 = new Pickup();
+        $p20->id = 20;
+        $p20->time = new \DateTimeImmutable('2029-12-30 20:00');
+
+        $p30 = new Pickup();
+        $p30->id = 30;
+        $p30->time = new \DateTimeImmutable('2029-12-30 22:00');
+
+        // Pickups in non-sorted order
+        $travel->pickups = [30 => $p30, 10 => $p10, 20 => $p20];
+
+        // Drop-offs in arbitrary XML order
+        $d10 = new Pickup();
+        $d10->id = 10;
+        $d20 = new Pickup();
+        $d20->id = 20;
+        $d30 = new Pickup();
+        $d30->id = 30;
+
+        $travel->dropOffs = [20 => $d20, 30 => $d30, 10 => $d10];
+
+        $this->loader->patchPickupsDetails($travel);
+
+        // Pickups should be sorted chronologically: 10, 20, 30
+        $this->assertSame([10, 20, 30], array_keys($travel->pickups));
+
+        // Drop-offs should be in reverse order: 30, 20, 10
+        $this->assertSame([30, 20, 10], array_keys($travel->dropOffs));
+    }
+
+    public function testDropOffsNotInPickupsAreAppendedAtEnd(): void
+    {
+        $travel = new Travel();
+
+        $p10 = new Pickup();
+        $p10->id = 10;
+        $p10->time = new \DateTimeImmutable('2029-12-30 18:00');
+
+        $p20 = new Pickup();
+        $p20->id = 20;
+        $p20->time = new \DateTimeImmutable('2029-12-30 20:00');
+
+        $travel->pickups = [10 => $p10, 20 => $p20];
+
+        // Drop-offs include ID 99 which has no matching pickup
+        $d10 = new Pickup();
+        $d10->id = 10;
+        $d20 = new Pickup();
+        $d20->id = 20;
+        $d99 = new Pickup();
+        $d99->id = 99;
+
+        $travel->dropOffs = [99 => $d99, 10 => $d10, 20 => $d20];
+
+        $this->loader->patchPickupsDetails($travel);
+
+        // Drop-offs: reversed pickups (20, 10), then unmatched (99)
+        $this->assertSame([20, 10, 99], array_keys($travel->dropOffs));
+    }
+
+    public function testDropOffsWithTimeDataAreSortedChronologically(): void
+    {
+        $travel = new Travel();
+
+        $p10 = new Pickup();
+        $p10->id = 10;
+        $p10->time = new \DateTimeImmutable('2029-12-30 18:00');
+
+        $p20 = new Pickup();
+        $p20->id = 20;
+        $p20->time = new \DateTimeImmutable('2029-12-30 20:00');
+
+        $p30 = new Pickup();
+        $p30->id = 30;
+        $p30->time = new \DateTimeImmutable('2029-12-30 22:00');
+
+        $travel->pickups = [30 => $p30, 10 => $p10, 20 => $p20];
+
+        // Drop-offs with their own time data (return journey times)
+        $d10 = new Pickup();
+        $d10->id = 10;
+        $d10->time = new \DateTimeImmutable('2030-01-05 14:00');
+
+        $d20 = new Pickup();
+        $d20->id = 20;
+        $d20->time = new \DateTimeImmutable('2030-01-05 12:00');
+
+        $d30 = new Pickup();
+        $d30->id = 30;
+        $d30->time = new \DateTimeImmutable('2030-01-05 10:00');
+
+        $travel->dropOffs = [10 => $d10, 20 => $d20, 30 => $d30];
+
+        $this->loader->patchPickupsDetails($travel);
+
+        // Drop-offs should be sorted by time, not by reversed pickup order
+        $this->assertSame([30, 20, 10], array_keys($travel->dropOffs));
+    }
+}