Fix acceptance tests, update counters [MAILPOET-903]

lib/API/JSON/v1/Newsletters.php

@@ -166,12 +166,15 @@ class Newsletters extends APIEndpoint {
     // if there are past due notifications, reschedule them for the next send date
     if($newsletter->type === Newsletter::TYPE_NOTIFICATION && $status === Newsletter::STATUS_ACTIVE) {
       $next_run_date = Scheduler::getNextRunDate($newsletter->schedule);
-      $newsletter->queue()->findOne()->task()
-        ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))
-        ->where('status', SendingQueue::STATUS_SCHEDULED)
-        ->findResultSet()
-        ->set('scheduled_at', $next_run_date)
-        ->save();
+      $queue = $newsletter->queue()->findOne();
+      if($queue) {
+        $queue->task()
+          ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))
+          ->where('status', SendingQueue::STATUS_SCHEDULED)
+          ->findResultSet()
+          ->set('scheduled_at', $next_run_date)
+          ->save();
+      }
     }
 
     return $this->successResponse(

lib/API/JSON/v1/SendingQueue.php

@@ -47,6 +47,7 @@ class SendingQueue extends APIEndpoint {
 
     // add newsletter to the sending queue
     $queue = SendingQueueModel::joinWithTasks()
+      ->where('queues.newsletter_id', $newsletter->id)
       ->whereNull('tasks.status')
       ->findOne();
 
@@ -84,6 +85,7 @@ class SendingQueue extends APIEndpoint {
           APIError::UNKNOWN => __('There are no subscribers in that list!', 'mailpoet')
         ));
       }
+      $queue->updateCount();
       $queue->status = null;
       $queue->scheduled_at = null;