Prefer find_by() instead of where().first

[rails.git] / app / controllers / traces_controller.rb

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index 86b09215ef94eba30405089e4918cc37020459fe..242f8113c2783430b8b67cffadc34b0b71e95ac1 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -1,4 +1,6 @@
 class TracesController < ApplicationController
+  include UserMethods
+
   layout "site", :except => :georss
 
   before_action :authorize_web
@@ -17,7 +19,7 @@ class TracesController < ApplicationController
     # from display name, pick up user id if one user's traces only
     display_name = params[:display_name]
     if display_name.present?
-      target_user = User.active.where(:display_name => display_name).first
+      target_user = User.active.find_by(:display_name => display_name)
       if target_user.nil?
         render_unknown_user display_name
         return
@@ -40,30 +42,38 @@ class TracesController < ApplicationController
     # 2 - all traces, not logged in = all public traces
     # 3 - user's traces, logged in as same user = all user's traces
     # 4 - user's traces, not logged in as that user = all user's public traces
-    @traces = if target_user.nil? # all traces
-                if current_user
-                  Trace.visible_to(current_user) # 1
-                else
-                  Trace.visible_to_all # 2
-                end
-              elsif current_user && current_user == target_user
-                current_user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name)
-              else
-                target_user.traces.visible_to_all # 4
-              end
+    traces = if target_user.nil? # all traces
+               if current_user
+                 Trace.visible_to(current_user) # 1
+               else
+                 Trace.visible_to_all # 2
+               end
+             elsif current_user && current_user == target_user
+               current_user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name)
+             else
+               target_user.traces.visible_to_all # 4
+             end
 
-    @traces = @traces.tagged(params[:tag]) if params[:tag]
+    traces = traces.tagged(params[:tag]) if params[:tag]
+
+    traces = traces.visible
 
-    @params = params.permit(:display_name, :tag)
+    @params = params.permit(:display_name, :tag, :before, :after)
 
-    @page = (params[:page] || 1).to_i
-    @page_size = 20
+    @traces = if params[:before]
+                traces.where("gpx_files.id < ?", params[:before]).order(:id => :desc)
+              elsif params[:after]
+                traces.where("gpx_files.id > ?", params[:after]).order(:id => :asc)
+              else
+                traces.order(:id => :desc)
+              end
 
-    @traces = @traces.visible
-    @traces = @traces.order(:id => :desc)
-    @traces = @traces.offset((@page - 1) * @page_size)
-    @traces = @traces.limit(@page_size)
+    @traces = @traces.limit(20)
     @traces = @traces.includes(:user, :tags)
+    @traces = @traces.sort.reverse
+
+    @newer_traces = @traces.count.positive? && traces.exists?(["gpx_files.id > ?", @traces.first.id])
+    @older_traces = @traces.count.positive? && traces.exists?(["gpx_files.id < ?", @traces.last.id])
 
     # final helper vars for view
     @target_user = target_user
@@ -119,7 +129,7 @@ class TracesController < ApplicationController
         TraceImporterJob.perform_later(@trace)
         redirect_to :action => :index, :display_name => current_user.display_name
       else
-        flash[:error] = t("traces.create.upload_failed") if @trace.valid?
+        flash[:error] = t(".upload_failed") if @trace.valid?
 
         render :action => "new"
       end
@@ -273,7 +283,7 @@ class TracesController < ApplicationController
     # Save the trace object
     if trace.save
       # Finally save the user's preferred privacy level
-      if pref = current_user.preferences.where(:k => "gps.trace.visibility").first
+      if pref = current_user.preferences.find_by(:k => "gps.trace.visibility")
         pref.v = visibility
         pref.save
       else
@@ -293,11 +303,11 @@ class TracesController < ApplicationController
   end
 
   def default_visibility
-    visibility = current_user.preferences.where(:k => "gps.trace.visibility").first
+    visibility = current_user.preferences.find_by(:k => "gps.trace.visibility")
 
     if visibility
       visibility.v
-    elsif current_user.preferences.where(:k => "gps.trace.public", :v => "default").first.nil?
+    elsif current_user.preferences.find_by(:k => "gps.trace.public", :v => "default").nil?
       "private"
     else
       "public"