Manage subscriptions

- make use of the SubscriberSegment::status column to keep track of unsubscriptions
- unsubscribed segments now appear grayed out in the Subscribers listing
- added unsubscribed_at after segment names when editing a subscriber
- added date() method for Twig (uses WP's date format / date_offset)
- fixed typo in Form iframe export
- fixed unit test for Newsletters
- updated selection component (JSX) to allow more customization

lib/Router/Forms.php

@@ -13,11 +13,10 @@ class Forms {
 
   function get($id = false) {
     $form = Form::findOne($id);
-    if($form === false) {
-      return false;
-    } else {
-      return $form->asArray();
+    if($form !== false) {
+      $form = $form->asArray();
     }
+    return $form;
   }
 
   function listing($data = array()) {
@@ -29,19 +28,14 @@ class Forms {
     $listing_data = $listing->get();
 
     // fetch segments relations for each returned item
-    foreach($listing_data['items'] as &$item) {
-      // form's segments
-      $form_settings = (
-        (is_serialized($item['settings']))
-        ? unserialize($item['settings'])
-        : array()
-      );
-
-      $item['segments'] = (
-        !empty($form_settings['segments'])
-        ? $form_settings['segments']
+    foreach($listing_data['items'] as $key => $form) {
+      $form = $form->asArray();
+      $form['segments'] = (
+        !empty($form['settings']['segments'])
+        ? $form['settings']['segments']
         : array()
       );
+      $listing_data['items'][$key] = $form;
     }
 
     return $listing_data;

lib/Router/Newsletters.php

@@ -206,20 +206,11 @@ class Newsletters {
 
     $listing_data = $listing->get();
 
-    foreach($listing_data['items'] as &$item) {
-      // get segments
-      $segments = NewsletterSegment::select('segment_id')
-        ->where('newsletter_id', $item['id'])
-        ->findMany();
-      $item['segments'] = array_map(function($relation) {
-        return $relation->segment_id;
-      }, $segments);
-
-      // get queue
-      $queue = SendingQueue::where('newsletter_id', $item['id'])
-        ->orderByDesc('updated_at')
-        ->findOne();
-      $item['queue'] = ($queue !== false) ? $queue->asArray() : null;
+    foreach($listing_data['items'] as $key => $newsletter) {
+      $listing_data['items'][$key] = $newsletter
+        ->withSegments()
+        ->withSendingQueue()
+        ->asArray();
     }
 
     return $listing_data;

lib/Router/Segments.php

@@ -30,36 +30,14 @@ class Segments {
     $listing_data = $listing->get();
 
     // fetch segments relations for each returned item
-    foreach($listing_data['items'] as &$item) {
-      $stats = SubscriberSegment::table_alias('relation')
-        ->where(
-          'relation.segment_id',
-          $item['id']
-        )
-        ->join(
-          MP_SUBSCRIBERS_TABLE,
-          'subscribers.id = relation.subscriber_id',
-          'subscribers'
-        )
-        ->select_expr(
-          'SUM(CASE subscribers.status WHEN "subscribed" THEN 1 ELSE 0 END)',
-          'subscribed'
-        )
-        ->select_expr(
-          'SUM(CASE subscribers.status WHEN "unsubscribed" THEN 1 ELSE 0 END)',
-          'unsubscribed'
-        )
-        ->select_expr(
-          'SUM(CASE subscribers.status WHEN "unconfirmed" THEN 1 ELSE 0 END)',
-          'unconfirmed'
-        )
-        ->findOne()->asArray();
-
-      $item = array_merge($item, $stats);
-
-      $item['subscribers_url'] = admin_url(
-        'admin.php?page=mailpoet-subscribers#/filter[segment='.$item['id'].']'
+    foreach($listing_data['items'] as $key => $segment) {
+      $segment->subscribers_url = admin_url(
+        'admin.php?page=mailpoet-subscribers#/filter[segment='.$segment->id.']'
       );
+
+      $listing_data['items'][$key] = $segment
+        ->withSubscribersCount()
+        ->asArray();
     }
 
     return $listing_data;

lib/Router/Subscribers.php

@@ -17,15 +17,12 @@ class Subscribers {
 
   function get($id = false) {
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false && $subscriber->id() > 0) {
-      $segments = $subscriber->segments()->findArray();
-
-      $subscriber = $subscriber->withCustomFields()->asArray();
-      $subscriber['segments'] = array_map(function($segment) {
-        return $segment['id'];
-      }, $segments);
+    if($subscriber !== false) {
+      $subscriber = $subscriber
+        ->withCustomFields()
+        ->withSubscriptions()
+        ->asArray();
     }
-
     return $subscriber;
   }
 
@@ -38,19 +35,10 @@ class Subscribers {
     $listing_data = $listing->get();
 
     // fetch segments relations for each returned item
-    foreach($listing_data['items'] as &$item) {
-      // avatar
-      $item['avatar_url'] = get_avatar_url($item['email'], array(
-        'size' => 32
-      ));
-
-      // subscriber's segments
-      $relations = SubscriberSegment::select('segment_id')
-        ->where('subscriber_id', $item['id'])
-        ->findMany();
-      $item['segments'] = array_map(function($relation) {
-        return $relation->segment_id;
-      }, $relations);
+    foreach($listing_data['items'] as $key => $subscriber) {
+      $listing_data['items'][$key] = $subscriber
+        ->withSubscriptions()
+        ->asArray();
     }
 
     return $listing_data;