Changeset 8167

Timestamp:

03/26/2014 10:55:04 PM (10 years ago)

Author:

boonebgorges

Message:

Allow all notifications to be fetched by passing 'both' to is_new param of BP_Notifications_Notification::get()

Fixes #5315

Props rodrigorznd

Location:

trunk

Files:

• bp-notifications/bp-notifications-classes.php (modified) (2 diffs)
• tests/testcases/notifications/class-bp-notifications-notification.php (modified) (1 diff)

trunk/bp-notifications/bp-notifications-classes.php

@@ -320 +320 @@
 
         // is_new
-        if ( ! empty( $args['is_new'] ) ) {
-            $where_conditions['is_new'] = "is_new = 1";
-        } elseif ( isset( $args['is_new'] ) && ( 0 === $args['is_new'] || false === $args['is_new'] ) ) {
-            $where_conditions['is_new'] = "is_new = 0";
+        if ( 'both' !== $args['is_new'] ) {
+            if ( ! empty( $args['is_new'] ) ) {
+                $where_conditions['is_new'] = "is_new = 1";
+            } elseif ( isset( $args['is_new'] ) && ( 0 === $args['is_new'] || false === $args['is_new'] ) ) {
+                $where_conditions['is_new'] = "is_new = 0";
+            }
         }
 
@@ -538 +540 @@
      *     @type string|array $component_action Name of the action to
      *           filter by. Can be an array of actions.
-     *     @type bool $is_new Whether to limit the query to is_new (unread)
-     *           notifications. Default: true.
+     *     @type bool $is_new Whether to limit to new notifications. True
+     *           returns only new notifications, false returns only non-new
+     *           notifications. 'both' returns all. Default: true.
      *     @type string $search_terms Term to match against component_name
      *           or component_action fields.

trunk/tests/testcases/notifications/class-bp-notifications-notification.php

@@ -151 +151 @@
         $this->assertEquals( $expected, $actual );
     }
+
+    /**
+     * @group is_new
+     */
+    public function test_is_new_true() {
+        $u = $this->create_user();
+        $n1 = $this->factory->notification->create( array(
+            'component_name' => 'friends',
+            'user_id' => $u,
+            'is_new' => false,
+        ) );
+        $n2 = $this->factory->notification->create( array(
+            'component_name' => 'groups',
+            'user_id' => $u,
+            'is_new' => true,
+        ) );
+        $n3 = $this->factory->notification->create( array(
+            'component_name' => 'messages',
+            'user_id' => $u,
+            'is_new' => true,
+        ) );
+
+        $n = BP_Notifications_Notification::get( array(
+            'user_id' => $u,
+            'is_new' => true,
+        ) );
+
+        // Check that the correct items are pulled up
+        $expected = array( $n2, $n3 );
+        $actual = wp_list_pluck( $n, 'id' );
+        $this->assertEquals( $expected, $actual );
+    }
+
+    /**
+     * @group is_new
+     */
+    public function test_is_new_false() {
+        $u = $this->create_user();
+        $n1 = $this->factory->notification->create( array(
+            'component_name' => 'friends',
+            'user_id' => $u,
+            'is_new' => false,
+        ) );
+        $n2 = $this->factory->notification->create( array(
+            'component_name' => 'groups',
+            'user_id' => $u,
+            'is_new' => true,
+        ) );
+        $n3 = $this->factory->notification->create( array(
+            'component_name' => 'messages',
+            'user_id' => $u,
+            'is_new' => true,
+        ) );
+
+        $n = BP_Notifications_Notification::get( array(
+            'user_id' => $u,
+            'is_new' => false,
+        ) );
+
+        // Check that the correct items are pulled up
+        $expected = array( $n1 );
+        $actual = wp_list_pluck( $n, 'id' );
+        $this->assertEquals( $expected, $actual );
+    }
+
+    /**
+     * @group is_new
+     */
+    public function test_is_new_both() {
+        $u = $this->create_user();
+        $n1 = $this->factory->notification->create( array(
+            'component_name' => 'friends',
+            'user_id' => $u,
+            'is_new' => false,
+        ) );
+        $n2 = $this->factory->notification->create( array(
+            'component_name' => 'groups',
+            'user_id' => $u,
+            'is_new' => true,
+        ) );
+        $n3 = $this->factory->notification->create( array(
+            'component_name' => 'messages',
+            'user_id' => $u,
+            'is_new' => true,
+        ) );
+
+        $n = BP_Notifications_Notification::get( array(
+            'user_id' => $u,
+            'is_new' => 'both',
+        ) );
+
+        // Check that the correct items are pulled up
+        $expected = array( $n1, $n2, $n3 );
+        $actual = wp_list_pluck( $n, 'id' );
+        $this->assertEquals( $expected, $actual );
+    }
 }