Merge pull request #16 from yabhq/fix/checkout-deletion

Automatically delete cart after payment, better checkout 404 response

Author: jimhlad

src/Checkout.php

@@ -19,6 +19,7 @@
 use Yab\ShoppingCart\Payments\FailedPaymentProvider;
 use Yab\ShoppingCart\Payments\StripePaymentProvider;
 use Yab\ShoppingCart\Exceptions\PaymentFailedException;
+use Yab\ShoppingCart\Exceptions\CheckoutNotFoundException;
 use Yab\ShoppingCart\Exceptions\PurchaserInvalidException;
 use Yab\ShoppingCart\Exceptions\ItemNotPurchaseableException;
 use Yab\ShoppingCart\Exceptions\PaymentProviderInvalidException;
@@ -51,7 +52,13 @@ public function __construct(protected Cart $cart)
      */
     public static function findById(string $checkoutId) : Checkout
     {
-        return new Checkout(Cart::findOrFail($checkoutId));
+        $checkout = Cart::find($checkoutId);
+
+        if (!$checkout) {
+            throw new CheckoutNotFoundException;
+        }
+
+        return new Checkout($checkout);
     }
 
     /**

src/Exceptions/CheckoutNotFoundException.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Yab\ShoppingCart\Exceptions;
+
+use Exception;
+use Illuminate\Http\Response;
+
+class CheckoutNotFoundException extends Exception
+{
+    /**
+     * Report or log an exception.
+     *
+     * @return void
+     */
+    public function report()
+    {
+        //
+    }
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request)
+    {
+        return response()->json([
+            'message' => 'The specified checkout does not exist',
+        ], Response::HTTP_NOT_FOUND);
+    }
+}

src/Http/Controllers/Checkout/CheckoutStripeController.php

@@ -22,6 +22,7 @@ public function store(CheckoutStripeRequest $request, string $checkoutId)
         $checkout = Checkout::findById($checkoutId);
 
         $checkout->setPaymentProvider('stripe')->charge([ 'token' => $request->token ]);
+        $checkout->getCart()->delete();
 
         return new CheckoutResource($checkout);
     }

tests/Feature/Api/CheckoutTest.php

@@ -65,6 +65,18 @@ public function an_existing_checkout_can_be_retrieved_via_the_api()
         ]);
     }
 
+    /** @test */
+    public function a_non_existent_checkout_returns_a_404_not_found_response()
+    {
+        $response = $this->get(route('checkout.show', [ 'invalid-uuid' ]));
+    
+        $response->assertNotFound();
+
+        $response->assertJson([
+            'message' => 'The specified checkout does not exist',
+        ]);
+    }
+
     /** @test */
     public function a_checkout_shipping_address_can_be_updated_via_the_api()
     {

tests/Feature/CheckoutTest.php

@@ -16,7 +16,6 @@
 use Yab\ShoppingCart\Tests\Models\NonPurchaser;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Yab\ShoppingCart\Tests\Models\NonPurchaseable;
-use Yab\ShoppingCart\Payments\LocalPaymentProvider;
 use Yab\ShoppingCart\Payments\StripePaymentProvider;
 use Yab\ShoppingCart\Exceptions\PurchaserInvalidException;
 use Yab\ShoppingCart\Exceptions\ItemNotPurchaseableException;