pkp#10751 fixed order by query

touhidurabir · Jan 6, 2025 · a236303 · a236303
1 parent 2f68f8f
commit a236303
Showing 1 changed file with 41 additions and 15 deletions.
diff --git a/classes/userGroup/Repository.php b/classes/userGroup/Repository.php
@@ -13,24 +13,25 @@
 
 namespace PKP\userGroup;
 
-use Carbon\Carbon;
 use DateInterval;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\LazyCollection;
+use Carbon\Carbon;
 use PKP\core\Core;
-use PKP\db\DAORegistry;
 use PKP\plugins\Hook;
+use PKP\site\SiteDAO;
 use PKP\security\Role;
+use PKP\db\DAORegistry;
+use PKP\facades\Locale;
+use PKP\xml\PKPXMLParser;
+use Illuminate\Support\Collection;
 use PKP\services\PKPSchemaService;
-use PKP\site\SiteDAO;
-use PKP\userGroup\relationships\enums\UserUserGroupMastheadStatus;
-use PKP\userGroup\relationships\enums\UserUserGroupStatus;
-use PKP\userGroup\relationships\UserGroupStage;
-use PKP\userGroup\relationships\UserUserGroup;
 use PKP\validation\ValidatorFactory;
-use PKP\xml\PKPXMLParser;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\LazyCollection;
+use Illuminate\Database\Query\JoinClause;
+use PKP\userGroup\relationships\UserUserGroup;
+use PKP\userGroup\relationships\UserGroupStage;
+use PKP\userGroup\relationships\enums\UserUserGroupStatus;
+use PKP\userGroup\relationships\enums\UserUserGroupMastheadStatus;
 
 class Repository
 {
@@ -591,13 +592,38 @@ public function getMastheadUserIdsByRoleIds(array $mastheadRoles, int $contextId
             $users = UserUserGroup::query()
                 ->withContextId($contextId)
                 ->withUserGroupIds($mastheadRoleIds)
-                ->whereHas('userGroup', fn (Builder $query) => $query->withUserUserGroupStatus($userUserGroupStatus->value))
+                ->whereHas(
+                    'userGroup',
+                    fn (\Illuminate\Database\Eloquent\Builder $query) => $query->withUserUserGroupStatus($userUserGroupStatus->value)
+                )
                 ->withMasthead()
                 ->orderBy('user_groups.role_id', 'asc')
                 ->join('user_groups', 'user_user_groups.user_group_id', '=', 'user_groups.user_group_id')
                 ->join('users', 'user_user_groups.user_id', '=', 'users.user_id')
-                ->join('user_settings', 'user_user_groups.user_id', '=', 'user_settings.user_id')
-                ->orderBy('user_settings.family_name', 'asc')
+                ->orderBy(
+                    fn (\Illuminate\Database\Query\Builder $query) => $query
+                        ->fromSub(
+                            fn($query) => $query->from(null)->selectRaw(0),
+                            'placeholder'
+                        )
+                        ->leftJoin(
+                            'user_settings AS l',
+                            fn (JoinClause $join) => $join
+                                ->on('user_user_groups.user_id', '=', 'l.user_id')
+                                ->where('l.setting_name', 'family_name')
+                                ->where('l.locale', Locale::getLocale())
+                        )
+                        ->leftJoin(
+                            'user_settings AS p',
+                            fn (JoinClause $join) => $join
+                                ->on('user_user_groups.user_id', '=', 'p.user_id')
+                                ->where('p.setting_name', 'family_name')
+                                ->where('p.locale', Locale::getPrimaryLocale())
+                        )
+                        ->selectRaw(
+                            'CONCAT(COALESCE(l.setting_value, ""), COALESCE(p.setting_value, ""))'
+                        )
+                )
                 ->get(['user_groups.user_group_id', 'users.user_id']);
 
             // group unique user ids by UserGroup id