Changeset 11278

Timestamp:

12/08/2016 02:11:17 AM (8 years ago)

Author:

boonebgorges

Message:

When a group membership request is approved or rejected, mark all related notifications as read.

Fixes #7375.

Location:

trunk

Files:

• src/bp-groups/bp-groups-notifications.php (modified) (1 diff)
• tests/phpunit/testcases/groups/notifications.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-notifications.php

@@ -968 +968 @@
 
 /**
+ * Mark notifications read when a member's group membership request is granted.
+ *
+ * @since 2.8.0
+ *
+ * @param int $user_id  ID of the user.
+ * @param int $group_id ID of the group.
+ */
+function bp_groups_accept_request_mark_notifications( $user_id, $group_id ) {
+    if ( bp_is_active( 'notifications' ) ) {
+        // First null parameter marks read for all admins.
+        bp_notifications_mark_notifications_by_item_id( null, $group_id, buddypress()->groups->id, 'new_membership_request', $user_id );
+    }
+}
+add_action( 'groups_membership_accepted', 'bp_groups_accept_request_mark_notifications', 10, 2 );
+add_action( 'groups_membership_rejected', 'bp_groups_accept_request_mark_notifications', 10, 2 );
+
+/**
  * Mark notifications read when a member views their group memberships.
  *

trunk/tests/phpunit/testcases/groups/notifications.php

@@ -219 +219 @@
         return $value;
     }
+
+    /**
+     * @group BP7375
+     */
+    public function test_membership_request_notifications_should_be_cleared_when_request_is_accepted() {
+        $users = $this->factory->user->create_many( 3 );
+
+        $this->add_user_to_group( $users[0], $this->group, array(
+            'is_admin' => 1,
+        ) );
+        $this->add_user_to_group( $users[1], $this->group, array(
+            'is_admin' => 1,
+        ) );
+
+        groups_send_membership_request( $users[2], $this->group );
+
+        // Both admins should get a notification.
+        $get_args = array(
+            'user_id' => $users[0],
+            'item_id' => $this->group,
+            'secondary_item_id' => $users[2],
+            'component_action' => 'new_membership_request',
+            'is_new' => true,
+        );
+        $u0_notifications = BP_Notifications_Notification::get( $get_args );
+        $u1_notifications = BP_Notifications_Notification::get( $get_args );
+        $this->assertNotEmpty( $u0_notifications );
+        $this->assertNotEmpty( $u1_notifications );
+
+        $this->assertTrue( groups_invite_user( array(
+            'user_id' => $users[2],
+            'group_id' => $this->group,
+        ) ) );
+
+        $u0_notifications = BP_Notifications_Notification::get( $get_args );
+        $u1_notifications = BP_Notifications_Notification::get( $get_args );
+        $this->assertEmpty( $u0_notifications );
+        $this->assertEmpty( $u1_notifications );
+    }
+
 }