Merge pull request #24 from yabhq/feat/cart-find-trashed-by-id

Feat/cart find trashed by
yabhq · Nov 4, 2021 · c243e76 · c243e76
2 parents 1403afc + b671b2b
commit c243e76
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/Checkout.php b/src/Checkout.php
@@ -35,15 +35,16 @@ public function __construct(protected Cart $cart)
      * Find a checkout by an existing ID.
      *
      * @param string $checkoutId
+     * @param bool $withTrashed
      *
      * @return \Yab\ShoppingCart\Checkout
      */
-    public static function findById(string $checkoutId) : Checkout
+    public static function findById(string $checkoutId, bool $withTrashed = false) : Checkout
     {
-        $checkout = Cart::find($checkoutId);
+        $checkout = $withTrashed ? Cart::withTrashed()->find($checkoutId) : Cart::find($checkoutId);
 
-        if (!$checkout) {
-            throw new CheckoutNotFoundException;
+        if (! $checkout) {
+            throw new CheckoutNotFoundException();
         }
 
         return new Checkout($checkout);

diff --git a/tests/Feature/CheckoutTest.php b/tests/Feature/CheckoutTest.php
@@ -16,6 +16,7 @@
 use Yab\ShoppingCart\Tests\Models\NonPurchaser;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Yab\ShoppingCart\Tests\Models\NonPurchaseable;
+use Yab\ShoppingCart\Exceptions\CheckoutNotFoundException;
 use Yab\ShoppingCart\Exceptions\PurchaserInvalidException;
 use Yab\ShoppingCart\Exceptions\ItemNotPurchaseableException;
 
@@ -50,6 +51,27 @@ public function a_checkout_can_be_retrieved_by_the_cart_id()
         $this->assertEquals($cart->id, $checkout->getCart()->id);
     }
 
+    /** @test */
+    public function a_deleted_checkout_can_be_retrieved_by_the_cart_id()
+    {
+        $cart = factory(Cart::class)->create();
+        $cart->delete();
+
+        $this->assertSoftDeleted('carts', [
+            'id' => $cart->id,
+        ]);
+
+        $this->expectException(CheckoutNotFoundException::class);
+
+        $checkout = Checkout::findById($cart->id);
+
+        // Try again withTrashed set to true
+        $checkout = Checkout::findById($cart->id, true);
+
+        $this->assertTrue($checkout instanceof Checkout);
+        $this->assertEquals($cart->id, $checkout->getCart()->id);
+    }
+
     /** @test */
     public function a_checkout_can_be_destroyed()
     {