[10.x] Implementation without changing most contracts

Author: rez1dent3

src/Internal/Dto/ItemDto.php

@@ -5,6 +5,7 @@
 namespace Bavix\Wallet\Internal\Dto;
 
 use Bavix\Wallet\Interfaces\ProductInterface;
+use Bavix\Wallet\Interfaces\Wallet;
 
 /** @immutable */
 final class ItemDto implements ItemDtoInterface
@@ -13,6 +14,7 @@ public function __construct(
         private readonly ProductInterface $product,
         private readonly int $quantity,
         private readonly int|string|null $pricePerItem,
+        private readonly ?Wallet $receiving,
     ) {
     }
 
@@ -38,4 +40,9 @@ public function count(): int
     {
         return $this->quantity;
     }
+
+    public function getReceiving(): ?Wallet
+    {
+        return $this->receiving;
+    }
 }

src/Internal/Dto/ItemDtoInterface.php

@@ -5,6 +5,7 @@
 namespace Bavix\Wallet\Internal\Dto;
 
 use Bavix\Wallet\Interfaces\ProductInterface;
+use Bavix\Wallet\Interfaces\Wallet;
 use Countable;
 
 interface ItemDtoInterface extends Countable
@@ -17,4 +18,6 @@ public function getItems(): array;
     public function getPricePerItem(): int|string|null;
 
     public function getProduct(): ProductInterface;
+
+    public function getReceiving(): ?Wallet;
 }

src/Objects/Cart.php

@@ -7,6 +7,7 @@
 use Bavix\Wallet\Interfaces\CartInterface;
 use Bavix\Wallet\Interfaces\Customer;
 use Bavix\Wallet\Interfaces\ProductInterface;
+use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Dto\BasketDto;
 use Bavix\Wallet\Internal\Dto\BasketDtoInterface;
 use Bavix\Wallet\Internal\Dto\ItemDto;
@@ -58,14 +59,18 @@ public function withMeta(array $meta): self
     /**
      * @param positive-int $quantity
      */
-    public function withItem(ProductInterface $product, int $quantity = 1, int|string|null $pricePerItem = null): self
-    {
+    public function withItem(
+        ProductInterface $product,
+        int $quantity = 1,
+        int|string|null $pricePerItem = null,
+        ?Wallet $receiving = null,
+    ): self {
         $self = clone $this;
 
         $productId = $self->productId($product);
 
         $self->items[$productId] ??= [];
-        $self->items[$productId][] = new ItemDto($product, $quantity, $pricePerItem);
+        $self->items[$productId][] = new ItemDto($product, $quantity, $pricePerItem, $receiving);
 
         return $self;
     }

src/Services/EagerLoaderService.php

@@ -4,6 +4,7 @@
 
 namespace Bavix\Wallet\Services;
 
+use Bavix\Wallet\Interfaces\Customer;
 use Bavix\Wallet\Internal\Dto\BasketDtoInterface;
 use Bavix\Wallet\Internal\Repository\WalletRepositoryInterface;
 use Bavix\Wallet\Models\Wallet;
@@ -19,7 +20,7 @@ public function __construct(
     ) {
     }
 
-    public function loadWalletsByBasket(BasketDtoInterface $basketDto): void
+    public function loadWalletsByBasket(Customer $customer, BasketDtoInterface $basketDto): void
     {
         $products = [];
         /** @var array<array-key, array<array-key, int|string>> $productGroupIds */

src/Services/EagerLoaderServiceInterface.php

@@ -4,6 +4,7 @@
 
 namespace Bavix\Wallet\Services;
 
+use Bavix\Wallet\Interfaces\Customer;
 use Bavix\Wallet\Internal\Dto\BasketDtoInterface;
 
 /**
@@ -13,5 +14,5 @@
  */
 interface EagerLoaderServiceInterface
 {
-    public function loadWalletsByBasket(BasketDtoInterface $basketDto): void;
+    public function loadWalletsByBasket(Customer $customer, BasketDtoInterface $basketDto): void;
 }

src/Traits/CartPay.php

@@ -54,7 +54,7 @@ public function payFreeCart(CartInterface $cart): array
             $basketDto = $cart->getBasketDto();
             $basketService = app(BasketServiceInterface::class);
             $availabilityAssembler = app(AvailabilityDtoAssemblerInterface::class);
-            app(EagerLoaderServiceInterface::class)->loadWalletsByBasket($basketDto);
+            app(EagerLoaderServiceInterface::class)->loadWalletsByBasket($this, $basketDto);
             if (! $basketService->availability($availabilityAssembler->create($this, $basketDto, false))) {
                 throw new ProductEnded(
                     app(TranslatorServiceInterface::class)->get('wallet::errors.product_stock'),
@@ -112,7 +112,7 @@ public function payCart(CartInterface $cart, bool $force = false): array
             $basketDto = $cart->getBasketDto();
             $basketService = app(BasketServiceInterface::class);
             $availabilityAssembler = app(AvailabilityDtoAssemblerInterface::class);
-            app(EagerLoaderServiceInterface::class)->loadWalletsByBasket($basketDto);
+            app(EagerLoaderServiceInterface::class)->loadWalletsByBasket($this, $basketDto);
             if (! $basketService->availability($availabilityAssembler->create($this, $basketDto, $force))) {
                 throw new ProductEnded(
                     app(TranslatorServiceInterface::class)->get('wallet::errors.product_stock'),
@@ -190,7 +190,7 @@ public function refundCart(CartInterface $cart, bool $force = false, bool $gifts
     {
         return app(AtomicServiceInterface::class)->block($this, function () use ($cart, $force, $gifts) {
             $basketDto = $cart->getBasketDto();
-            app(EagerLoaderServiceInterface::class)->loadWalletsByBasket($basketDto);
+            app(EagerLoaderServiceInterface::class)->loadWalletsByBasket($this, $basketDto);
             $transfers = app(PurchaseServiceInterface::class)->already($this, $basketDto, $gifts);
             if (count($transfers) !== $basketDto->total()) {
                 throw new ModelNotFoundException(

tests/Units/Domain/BasketTest.php

@@ -18,8 +18,8 @@ final class BasketTest extends TestCase
     public function testCount(): void
     {
         $item = new Item();
-        $productDto1 = new ItemDto($item, 24, null);
-        $productDto2 = new ItemDto($item, 26, null);
+        $productDto1 = new ItemDto($item, 24, null, null);
+        $productDto2 = new ItemDto($item, 26, null, null);
         $basket = new BasketDto([$productDto1, $productDto2], []);
 
         self::assertEmpty($basket->meta());