From 0aa4b449b4f0d2a38ee1b44c47b41eea4761a1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Sun, 15 Nov 2026 20:08:25 +0100 Subject: [PATCH] feat(orders): implement ApplyPickTimeSlot action and output handling - Introduced ApplyPickTimeSlotOutput class for structured output. - Updated ApplyPickTimeSlot action to return ApplyPickTimeSlotOutput. - Added ApplyPickTimeSlotStatus enum for status representation. - Modified TunnelController to handle new output structure. - Enhanced tests for ApplyPickTimeSlot to validate new behavior. --- app/Cqs/Actions/Orders/ApplyPickTimeSlot.php | 14 +++-- .../Orders/ApplyPickTimeSlotOutput.php | 32 +++++++++++ app/Enums/ApplyPickTimeSlotStatus.php | 11 ++++ app/Http/Controllers/Fo/TunnelController.php | 14 ++--- .../Controllers/Fo/TunnelControllerTest.php | 5 +- .../Actions/Orders/ApplyPickTimeSlotTest.php | 53 ++++++++++++++++++- 6 files changed, 115 insertions(+), 14 deletions(-) create mode 100644 app/Cqs/Actions/Orders/ApplyPickTimeSlotOutput.php create mode 100644 app/Enums/ApplyPickTimeSlotStatus.php diff --git a/app/Cqs/Actions/Orders/ApplyPickTimeSlot.php b/app/Cqs/Actions/Orders/ApplyPickTimeSlot.php index 5b18bb24..bc47667e 100644 --- a/app/Cqs/Actions/Orders/ApplyPickTimeSlot.php +++ b/app/Cqs/Actions/Orders/ApplyPickTimeSlot.php @@ -6,12 +6,14 @@ namespace App\Cqs\Actions\Orders; use App\Contracts\Action; use App\Contracts\ActionInput; -use Domain\Models\ValueObjects\PickupTimeSlot; use Domain\Services\OrderTunnelService; use Webmozart\Assert\Assert; /** - * @implements \App\Contracts\Action<\App\Cqs\Actions\Orders\ApplyPickTimeSlotInput, ?\Domain\Models\ValueObjects\PickupTimeSlot> + * @implements \App\Contracts\Action< + * \App\Cqs\Actions\Orders\ApplyPickTimeSlotInput, + * \App\Cqs\Actions\Orders\ApplyPickTimeSlotOutput + * > */ final class ApplyPickTimeSlot implements Action { @@ -24,7 +26,7 @@ final class ApplyPickTimeSlot implements Action * @param \App\Cqs\Actions\Orders\ApplyPickTimeSlotInput $input */ #[\Override] - public function __invoke(ActionInput $input): ?PickupTimeSlot + public function __invoke(ActionInput $input): ApplyPickTimeSlotOutput { Assert::isInstanceOf($input, ApplyPickTimeSlotInput::class); @@ -32,11 +34,15 @@ final class ApplyPickTimeSlot implements Action $shop = $this->orderTunnelService->getShopForCustomer($input->shopperId); $timeSlots = $this->orderTunnelService->getAvailableTimeSlots($shop); - return $this->orderTunnelService->applyTimeSlot( + $timeSlot = $this->orderTunnelService->applyTimeSlot( $builder, $shop, $input->timeslot, $timeSlots ); + + return $timeSlot !== null + ? ApplyPickTimeSlotOutput::matched($timeSlot) + : ApplyPickTimeSlotOutput::unavailable(); } } diff --git a/app/Cqs/Actions/Orders/ApplyPickTimeSlotOutput.php b/app/Cqs/Actions/Orders/ApplyPickTimeSlotOutput.php new file mode 100644 index 00000000..05ca22ff --- /dev/null +++ b/app/Cqs/Actions/Orders/ApplyPickTimeSlotOutput.php @@ -0,0 +1,32 @@ +authorize('canPickTimeSlot', OrderTunnelStep::class); - $matchedSlot = $this->executor->execute( + $output = $this->executor->execute( $action, $request->toApplyPickTimeSlotInput() ); - if ($matchedSlot === null) { - return back()->withErrors([ + return match ($output->status) { + ApplyPickTimeSlotStatus::MATCHED => to_route('fo.sales.confirmation'), + ApplyPickTimeSlotStatus::UNAVAILABLE => back()->withErrors([ 'timeslot' => trans('Invalid or unavailable time slot'), - ])->withInput(); - } - - return to_route('fo.sales.confirmation'); + ])->withInput(), + }; } // * -- STEP 3 -- * diff --git a/tests/Feature/App/Http/Controllers/Fo/TunnelControllerTest.php b/tests/Feature/App/Http/Controllers/Fo/TunnelControllerTest.php index a0445677..5ac17d56 100644 --- a/tests/Feature/App/Http/Controllers/Fo/TunnelControllerTest.php +++ b/tests/Feature/App/Http/Controllers/Fo/TunnelControllerTest.php @@ -3,6 +3,7 @@ declare(strict_types=1); use App\Contracts\Executor; +use App\Cqs\Actions\Orders\ApplyPickTimeSlotOutput; use App\Cqs\Actions\Orders\FinalizeOrderOutput; use App\Cqs\Queries\Orders\GetBasketSummaryQueryOutput; use App\Cqs\Queries\Orders\GetOrderConfirmationQueryOutput; @@ -341,7 +342,7 @@ describe('TunnelController', function (): void { $this->mock(Executor::class, function ($mock) use ($slot): void { $mock->shouldReceive('execute') ->once() - ->andReturn($slot); + ->andReturn(ApplyPickTimeSlotOutput::matched($slot)); }); // WHEN @@ -401,7 +402,7 @@ describe('TunnelController', function (): void { $this->mock(Executor::class, function ($mock): void { $mock->shouldReceive('execute') ->once() - ->andReturn(null); + ->andReturn(ApplyPickTimeSlotOutput::unavailable()); }); // WHEN diff --git a/tests/Unit/App/Actions/Orders/ApplyPickTimeSlotTest.php b/tests/Unit/App/Actions/Orders/ApplyPickTimeSlotTest.php index ffc67a68..6ab9c7cc 100644 --- a/tests/Unit/App/Actions/Orders/ApplyPickTimeSlotTest.php +++ b/tests/Unit/App/Actions/Orders/ApplyPickTimeSlotTest.php @@ -4,6 +4,8 @@ declare(strict_types=1); use App\Cqs\Actions\Orders\ApplyPickTimeSlot; use App\Cqs\Actions\Orders\ApplyPickTimeSlotInput; +use App\Cqs\Actions\Orders\ApplyPickTimeSlotOutput; +use App\Enums\ApplyPickTimeSlotStatus; use Carbon\CarbonImmutable; use Domain\Builders\OrderBuilderWithBasket; use Domain\Models\Entities\Shop; @@ -57,6 +59,55 @@ describe('ApplyPickTimeSlot', function (): void { $result = $action($input); // THEN - expect($result)->toBe($slot); + expect($result)->toBeInstanceOf(ApplyPickTimeSlotOutput::class) + ->and($result->status)->toBe(ApplyPickTimeSlotStatus::MATCHED) + ->and($result->timeSlot)->toBe($slot); + }); + + it('returns unavailable output when no time slot matches', function (): void { + // GIVEN + $shopperId = new ShopperId(Uuid::uuid7()); + $timeslot = CarbonImmutable::parse('2026-10-15'); + $input = new ApplyPickTimeSlotInput( + shopperId: $shopperId, + timeslot: $timeslot, + ); + + $builder = \Mockery::mock(OrderBuilderWithBasket::class); + $shop = new Shop( + id: new ShopId(Uuid::uuid7()), + name: 'Shop 1', + address: '1 rue Test', + postcode: '75001', + city: 'Paris', + ); + $timeSlots = []; + + $orderTunnelService = \Mockery::mock(OrderTunnelService::class); + $orderTunnelService->shouldReceive('getBuilderFromBasketOrFail') + ->once() + ->andReturn($builder); + $orderTunnelService->shouldReceive('getShopForCustomer') + ->once() + ->with($shopperId) + ->andReturn($shop); + $orderTunnelService->shouldReceive('getAvailableTimeSlots') + ->once() + ->with($shop) + ->andReturn($timeSlots); + $orderTunnelService->shouldReceive('applyTimeSlot') + ->once() + ->with($builder, $shop, $timeslot, $timeSlots) + ->andReturnNull(); + + $action = new ApplyPickTimeSlot($orderTunnelService); + + // WHEN + $result = $action($input); + + // THEN + expect($result)->toBeInstanceOf(ApplyPickTimeSlotOutput::class) + ->and($result->status)->toBe(ApplyPickTimeSlotStatus::UNAVAILABLE) + ->and($result->timeSlot)->toBeNull(); }); });