Merge pull request #92 from VSEphpbb/issue/91

Correctly handle moved ideas and idea counting

Author: DavidIQ

factory/ideas.php

@@ -148,11 +148,19 @@ public function get_ideas($number = 10, $sort = 'date', $sort_direction = 'DESC'
 			$where .= ' AND i.idea_votes_up > i.idea_votes_down';
 		}
 
+		// Only get approved topics
+		$where .= ' AND t.topic_visibility = ' . ITEM_APPROVED;
+
+		// Only get ideas that are actually in the ideas forum (not ones that have been moved)
+		$where .= ' AND t.forum_id = ' . (int) $this->config['ideas_forum_id'];
+
 		// Count the total number of ideas for pagination
 		if ($number >= $this->config['posts_per_page'])
 		{
 			$sql = 'SELECT COUNT(i.idea_id) as num_ideas
-				FROM ' . $this->table_ideas . " i
+				FROM ' . $this->table_ideas . ' i
+       			INNER JOIN ' . $this->table_topics . " t 
+       				ON i.topic_id = t.topic_id
 				WHERE $where";
 			$result = $this->db->sql_query($sql);
 			$num_ideas = (int) $this->db->sql_fetchfield('num_ideas');
@@ -162,9 +170,6 @@ public function get_ideas($number = 10, $sort = 'date', $sort_direction = 'DESC'
 			$this->idea_count = $num_ideas;
 		}
 
-		// Only get approved topics
-		$where .= ' AND t.topic_visibility = ' . ITEM_APPROVED;
-
 		if ($sortby !== 'TOP' && $sortby !== 'ALL')
 		{
 			$sql = 'SELECT t.topic_last_post_time, t.topic_status, i.*
@@ -710,7 +715,8 @@ public function delete_orphans()
 		// Find any orphans
 		$sql = 'SELECT idea_id FROM ' . $this->table_ideas . '
  			WHERE topic_id NOT IN (SELECT t.topic_id 
- 			FROM ' . $this->table_topics . ' t)';
+ 			FROM ' . $this->table_topics . ' t
+ 				WHERE t.forum_id = ' . (int) $this->config['ideas_forum_id'] . ')';
 		$result = $this->db->sql_query($sql);
 		$rows = $this->db->sql_fetchrowset($result);
 		$this->db->sql_freeresult($result);

tests/fixtures/ideas.xml

@@ -97,6 +97,20 @@
 			<value></value>
 			<value></value>
 		</row>
+		<row>
+			<value>7</value>
+			<value>2</value>
+			<value>Orphaned Idea #7 New with no votes</value>
+			<value>1439999994</value>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value>7</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+		</row>
 	</table>
 	<table name="phpbb_ideas_votes">
 		<column>idea_id</column>
@@ -195,30 +209,42 @@
 		<column>topic_id</column>
 		<column>topic_title</column>
 		<column>topic_visibility</column>
+		<column>forum_id</column>
 		<row>
 			<value>1</value>
 			<value>Foo Idea #1 New with 3 up votes</value>
 			<value>1</value>
+			<value>2</value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>Bar Idea #2 New with 1 down vote</value>
 			<value>1</value>
+			<value>2</value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>Foo Idea #3 In Progress with 1 up and 1 down vote</value>
 			<value>1</value>
+			<value>2</value>
 		</row>
 		<row>
 			<value>4</value>
 			<value>Bar Idea #4 Implemented with 0 votes</value>
 			<value>1</value>
+			<value>2</value>
 		</row>
 		<row>
 			<value>5</value>
 			<value>Unapproved Idea #5 New with 0 votes</value>
 			<value>0</value>
+			<value>2</value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>Orphaned Idea #6 New with 2 votes</value>
+			<value>1</value>
+			<value>3</value>
 		</row>
 	</table>
 </dataset>

tests/ideas/delete_orphans_test.php

@@ -14,26 +14,32 @@ class delete_orphans_test extends \phpbb\ideas\tests\ideas\ideas_base
 {
 	public function test_delete_orphans()
 	{
-		// The id of an orphaned idea in our test fixture
-		$idea_id = 6;
-
 		$ideas = $this->get_ideas_object();
 
-		// First, check the idea exists
-		$this->assertNotEmpty($ideas->get_idea($idea_id));
+		// First lets get a count of the good ideas
+		$ideas->get_ideas();
+		$valid_ideas = $ideas->get_idea_count();
+
+		// Check the orphan ideas exists
+		$this->assertNotEmpty($ideas->get_idea(6));
+		$this->assertNotEmpty($ideas->get_idea(7));
 
 		// Delete orphans
-		$this->assertEquals(1, $ideas->delete_orphans());
+		$this->assertEquals(2, $ideas->delete_orphans());
 
-		// Confirm idea no longer exists
-		$this->assertFalse($ideas->get_idea($idea_id));
+		// Confirm orphan ideas no longer exists
+		$this->assertFalse($ideas->get_idea(6));
+		$this->assertFalse($ideas->get_idea(7));
 
-		// check that all votes are removed
-		$sql = 'SELECT * FROM phpbb_ideas_votes WHERE idea_id = ' . $idea_id;
+		// Check that all votes from orphan ideas are removed
+		$sql = 'SELECT COUNT(idea_id) as num_ideas FROM phpbb_ideas_votes WHERE idea_id IN(6, 7)';
 		$result = $this->db->sql_query($sql);
-		$rows = $this->db->sql_fetchrow($result);
+		$num_ideas = (int) $this->db->sql_fetchfield('num_ideas');
 		$this->db->sql_freeresult($result);
+		$this->assertEquals(0, $num_ideas);
 
-		$this->assertFalse($rows);
+		// Confirm that only the orphans were deleted
+		$ideas->get_ideas();
+		$this->assertEquals($valid_ideas, $ideas->get_idea_count());
 	}
 }