Check for existing notifications using the manager

Signed-off-by: Matt Friedman <maf675@gmail.com>

Author: iMattPro

factory/idea.php

@@ -72,12 +72,15 @@ public function set_status($idea_id, $status)
 		$this->update_idea_data($sql_ary, $idea_id, $this->table_ideas);
 
 		// Send a notification
-		$method = $this->notification_exists($idea_id) ? 'update_notifications' : 'add_notifications';
-		$this->notification_manager->$method(ext::NOTIFICATION_TYPE_STATUS, [
-			'idea_id' => (int) $idea_id,
-			'status'  => (int) $status,
-			'user_id' => (int) $this->user->data['user_id'],
-		]);
+		$notifications = $this->notification_manager->get_notified_users(ext::NOTIFICATION_TYPE_STATUS, ['item_id' => (int) $idea_id]);
+		$this->notification_manager->{empty($notifications) ? 'add_notifications' : 'update_notifications'}(
+			ext::NOTIFICATION_TYPE_STATUS,
+			[
+				'idea_id' => (int) $idea_id,
+				'status'  => (int) $status,
+				'user_id' => (int) $this->user->data['user_id'],
+			]
+		);
 	}
 
 	/**
@@ -454,24 +457,4 @@ protected function get_users_vote($idea_id, $user_id)
 
 		return $row;
 	}
-
-	/**
-	 * Check if a notification already exists
-	 *
-	 * @param int $item_id The item identifier for the notification
-	 * @return bool
-	 */
-	protected function notification_exists($item_id)
-	{
-		$sql = 'SELECT notification_id
-			FROM ' . NOTIFICATIONS_TABLE . '
-			WHERE item_id = ' . (int) $item_id . '
-				AND notification_type_id = ' . $this->notification_manager->get_notification_type_id(ext::NOTIFICATION_TYPE_STATUS);
-
-		$result = $this->db->sql_query_limit($sql, 1);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		return $row !== false;
-	}
 }

tests/ideas/idea_attributes_test.php

@@ -63,11 +63,6 @@ public function set_status_test_data()
 	 */
 	public function test_set_status($idea_id, $status)
 	{
-		$this->notification_manager->expects($this->once())
-			->method('get_notification_type_id')
-			->with(ext::NOTIFICATION_TYPE_STATUS)
-			->willReturn(1);
-
 		$object = $this->get_idea_object();
 
 		$object->set_status($idea_id, $status);
@@ -77,6 +72,34 @@ public function test_set_status($idea_id, $status)
 		self::assertEquals($status, $idea['idea_status']);
 	}
 
+	public function test_set_status_notification_data()
+	{
+		return [
+			[1, 1, [], 'add_notifications'],
+			[1, 2, [2], 'update_notifications'],
+			[2, 3, [], 'add_notifications'],
+			[2, 4, [3], 'update_notifications'],
+		];
+	}
+
+	/**
+	 * @dataProvider test_set_status_notification_data
+	 */
+	public function test_set_status_notification($idea_id, $status, $notified_users, $expected)
+	{
+		$this->notification_manager->expects($this->once())
+			->method('get_notified_users')
+			->with(ext::NOTIFICATION_TYPE_STATUS, ['item_id' => $idea_id])
+			->willReturn($notified_users);
+
+		$this->notification_manager->expects($this->once())
+			->method($expected);
+
+		$object = $this->get_idea_object();
+
+		$object->set_status($idea_id, $status);
+	}
+
 	/**
 	 * Data for idea attribute tests
 	 *