Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix WP_Query_User when it tries to sort the results #2226

Merged
merged 11 commits into from
Jun 24, 2021
Merged

Fix WP_Query_User when it tries to sort the results #2226

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
13bc9ac
Update to use keyword type fields to sort the results
Rahmon Jun 1, 2021
c1f251e
Update test for order user by display_name
Rahmon Jun 1, 2021
bbc97b4
Add test to check WP_User_Query ordering by user_nicename
Rahmon Jun 1, 2021
b66fb72
Add test to check WP_User_Query ordering by user_email
Rahmon Jun 1, 2021
6915b6b
Add test to check WP_User_Query ordering by user_url
Rahmon Jun 1, 2021
a59f2fe
Refactor user query test for orderby parameter
Rahmon Jun 1, 2021
f4f1a09
Merge branch 'develop' into fix/sort-user-search-issue-2225
felipeelia Jun 10, 2021
b3d38a0
Create sortable field for display_name
Rahmon Jun 11, 2021
b778c1a
Merge branch 'develop' into fix/sort-user-search-issue-2225
felipeelia Jun 16, 2021
546bca0
Fix display_name field mapping in User
Rahmon Jun 21, 2021
7e173d2
Update some user tests to check if the query was made via ES
Rahmon Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update test for order user by display_name
  • Loading branch information
@Rahmon
Rahmon committed Jun 1, 2021
commit c1f251e721ec5e76516c9972e8a5d9bc870807be
59 changes: 54 additions & 5 deletions tests/php/indexables/TestUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ public function createAndIndexUsers() {
);

ElasticPress\Elasticsearch::factory()->refresh_indices();

return [ $user_1, $user_2, $user_3 ];
}

/**
Expand Down Expand Up @@ -598,7 +600,7 @@ public function testUserQueryRoleIn() {
* @group user
*/
public function testUserQueryOrderbyDisplayName() {
$this->createAndIndexUsers();
$users_id = $this->createAndIndexUsers();

$user_query = new \WP_User_Query(
[
Expand All @@ -607,11 +609,58 @@ public function testUserQueryOrderbyDisplayName() {
]
);

foreach ( $user_query->results as $key => $user ) {
if ( ! empty( $user_query->results[ $key - 1 ] ) ) {
$this->assertTrue( strcasecmp( $user_query->results[ $key - 1 ]->display_name, $user->display_name ) < 0 );
}
$users_id_fetched = wp_list_pluck( $user_query->results, 'ID' );

$this->assertCount( 5, $user_query->results );

foreach ( $users_id as $user_id ) {
$this->assertContains( $user_id, $users_id_fetched );
}

/**
* Check if Zoe is the first user because Elasticsearch sort
* is case-sensitive
*
* Ref: https://www.elastic.co/guide/en/elasticsearch/guide/2.x/sorting-collations.html#case-insensitive-sorting
*
*/
$this->assertEquals( $users_id[1], $users_id_fetched[0] );
}

/**
* Test order by display_name in format_args().
*
* We should not use a text/string field to sort
* in Elasticsearch.
*
* @return void
* @since 3.6.0
* @group user
*/
public function testFormatArgsOrderByDisplayName() {
$user = new \ElasticPress\Indexable\User\User();

$user_query = new \WP_User_Query();

$args = $user->format_args(
[
'orderby' => 'display_name',
],
$user_query
);

$this->assertArrayHasKey( 'display_name.raw', $args['sort'][0] );
$this->assertArrayNotHasKey( 'display_name', $args['sort'][0] );

$args = $user->format_args(
[
'orderby' => 'name',
],
$user_query
);

$this->assertArrayHasKey( 'display_name.raw', $args['sort'][0] );
$this->assertArrayNotHasKey( 'display_name', $args['sort'][0] );
}

/**
Expand Down