Use order instead of order number in invoice repository

spec/CommandHandler/SendInvoiceEmailHandlerSpec.php

@@ -40,10 +40,10 @@ public function it_requests_an_email_with_an_invoice_to_be_sent(
         OrderInterface $order,
         CustomerInterface $customer
     ): void {
-        $invoiceRepository->findOneByOrderNumber('0000001')->willReturn($invoice);
-
         $orderRepository->findOneByNumber('0000001')->willReturn($order);
 
+        $invoiceRepository->findOneByOrder($order)->willReturn($invoice);
+
         $order->getCustomer()->willReturn($customer);
 
         $customer->getEmail()->willReturn('[email protected]');
@@ -60,8 +60,8 @@ public function it_does_not_request_an_email_to_be_sent_if_invoice_was_not_found
         OrderInterface $order,
         CustomerInterface $customer
     ): void {
-        $invoiceRepository->findOneByOrderNumber('0000001')->willReturn(null);
         $orderRepository->findOneByNumber('0000001')->willReturn($order);
+        $invoiceRepository->findOneByOrder($order)->willReturn(null);
 
         $order->getCustomer()->shouldNotBeCalled();
         $customer->getEmail()->shouldNotBeCalled();

spec/Creator/InvoiceCreatorSpec.php

@@ -45,10 +45,10 @@ public function it_creates_invoice_for_order(
         OrderInterface $order,
         InvoiceInterface $invoice
     ): void {
-        $invoiceRepository->findOneByOrderNumber('0000001')->willReturn(null);
-
         $orderRepository->findOneByNumber('0000001')->willReturn($order);
 
+        $invoiceRepository->findOneByOrder($order)->willReturn(null);
+
         $invoiceDateTime = new \DateTimeImmutable('2019-02-25');
 
         $invoiceGenerator->generateForOrder($order, $invoiceDateTime)->willReturn($invoice);
@@ -62,17 +62,19 @@ public function it_throws_an_exception_when_invoice_was_already_created_for_give
         InvoiceRepositoryInterface $invoiceRepository,
         OrderRepositoryInterface $orderRepository,
         InvoiceGeneratorInterface $invoiceGenerator,
+        OrderInterface $order,
         InvoiceInterface $invoice
     ): void {
-        $invoiceRepository->findOneByOrderNumber('0000001')->willReturn($invoice);
+        $orderRepository->findOneByNumber('0000001')->willReturn($order);
+        $invoiceRepository->findOneByOrder($order)->willReturn($invoice);
 
         $invoiceDateTime = new \DateTimeImmutable('2019-02-25');
 
-        $orderRepository->findOneByNumber(Argument::any())->shouldNotBeCalled();
         $invoiceGenerator->generateForOrder(Argument::any(), Argument::any())->shouldNotBeCalled();
         $invoiceRepository->add(Argument::any())->shouldNotBeCalled();
 
-        $this->shouldThrow(InvoiceAlreadyGenerated::withOrderNumber('0000001'))
+        $this
+            ->shouldThrow(InvoiceAlreadyGenerated::withOrderNumber('0000001'))
             ->during('__invoke', ['0000001', $invoiceDateTime])
         ;
     }

spec/EventProducer/OrderPaymentPaidProducerSpec.php

@@ -50,7 +50,7 @@ public function it_dispatches_order_payment_paid_event_for_payment(
 
         $event = new OrderPaymentPaid('0000001', $dateTime);
 
-        $invoiceRepository->findOneByOrderNumber('0000001')->willReturn($invoice);
+        $invoiceRepository->findOneByOrder($order)->willReturn($invoice);
 
         $eventBus->dispatch($event)->shouldBeCalled()->willReturn(new Envelope($event));
 
@@ -80,7 +80,7 @@ public function it_does_not_dispatch_event_when_there_is_no_invoice_related_to_o
     ): void {
         $payment->getOrder()->willReturn($order);
         $order->getNumber()->willReturn('0000001');
-        $invoiceRepository->findOneByOrderNumber('0000001')->willReturn(null);
+        $invoiceRepository->findOneByOrder($order)->willReturn(null);
 
         $eventBus->dispatch(Argument::any())->shouldNotBeCalled();
         $dateTimeProvider->__invoke()->shouldNotBeCalled();

src/CommandHandler/SendInvoiceEmailHandler.php

@@ -43,16 +43,16 @@ public function __construct(
 
     public function __invoke(SendInvoiceEmail $command): void
     {
+        /** @var OrderInterface $order */
+        $order = $this->orderRepository->findOneByNumber($command->orderNumber());
+
         /** @var InvoiceInterface|null $invoice */
-        $invoice = $this->invoiceRepository->findOneByOrderNumber($command->orderNumber());
+        $invoice = $this->invoiceRepository->findOneByOrder($order);
 
         if (null === $invoice) {
             return;
         }
 
-        /** @var OrderInterface $order */
-        $order = $this->orderRepository->findOneByNumber($command->orderNumber());
-
         if (null === $order->getCustomer()) {
             return;
         }

src/Creator/InvoiceCreator.php

@@ -43,16 +43,16 @@ public function __construct(
 
     public function __invoke(string $orderNumber, \DateTimeInterface $dateTime): void
     {
+        /** @var OrderInterface $order */
+        $order = $this->orderRepository->findOneByNumber($orderNumber);
+
         /** @var InvoiceInterface|null $invoice */
-        $invoice = $this->invoiceRepository->findOneByOrderNumber($orderNumber);
+        $invoice = $this->invoiceRepository->findOneByOrder($order);
 
         if (null !== $invoice) {
             throw InvoiceAlreadyGenerated::withOrderNumber($orderNumber);
         }
 
-        /** @var OrderInterface $order */
-        $order = $this->orderRepository->findOneByNumber($orderNumber);
-
         $invoice = $this->invoiceGenerator->generateForOrder($order, $dateTime);
 
         $this->invoiceRepository->add($invoice);

src/Doctrine/ORM/InvoiceRepository.php

@@ -14,14 +14,15 @@
 namespace Sylius\InvoicingPlugin\Doctrine\ORM;
 
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\InvoicingPlugin\Entity\InvoiceInterface;
 
 class InvoiceRepository extends EntityRepository implements InvoiceRepositoryInterface
 {
-    public function findOneByOrderNumber(string $orderNumber): ?InvoiceInterface
+    public function findOneByOrder(OrderInterface $order): ?InvoiceInterface
     {
         /** @var InvoiceInterface|null $invoice */
-        $invoice = $this->findOneBy(['orderNumber' => $orderNumber]);
+        $invoice = $this->findOneBy(['order' => $order]);
 
         return $invoice;
     }

src/Doctrine/ORM/InvoiceRepositoryInterface.php

@@ -13,10 +13,11 @@
 
 namespace Sylius\InvoicingPlugin\Doctrine\ORM;
 
+use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\InvoicingPlugin\Entity\InvoiceInterface;
 
 interface InvoiceRepositoryInterface extends RepositoryInterface
 {
-    public function findOneByOrderNumber(string $orderNumber): ?InvoiceInterface;
+    public function findOneByOrder(OrderInterface $order): ?InvoiceInterface;
 }

src/Entity/Invoice.php

@@ -116,7 +116,7 @@ public function order(): OrderInterface
 
     public function orderNumber(): string
     {
-        return $this->order->getNumber();
+        return (string) $this->order->getNumber();
     }
 
     public function issuedAt(): \DateTimeInterface

src/EventProducer/OrderPaymentPaidProducer.php

@@ -63,6 +63,6 @@ private function shouldEventBeDispatched(PaymentInterface $payment): bool
         /** @var OrderInterface $order */
         $order = $payment->getOrder();
 
-        return null !== $order && null !== $this->invoiceRepository->findOneByOrderNumber($order->getNumber());
+        return null !== $order && null !== $this->invoiceRepository->findOneByOrder($order);
     }
 }

src/Migrations/Version20210607115930.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\InvoicingPlugin\Migrations;