From 5f6ccaa35dfca5fd3598e55ce7773a3576109d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Sun, 15 Nov 2026 17:55:55 +0100 Subject: [PATCH] refactor(orders): rename App\Services\OrderService to OrderOwnershipService --- app/Cqs/Actions/Orders/CancelOrder.php | 6 +++--- app/Policies/Frontend/OrderPolicy.php | 6 +++--- ...rderService.php => OrderOwnershipService.php} | 2 +- ...iceTest.php => OrderOwnershipServiceTest.php} | 12 ++++++------ .../App/Policies/Frontend/OrderPolicyTest.php | 16 ++++++++-------- 5 files changed, 21 insertions(+), 21 deletions(-) rename app/Services/{OrderService.php => OrderOwnershipService.php} (96%) rename tests/Integration/WithApp/App/Services/{OrderServiceTest.php => OrderOwnershipServiceTest.php} (94%) diff --git a/app/Cqs/Actions/Orders/CancelOrder.php b/app/Cqs/Actions/Orders/CancelOrder.php index 6ae05985..0f533aec 100644 --- a/app/Cqs/Actions/Orders/CancelOrder.php +++ b/app/Cqs/Actions/Orders/CancelOrder.php @@ -6,7 +6,7 @@ namespace App\Cqs\Actions\Orders; use App\Contracts\Action; use App\Contracts\ActionInput; -use Domain\Services\OrderService as DomainOrderService; +use Domain\Services\OrderService; use Webmozart\Assert\Assert; /** @@ -15,7 +15,7 @@ use Webmozart\Assert\Assert; final class CancelOrder implements Action { public function __construct( - private readonly DomainOrderService $domainOrderService, + private readonly OrderService $orderService, ) { } @@ -27,6 +27,6 @@ final class CancelOrder implements Action { Assert::isInstanceOf($input, CancelOrderInput::class); - $this->domainOrderService->cancelOrder($input->order->getId()); + $this->orderService->cancelOrder($input->order->getId()); } } diff --git a/app/Policies/Frontend/OrderPolicy.php b/app/Policies/Frontend/OrderPolicy.php index 8d47d8ec..27266eac 100644 --- a/app/Policies/Frontend/OrderPolicy.php +++ b/app/Policies/Frontend/OrderPolicy.php @@ -8,12 +8,12 @@ use App\Dto\OrderDto; use App\Models\Customer; use App\Models\Order; use App\Models\User; -use App\Services\OrderService; +use App\Services\OrderOwnershipService; class OrderPolicy { public function __construct( - private readonly OrderService $orderService + private readonly OrderOwnershipService $orderOwnershipService ) { } @@ -32,7 +32,7 @@ class OrderPolicy return false; } - return $this->orderService->isOrderOwnedBy( + return $this->orderOwnershipService->isOrderOwnedBy( $order, $user, ); diff --git a/app/Services/OrderService.php b/app/Services/OrderOwnershipService.php similarity index 96% rename from app/Services/OrderService.php rename to app/Services/OrderOwnershipService.php index 621b6a8f..74271e34 100644 --- a/app/Services/OrderService.php +++ b/app/Services/OrderOwnershipService.php @@ -9,7 +9,7 @@ use App\Models\Customer; use App\Models\Order; use Domain\Models\ValueObjects\Matricule; -class OrderService +class OrderOwnershipService { public function isOrderOwnedBy(Order | OrderDto $order, Customer $customer): bool { diff --git a/tests/Integration/WithApp/App/Services/OrderServiceTest.php b/tests/Integration/WithApp/App/Services/OrderOwnershipServiceTest.php similarity index 94% rename from tests/Integration/WithApp/App/Services/OrderServiceTest.php rename to tests/Integration/WithApp/App/Services/OrderOwnershipServiceTest.php index c8a1aeda..cb520d36 100644 --- a/tests/Integration/WithApp/App/Services/OrderServiceTest.php +++ b/tests/Integration/WithApp/App/Services/OrderOwnershipServiceTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); use App\Models\Customer; use App\Models\Employee; use App\Models\Order; -use App\Services\OrderService; +use App\Services\OrderOwnershipService; use Carbon\CarbonImmutable; use Domain\Enums\OrderStatus; use Domain\Models\ValueObjects\Code; @@ -24,9 +24,9 @@ use Ramsey\Uuid\Uuid; uses(RefreshDatabase::class); -covers(OrderService::class); +covers(OrderOwnershipService::class); -describe('OrderService', function () { +describe('OrderOwnershipService', function () { it('returns true if order is owned by customer', function () { // GIVEN $customer = Customer::forceCreate([ @@ -58,7 +58,7 @@ describe('OrderService', function () { 'delivery_address' => new DeliveryAddress('Name', 'Addr', '00000', 'City'), ]); - $service = new OrderService(); + $service = new OrderOwnershipService(); // WHEN $result = $service->isOrderOwnedBy($order, $customer); @@ -98,7 +98,7 @@ describe('OrderService', function () { 'delivery_address' => new DeliveryAddress('Name', 'Addr', '00000', 'City'), ]); - $service = new OrderService(); + $service = new OrderOwnershipService(); // WHEN $result = $service->isOrderOwnedBy($order, $customer); @@ -124,7 +124,7 @@ describe('OrderService', function () { 'delivery_address' => new DeliveryAddress('Name', 'Addr', '00000', 'City'), ]); - $service = new OrderService(); + $service = new OrderOwnershipService(); // WHEN $result = $service->isOrderOwnedBy($order, $customer); diff --git a/tests/Unit/App/Policies/Frontend/OrderPolicyTest.php b/tests/Unit/App/Policies/Frontend/OrderPolicyTest.php index 9f7ace55..9d87cfe3 100644 --- a/tests/Unit/App/Policies/Frontend/OrderPolicyTest.php +++ b/tests/Unit/App/Policies/Frontend/OrderPolicyTest.php @@ -6,7 +6,7 @@ use App\Models\Customer; use App\Models\Order; use App\Models\User; use App\Policies\Frontend\OrderPolicy; -use App\Services\OrderService; +use App\Services\OrderOwnershipService; covers(OrderPolicy::class); @@ -14,7 +14,7 @@ describe('OrderPolicy', function () { describe('viewAnyOwn', function () { it('returns false when user is a User instance', function () { // GIVEN - $orderService = \Mockery::mock(OrderService::class); + $orderService = \Mockery::mock(OrderOwnershipService::class); $policy = new OrderPolicy($orderService); $user = \Mockery::mock(User::class); @@ -27,7 +27,7 @@ describe('OrderPolicy', function () { it('returns true when user is a Customer instance', function () { // GIVEN - $orderService = \Mockery::mock(OrderService::class); + $orderService = \Mockery::mock(OrderOwnershipService::class); $policy = new OrderPolicy($orderService); $customer = \Mockery::mock(Customer::class); @@ -40,7 +40,7 @@ describe('OrderPolicy', function () { it('returns true when user is null', function () { // GIVEN - $orderService = \Mockery::mock(OrderService::class); + $orderService = \Mockery::mock(OrderOwnershipService::class); $policy = new OrderPolicy($orderService); // WHEN @@ -54,7 +54,7 @@ describe('OrderPolicy', function () { describe('viewOwn', function () { it('returns false when user is null', function () { // GIVEN - $orderService = \Mockery::mock(OrderService::class); + $orderService = \Mockery::mock(OrderOwnershipService::class); $policy = new OrderPolicy($orderService); $order = \Mockery::mock(Order::class); @@ -67,7 +67,7 @@ describe('OrderPolicy', function () { it('returns false when user is a User instance', function () { // GIVEN - $orderService = \Mockery::mock(OrderService::class); + $orderService = \Mockery::mock(OrderOwnershipService::class); $policy = new OrderPolicy($orderService); $user = \Mockery::mock(User::class); $order = \Mockery::mock(Order::class); @@ -81,7 +81,7 @@ describe('OrderPolicy', function () { it('returns true when user is a Customer and owns the order', function () { // GIVEN - $orderService = \Mockery::mock(OrderService::class); + $orderService = \Mockery::mock(OrderOwnershipService::class); $policy = new OrderPolicy($orderService); $customer = \Mockery::mock(Customer::class); $order = \Mockery::mock(Order::class); @@ -100,7 +100,7 @@ describe('OrderPolicy', function () { it('returns false when user is a Customer and does not own the order', function () { // GIVEN - $orderService = \Mockery::mock(OrderService::class); + $orderService = \Mockery::mock(OrderOwnershipService::class); $policy = new OrderPolicy($orderService); $customer = \Mockery::mock(Customer::class); $order = \Mockery::mock(Order::class);