Use scheduled task subscriber listing repository in API endpoint

[MAILPOET-4006]

mailpoet/assets/js/src/newsletters/sending_status.jsx

@@ -150,8 +150,8 @@ function ListingItem({
     'has-row-actions'
   );
   let status = MailPoet.I18n.t('unprocessed');
-  if (processed === '1') {
+  if (processed) {
-    if (failed === '1') {
+    if (failed) {
       status = (
         <span>
           {MailPoet.I18n.t('failed')}
@@ -197,12 +197,12 @@ function ListingItem({
 ListingItem.propTypes = {
   error: PropTypes.string,
   email: PropTypes.string.isRequired,
-  failed: PropTypes.string.isRequired,
+  failed: PropTypes.number.isRequired,
-  taskId: PropTypes.string.isRequired,
+  taskId: PropTypes.number.isRequired,
   lastName: PropTypes.string.isRequired,
   firstName: PropTypes.string.isRequired,
-  processed: PropTypes.string.isRequired,
+  processed: PropTypes.number.isRequired,
-  subscriberId: PropTypes.string.isRequired,
+  subscriberId: PropTypes.number.isRequired,
 };
 ListingItem.defaultProps = {
   error: '',

mailpoet/lib/API/JSON/ResponseBuilders/ScheduledTaskSubscriberResponseBuilder.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace MailPoet\API\JSON\ResponseBuilders;
+
+use MailPoet\Entities\ScheduledTaskSubscriberEntity;
+
+class ScheduledTaskSubscriberResponseBuilder {
+  public function build(ScheduledTaskSubscriberEntity $scheduledSubscriber) {
+    $subscriber = $scheduledSubscriber->getSubscriber();
+    $task = $scheduledSubscriber->getTask();
+    return [
+      'processed' => $scheduledSubscriber->getProcessed(),
+      'failed' => $scheduledSubscriber->getFailed(),
+      'error' => $scheduledSubscriber->getError(),
+      'taskId' => $task ? $task->getId() : null,
+      'email' => $subscriber ? $subscriber->getEmail() : null,
+      'subscriberId' => $subscriber ? $subscriber->getId() : null,
+      'firstName' => $subscriber ? $subscriber->getFirstName() : null,
+      'lastName' => $subscriber ? $subscriber->getLastName() : null,
+    ];
+  }
+
+  public function buildForListing(array $scheduledSubscribers) {
+    $data = [];
+    foreach ($scheduledSubscribers as $scheduledSubscriber) {
+      $data[] = $this->build($scheduledSubscriber);
+    }
+    return $data;
+  }
+}

mailpoet/lib/API/JSON/v1/SendingTaskSubscribers.php

@@ -4,6 +4,7 @@ namespace MailPoet\API\JSON\v1;
 
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
+use MailPoet\API\JSON\ResponseBuilders\ScheduledTaskSubscriberResponseBuilder;
 use MailPoet\Config\AccessControl;
 use MailPoet\Cron\CronHelper;
 use MailPoet\Listing;
@@ -11,6 +12,7 @@ use MailPoet\Models\Newsletter;
 use MailPoet\Models\ScheduledTask;
 use MailPoet\Models\ScheduledTaskSubscriber;
 use MailPoet\Models\SendingQueue as SendingQueueModel;
+use MailPoet\Newsletter\Sending\ScheduledTaskSubscribersListingRepository;
 use MailPoet\Newsletter\Sending\SendingQueuesRepository;
 use MailPoet\Settings\SettingsController;
 use MailPoet\WP\Functions as WPFunctions;
@@ -35,17 +37,27 @@ class SendingTaskSubscribers extends APIEndpoint {
   /** @var SendingQueuesRepository */
   private $sendingQueuesRepository;
 
+  /** @var ScheduledTaskSubscribersListingRepository */
+  private $taskSubscribersListingRepository;
+
+  /** @var ScheduledTaskSubscriberResponseBuilder */
+  private $scheduledTaskSubscriberResponseBuilder;
+
   public function __construct(
     Listing\Handler $listingHandler,
     SettingsController $settings,
     CronHelper $cronHelper,
     SendingQueuesRepository $sendingQueuesRepository,
+    ScheduledTaskSubscribersListingRepository $taskSubscribersListingRepository,
+    ScheduledTaskSubscriberResponseBuilder $scheduledTaskSubscriberResponseBuilder,
     WPFunctions $wp
   ) {
     $this->listingHandler = $listingHandler;
     $this->settings = $settings;
     $this->cronHelper = $cronHelper;
     $this->sendingQueuesRepository = $sendingQueuesRepository;
+    $this->taskSubscribersListingRepository = $taskSubscribersListingRepository;
+    $this->scheduledTaskSubscriberResponseBuilder = $scheduledTaskSubscriberResponseBuilder;
     $this->wp = $wp;
   }
 
@@ -64,17 +76,16 @@ class SendingTaskSubscribers extends APIEndpoint {
       ]);
     }
     $data['params']['task_ids'] = $tasksIds;
-    $listingData = $this->listingHandler->get('\MailPoet\Models\ScheduledTaskSubscriber', $data);
+    $definition = $this->listingHandler->getListingDefinition($data);
+    $items = $this->taskSubscribersListingRepository->getData($definition);
+    $groups = $this->taskSubscribersListingRepository->getGroups($definition);
+    $filters = $this->taskSubscribersListingRepository->getFilters($definition);
+    $count = $this->taskSubscribersListingRepository->getCount($definition);
 
-    $items = [];
+    return $this->successResponse($this->scheduledTaskSubscriberResponseBuilder->buildForListing($items), [
-    foreach ($listingData['items'] as $item) {
+      'count' => $count,
-      $items[] = $item->asArray();
+      'filters' => $filters,
-    }
+      'groups' => $groups,
-
-    return $this->successResponse($items, [
-      'count' => $listingData['count'],
-      'filters' => $listingData['filters'],
-      'groups' => $listingData['groups'],
       'mta_log' => $this->settings->get('mta_log'),
       'mta_method' => $this->settings->get('mta.method'),
       'cron_accessible' => $this->cronHelper->isDaemonAccessible(),

mailpoet/lib/DI/ContainerConfigurator.php

@@ -92,6 +92,7 @@ class ContainerConfigurator implements IContainerConfigurator {
     $container->autowire(\MailPoet\API\JSON\ResponseBuilders\FormsResponseBuilder::class)->setPublic(true);
     $container->autowire(\MailPoet\API\JSON\ResponseBuilders\SegmentsResponseBuilder::class)->setPublic(true);
     $container->autowire(\MailPoet\API\JSON\ResponseBuilders\DynamicSegmentsResponseBuilder::class)->setPublic(true);
+    $container->autowire(\MailPoet\API\JSON\ResponseBuilders\ScheduledTaskSubscriberResponseBuilder::class)->setPublic(true);
     // Automatic emails
     $container->autowire(\MailPoet\AutomaticEmails\AutomaticEmails::class)->setPublic(true);
     $container->autowire(\MailPoet\AutomaticEmails\AutomaticEmailFactory::class)->setPublic(true);

mailpoet/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php

@@ -99,22 +99,22 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
 
   public function testItReturnsListing() {
     $sentSubscriberStatus = [
-      'error' => '',
+      'error' => null,
       'failed' => 0,
       'processed' => 1,
-      'taskId' => $this->taskId,
+      'taskId' => (int)$this->taskId,
       'email' => $this->sentSubscriber->email,
-      'subscriberId' => $this->sentSubscriber->id,
+      'subscriberId' => (int)$this->sentSubscriber->id,
       'lastName' => $this->sentSubscriber->last_name,
       'firstName' => $this->sentSubscriber->first_name,
     ];
     $unprocessedSubscriberStatus = [
-      'error' => '',
+      'error' => null,
       'failed' => 0,
       'processed' => 0,
-      'taskId' => $this->taskId,
+      'taskId' => (int)$this->taskId,
       'email' => $this->unprocessedSubscriber->email,
-      'subscriberId' => $this->unprocessedSubscriber->id,
+      'subscriberId' => (int)$this->unprocessedSubscriber->id,
       'lastName' => $this->unprocessedSubscriber->last_name,
       'firstName' => $this->unprocessedSubscriber->first_name,
     ];
@@ -122,9 +122,9 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'error' => 'Something went wrong!',
       'failed' => 1,
       'processed' => 1,
-      'taskId' => $this->taskId,
+      'taskId' => (int)$this->taskId,
       'email' => $this->failedSubscriber->email,
-      'subscriberId' => $this->failedSubscriber->id,
+      'subscriberId' => (int)$this->failedSubscriber->id,
       'lastName' => $this->failedSubscriber->last_name,
       'firstName' => $this->failedSubscriber->first_name,
     ];