From f9bf20aa53514547977d74bd8416c8502a98ac85 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Tue, 17 Jan 2017 19:22:45 +0000
Subject: [PATCH] =?UTF-8?q?Delete=20subscriptions=20when=20unsubscribing.?=
 =?UTF-8?q?=20Fixes=C2=A0#2315?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnsubscribeSubscriberCommandHandler.php           | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php b/app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
index 7dac8828..cf43e1be 100644
--- a/app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
+++ b/app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
@@ -15,6 +15,13 @@ use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUnsubscribedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 
+/**
+ * This is the unsubscribe subscriber command class.
+ *
+ * @author Joseph Cohem <joe@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
+ */
 class UnsubscribeSubscriberCommandHandler
 {
     /**
@@ -28,8 +35,12 @@ class UnsubscribeSubscriberCommandHandler
     {
         $subscriber = $command->subscriber;
 
+        // First remove subscriptions.
+        $subscriber->subscriptions()->delete();
+
         event(new SubscriberHasUnsubscribedEvent($subscriber));
 
+        // Then remove the subscriber.
         $subscriber->delete();
     }
 }