Deletes custom fields associations when bulk deleting subscribers

lib/Models/Subscriber.php

@@ -748,7 +748,8 @@ class Subscriber extends Model {
     $count = parent::bulkAction($orm, function($subscriber_ids) {
       // delete all subscriber/segment relationships
       SubscriberSegment::deleteManySubscriptions($subscriber_ids);
-
+      // delete all subscriber/custom field relationships
+      SubscriberCustomField::deleteManySubscriberRelations($subscriber_ids);
       // delete subscribers (except WP Users)
       Subscriber::whereIn('id', $subscriber_ids)
         ->whereNull('wp_user_id')

lib/Models/SubscriberCustomField.php

@@ -89,4 +89,10 @@ class SubscriberCustomField extends Model {
     $relations = self::where('subscriber_id', $subscriber->id);
     return $relations->deleteMany();
   }
+
+  static function deleteManySubscriberRelations(array $subscriber_ids) {
+    if(empty($subscriber_ids)) return false;
+    $relations = self::whereIn('subscriber_id', $subscriber_ids);
+    return $relations->deleteMany();
+  }
 }

tests/unit/API/Endpoints/SubscribersTest.php

@@ -49,127 +49,6 @@ class SubscribersTest extends MailPoetTest {
     ));
   }
 
-  function testItCanGetASubscriber() {
-    $router = new Subscribers();
-
-    $response = $router->get(array('id' => 'not_an_id'));
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals(
-      'This subscriber does not exist.'
-    );
-
-    $response = $router->get(/* missing argument */);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals(
-      'This subscriber does not exist.'
-    );
-
-    $response = $router->get(array('id' => $this->subscriber_1->id));
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
-      Subscriber::findOne($this->subscriber_1->id)
-        ->withCustomFields()
-        ->withSubscriptions()
-        ->asArray()
-    );
-  }
-
-  function testItCanSaveANewSubscriber() {
-    $valid_data = array(
-      'email' => 'raul.doe@mailpoet.com',
-      'first_name' => 'Raul',
-      'last_name' => 'Doe',
-      'segments' => array(
-        $this->segment_1->id,
-        $this->segment_2->id
-      )
-    );
-
-    $router = new Subscribers();
-    $response = $router->save($valid_data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
-      Subscriber::where('email', 'raul.doe@mailpoet.com')
-        ->findOne()
-        ->asArray()
-    );
-
-    $subscriber = Subscriber::where('email', 'raul.doe@mailpoet.com')->findOne();
-    $subscriber_segments = $subscriber->segments()->findMany();
-    expect($subscriber_segments)->count(2);
-    expect($subscriber_segments[0]->name)->equals($this->segment_1->name);
-    expect($subscriber_segments[1]->name)->equals($this->segment_2->name);
-
-    $response = $router->save(/* missing data */);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])
-      ->equals('Please enter your email address');
-
-    $invalid_data = array(
-      'email' => 'john.doe@invalid'
-    );
-
-    $response = $router->save($invalid_data);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])
-      ->equals('Your email address is invalid!');
-  }
-
-  function testItCanSaveAnExistingSubscriber() {
-    $router = new Subscribers();
-    $subscriber_data = $this->subscriber_2->asArray();
-    unset($subscriber_data['created_at']);
-    $subscriber_data['segments'] = array($this->segment_1->id);
-    $subscriber_data['first_name'] = 'Super Jane';
-
-    $response = $router->save($subscriber_data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
-      Subscriber::findOne($this->subscriber_2->id)->asArray()
-    );
-    expect($response->data['first_name'])->equals('Super Jane');
-  }
-
-  function testItCanRemoveListsFromAnExistingSubscriber() {
-    $router = new Subscribers();
-    $subscriber_data = $this->subscriber_2->asArray();
-    unset($subscriber_data['created_at']);
-    unset($subscriber_data['segments']);
-
-    $response = $router->save($subscriber_data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
-      Subscriber::findOne($this->subscriber_2->id)->asArray()
-    );
-    expect($this->subscriber_2->segments()->findArray())->count(0);
-  }
-
-  function testItCanRestoreASubscriber() {
-    $this->subscriber_1->trash();
-
-    $trashed_subscriber = Subscriber::findOne($this->subscriber_1->id);
-    expect($trashed_subscriber->deleted_at)->notNull();
-
-    $router = new Subscribers();
-    $response = $router->restore(array('id' => $this->subscriber_1->id));
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
-      Subscriber::findOne($this->subscriber_1->id)->asArray()
-    );
-    expect($response->data['deleted_at'])->null();
-    expect($response->meta['count'])->equals(1);
-  }
-
-  function testItCanTrashASubscriber() {
-    $router = new Subscribers();
-    $response = $router->trash(array('id' => $this->subscriber_2->id));
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
-      Subscriber::findOne($this->subscriber_2->id)->asArray()
-    );
-    expect($response->data['deleted_at'])->notNull();
-    expect($response->meta['count'])->equals(1);
-  }
 
   function testItCanDeleteASubscriber() {
     $router = new Subscribers();

tests/unit/Models/SubscriberCustomFieldTest.php

@@ -5,14 +5,20 @@ class SubscriberCustomFieldTest extends MailPoetTest {
   function __construct() {
     $this->data = array(
       array(
-        10, // custom_field_id
-        12, // subscriber_id
-        'Test 1' // value
+        10,
+        // custom_field_id
+        12,
+        // subscriber_id
+        'Test 1'
+        // value
       ),
       array(
-        10, // custom_field_id
-        13, // subscriber_id
-        'Test 2' // value
+        10,
+        // custom_field_id
+        13,
+        // subscriber_id
+        'Test 2'
+        // value
       )
     );
   }
@@ -45,6 +51,26 @@ class SubscriberCustomFieldTest extends MailPoetTest {
     expect($records[1]['value'])->equals('Test 2');
   }
 
+  function testItCanDeleteManySubscriberRelations() {
+    SubscriberCustomField::createMultiple($this->data);
+    SubscriberCustomField::deleteManySubscriberRelations(
+      array(
+        $this->data[0][1],
+        $this->data[1][1]
+      )
+    );
+    $records = SubscriberCustomField::findArray();
+    expect($records)->isEmpty();
+  }
+
+  function testItCanDeleteSubscriberRelations() {
+    SubscriberCustomField::createMultiple($this->data);
+    $subscriber = (object)array('id' => $this->data[0][1]);
+    SubscriberCustomField::deleteSubscriberRelations($subscriber);
+    $records = SubscriberCustomField::findArray();
+    expect($records)->count(1);
+  }
+
   function _after() {
     ORM::forTable(SubscriberCustomField::$_table)
       ->deleteMany();