Changeset 10435

Timestamp:

01/05/2016 04:00:00 AM (9 years ago)

Author:

boonebgorges

Message:

In activity queries, use id column for secondary sort.

The default sort order for activity queries is by date_recorded. But this
order can be indeterminate when two items share the same date_recorded. To
prevent indeterminacy, we fall back on the always unique id column.

Fixes #6720.
Props henry.wright, Mamaduka.

Location:

trunk

Files:

• src/bp-activity/classes/class-bp-activity-activity.php (modified) (2 diffs)
• tests/phpunit/testcases/activity/template.php (modified) (1 diff)

trunk/src/bp-activity/classes/class-bp-activity-activity.php

@@ -529 +529 @@
 
                 /** This filter is documented in bp-activity/bp-activity-classes.php */
-                $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
+                $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
             } else {
                 $pag_sql    = '';
@@ -544 +544 @@
                  * @param string $sort       Final sort direction for legacy query.
                  */
-                $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
+                $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
             }
 
         } else {
             // Query first for activity IDs.
-            $activity_ids_sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}";
+            $activity_ids_sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort}";
 
             if ( ! empty( $per_page ) && ! empty( $page ) ) {

trunk/tests/phpunit/testcases/activity/template.php

@@ -523 +523 @@
         // clean up!
         $activities_template = $reset_activities_template;
+    }
+
+    /**
+     * @group scope
+     * @ticket BP6720
+     */
+    public function test_bp_has_activities_scope_friends_should_respect_id_order_when_record_dates_are_same() {
+        $u1 = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+
+        friends_add_friend( $u1, $u2, true );
+
+        // Friend's very fast status updates.
+        $a1 = $this->factory->activity->create( array(
+            'user_id' => $u2,
+            'type' => 'activity_update',
+            'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+        ) );
+        $a2 = $this->factory->activity->create( array(
+            'user_id' => $u2,
+            'type' => 'activity_update',
+            'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+        ) );
+
+        global $activities_template;
+        $reset_activities_template = $activities_template;
+
+        // Get activities in 'friends' scope
+        bp_has_activities( array(
+            'user_id' => $u1,
+            'scope' => 'friends',
+        ) );
+
+        $found = $activities_template->activities;
+
+        // Clean up!
+        $activities_template = $reset_activities_template;
+
+        $this->assertEquals( array( $a2, $a1 ), wp_list_pluck( $found, 'id' ) );
+    }
+
+    /**
+     * @group scope
+     * @ticket BP6720
+     */
+    public function test_bp_has_activities_scope_groups_should_respect_id_order_when_record_dates_are_same() {
+        $u1 = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+        $u3 = $this->factory->user->create();
+
+        $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+        // Two user join first user's group same time
+        $a1 = $this->factory->activity->create( array(
+            'user_id'   => $u2,
+            'component' => 'groups',
+            'item_id'   => $g1,
+            'type'      => 'joined_group',
+            'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+        ) );
+        $a2 = $this->factory->activity->create( array(
+            'user_id'   => $u3,
+            'component' => 'groups',
+            'item_id'   => $g1,
+            'type'      => 'joined_group',
+            'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+        ) );
+
+        global $activities_template;
+        $reset_activities_template = $activities_template;
+
+        // Get activities in 'groups' scope
+        bp_has_activities( array(
+            'user_id' => $u1,
+            'scope' => 'groups',
+        ) );
+
+        $found = $activities_template->activities;
+
+        // Clean up!
+        $activities_template = $reset_activities_template;
+
+        $this->assertEquals( array( $a2, $a1 ), wp_list_pluck( $found, 'id' ) );
     }