Optimise database reads in DiaryEntry#list

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 777034468de2db9db4944461656554b2f0455b5a..6f1f7240cf8036593a270e3643b6ce0b57d13d61 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -80,36 +80,15 @@ class DiaryEntryController < ApplicationController
 
       if @this_user
         @title = t 'diary_entry.list.user_title', :user => @this_user.display_name
 
       if @this_user
         @title = t 'diary_entry.list.user_title', :user => @this_user.display_name

-        @entry_pages, @entries = paginate(:diary_entries,
-                                          :conditions => {
-                                            :user_id => @this_user.id,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = @this_user.diary_entries

       else
         render_unknown_user params[:display_name]
       else
         render_unknown_user params[:display_name]

+        return

       end
       end

-    elsif params[:language]
-      @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
-      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                        :conditions => {
-                                          :users => { :status => ["active", "confirmed"] },
-                                          :visible => true,
-                                          :language_code => params[:language]
-                                        },
-                                        :order => 'created_at DESC',
-                                        :per_page => 20)

     elsif params[:friends]
       if @user
         @title = t 'diary_entry.list.title_friends'
     elsif params[:friends]
       if @user
         @title = t 'diary_entry.list.title_friends'

-        @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                          :conditions => {
-                                            :user_id => @user.friend_users,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = DiaryEntry.where(:user_id => @user.friend_users)

       else
           require_user
           return
       else
           require_user
           return


@@ -117,27 +96,30 @@ class DiaryEntryController < ApplicationController
     elsif params[:nearby]
       if @user
         @title = t 'diary_entry.list.title_nearby'
     elsif params[:nearby]
       if @user
         @title = t 'diary_entry.list.title_nearby'

-        @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                          :conditions => {
-                                            :user_id => @user.nearby,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = DiaryEntry.where(:user_id => @user.nearby)

       else
           require_user
           return
       end
     else
       else
           require_user
           return
       end
     else

-      @title = t 'diary_entry.list.title'
-      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                        :conditions => {
-                                          :users => { :status => ["active", "confirmed"] },
-                                          :visible => true
-                                        },
-                                        :order => 'created_at DESC',
-                                        :per_page => 20)
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
+      
+      if params[:language]
+        @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
+        @entries = @entries.where(:language_code => params[:language])
+      else
+        @title = t 'diary_entry.list.title'
+      end

     end
     end

+
+    @page = (params[:page] || 1).to_i
+    @page_size = 20
+
+    @entries = @entries.visible
+    @entries = @entries.order("created_at DESC")
+    @entries = @entries.offset((@page - 1) * @page_size)
+    @entries = @entries.limit(@page_size)
+    @entries = @entries.includes(:user, :language)

   end
 
   def rss
   end
 
   def rss


@@ -151,6 +133,7 @@ class DiaryEntryController < ApplicationController
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         render :nothing => true, :status => :not_found
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         render :nothing => true, :status => :not_found

+        return

       end
     else
       @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
       end
     else
       @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })

diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 3353fef796ecb2553650dd605570d6e7b6fa9ea0..09d8af2fdcfdee0a3f253b1c18096d234ee0f383 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -28,16 +28,25 @@
 <% else %>
   <h4><%= t 'diary_entry.list.recent_entries' %></h4>
 
 <% else %>
   <h4><%= t 'diary_entry.list.recent_entries' %></h4>
 

-<% if @this_user %>
-  <%= render :partial => 'diary_entry', :collection => @entries %>
-<% else %>
-  <%= render :partial => 'diary_list_entry', :collection => @entries %>
-<% end %>
+  <% if @this_user %>
+    <%= render :partial => 'diary_entry', :collection => @entries %>
+  <% else %>
+    <%= render :partial => 'diary_list_entry', :collection => @entries %>
+  <% end %>

 
 

-<%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>
-<% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
-<%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
+  <% if @page > 1 -%>
+    <%= link_to t('diary_entry.list.older_entries'), params.merge(:page => @page - 1 ) %>
+  <% else -%>
+    <%= t('diary_entry.list.older_entries') %>
+  <% end -%>

 
 

+  |
+
+  <% if @entries.size < @page_size -%>
+    <%= t('diary_entry.list.newer_entries') %>
+  <% else -%>
+    <%= link_to t('diary_entry.list.newer_entries'), params.merge(:page => @page + 1) %>
+  <% end -%>

 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>