Smarter way of sorting profiles randomly

This fixes the problem where profiles are listed more than once in profile listing blocks. (ActionItem1682)

Smarter way of sorting profiles randomly
This fixes the problem where profiles are listed more than once in profile listing blocks. (ActionItem1682)
Antonio Terceiro
1 parent 4844d8a7
Showing 3 changed files with 16 additions and 20 deletions Show diff stats
app/models/profile_list_block.rb
lib/noosfero/sql.rb
test/unit/profile_list_block_test.rb
@@ -12,12 +12,16 @@ class ProfileListBlock &lt; Block
   end
   def profile_list
-    random = Noosfero::SQL.random_function
+    random = randomizer
     profiles.visible.all(:limit => limit, :select => 'DISTINCT profiles.*, ' + random, :order => random)
   end
   def profile_count
-    profiles.visible.count
+    profiles.visible.count('DISTINCT(profiles.id)')
+  end
+
+  def randomizer
+    @randomizer ||= "(profiles.id % #{rand(profile_count)})"
   end
   # the title of the block. Probably will be overriden in subclasses.
@@ -1,15 +0,0 @@
-module Noosfero
-  module SQL
-    class << self
-
-      def random_function()
-        default = 'random()'
-        adapter = ActiveRecord::Base.configurations[Rails.env]['adapter']
-        {
-          'mysql' => 'rand()'
-        }[adapter] || default
-      end
-
-    end
-  end
-end
@@ -141,13 +141,20 @@ class ProfileListBlockTest &lt; Test::Unit::TestCase
     p2 = fast_create(Person, :environment_id => env.id)
     p3 = fast_create(Person, :environment_id => env.id)
-    # force the "random" function to be something we know
-    Noosfero::SQL.stubs(:random_function).returns('-id')
-
     block = ProfileListBlock.new
     block.stubs(:owner).returns(env)
+    # force the "random" function to return something we know
+    block.stubs(:randomizer).returns('-id')
+
     assert_equal [p3.id, p2.id, p1.id], block.profile_list.map(&:id)
   end
+  should 'randomize using modulo operator and random number' do
+    block = ProfileListBlock.new
+    block.expects(:profile_count).returns(10)
+    block.expects(:rand).with(10).returns(5)
+    assert_match /profiles.id % 5/, block.randomizer
+  end
+
 end
	@@ -1,15 +0,0 @@	@@ -1,15 +0,0 @@
1	-module Noosfero
2	- module SQL
3	- class << self
4	-
5	- def random_function()
6	- default = 'random()'
7	- adapter = ActiveRecord::Base.configurations[Rails.env]['adapter']
8	- {
9	- 'mysql' => 'rand()'
10	- }[adapter] \|\| default
11	- end
12	-
13	- end
14	- end
15	-end