From d54e666eeac74420ae08a567149e46a3f26b37b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lys=C3=BD?= <jan.lysy@automattic.com>
Date: Wed, 1 Mar 2023 17:38:52 +0100
Subject: [PATCH] Fix ordering by subscriber

[MAILPOET-4660]
---
 .../Sending/ScheduledTaskSubscribersListingRepository.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mailpoet/lib/Newsletter/Sending/ScheduledTaskSubscribersListingRepository.php b/mailpoet/lib/Newsletter/Sending/ScheduledTaskSubscribersListingRepository.php
index ae017c18c6..390bd09d98 100644
--- a/mailpoet/lib/Newsletter/Sending/ScheduledTaskSubscribersListingRepository.php
+++ b/mailpoet/lib/Newsletter/Sending/ScheduledTaskSubscribersListingRepository.php
@@ -94,9 +94,13 @@ class ScheduledTaskSubscribersListingRepository extends ListingRepository {
     // ScheduledTaskSubscriber doesn't have id column so the default fallback value 'id'
     // generated in MailPoet\Listing\Handler needs to be changed to something else
     if ($sortBy === 'id') {
-      $sortBy = 'subscriber';
+      $sortBy = 'sts.subscriber';
+    } elseif ($sortBy === 'subscriberId') { // Ordering by subscriberId is mapped to email for consistency with Subscriber listing
+      $sortBy = 's.email';
+    } else {
+      $sortBy = "sts.{$sortBy}";
     }
-    $queryBuilder->addOrderBy("sts.$sortBy", $sortOrder);
+    $queryBuilder->addOrderBy($sortBy, $sortOrder);
   }
 
   protected function applySearch(QueryBuilder $queryBuilder, string $search) {