Update error handling

karlomikus · Dec 21, 2023 · 36e1433 · 36e1433
1 parent 9ae418d
commit 36e1433
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/Http/Controllers/SubscriptionController.php b/app/Http/Controllers/SubscriptionController.php
@@ -55,7 +55,7 @@ public function updateSubscription(Request $request): JsonResponse
 
                 Mail::to($request->user())->queue(new SubscriptionChanged($type));
             } catch (Throwable $e) {
-                return response()->json($e->getMessage());
+                abort(400, $e->getMessage());
             }
 
             return response()->json(status: 204);
@@ -67,7 +67,7 @@ public function updateSubscription(Request $request): JsonResponse
 
                 Mail::to($request->user())->queue(new SubscriptionChanged($type));
             } catch (Throwable $e) {
-                return response()->json($e->getMessage());
+                abort(400, $e->getMessage());
             }
 
             return response()->json(status: 204);

diff --git a/tests/Feature/Http/SubscriptionControllerTest.php b/tests/Feature/Http/SubscriptionControllerTest.php
@@ -8,7 +8,9 @@
 use Laravel\Paddle\Cashier;
 use Kami\Cocktail\Models\User;
 use Laravel\Paddle\Subscription;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Config;
+use Kami\Cocktail\Mail\SubscriptionChanged;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
@@ -136,13 +138,15 @@ public function test_subscription_active_response(): void
 
     public function test_subscription_pause_response(): void
     {
+        Mail::fake();
         $user = auth()->user();
 
         Cashier::fake([
             'subscriptions/sub_12345/pause' => [
                 'data' => [
                     'status' => 'paused',
                     'paused_at' => now(),
+                    'items' => [],
                 ],
             ]
         ]);
@@ -164,18 +168,22 @@ public function test_subscription_pause_response(): void
         $response = $this->postJson('/api/billing/subscription', ['type' => 'pause']);
         $response->assertSuccessful();
 
+        Mail::assertQueued(SubscriptionChanged::class);
+
         $this->assertDatabaseHas('subscriptions', ['paddle_id' => 'sub_12345', 'status' => Subscription::STATUS_PAUSED]);
     }
 
     public function test_subscription_resume_response(): void
     {
+        Mail::fake();
         $user = auth()->user();
 
         Cashier::fake([
             'subscriptions/sub_12345/resume' => [
                 'data' => [
                     'status' => 'active',
                     'paused_at' => null,
+                    'items' => [],
                 ],
             ]
         ]);
@@ -197,6 +205,8 @@ public function test_subscription_resume_response(): void
         $response = $this->postJson('/api/billing/subscription', ['type' => 'resume']);
         $response->assertSuccessful();
 
+        Mail::assertQueued(SubscriptionChanged::class);
+
         $this->assertDatabaseHas('subscriptions', ['paddle_id' => 'sub_12345', 'status' => Subscription::STATUS_ACTIVE]);
     }
 }