Add index on gpx_files table on user_id, id

[rails.git] / app / models / trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 1e8f25a830757b64f9cfa692d6fcaa6a74fce03b..9768c0538bbb58abe138cb58e6b57d71f3276de7 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -2,11 +2,11 @@
 #
 # Table name: gpx_files
 #
 #
 # Table name: gpx_files
 #

-#  id          :bigint(8)        not null, primary key
-#  user_id     :bigint(8)        not null
+#  id          :bigint           not null, primary key
+#  user_id     :bigint           not null

 #  visible     :boolean          default(TRUE), not null
 #  name        :string           default(""), not null
 #  visible     :boolean          default(TRUE), not null
 #  name        :string           default(""), not null

-#  size        :bigint(8)
+#  size        :bigint

 #  latitude    :float
 #  longitude   :float
 #  timestamp   :datetime         not null
 #  latitude    :float
 #  longitude   :float
 #  timestamp   :datetime         not null


@@ -16,9 +16,10 @@
 #
 # Indexes
 #
 #
 # Indexes
 #

-#  gpx_files_timestamp_idx           (timestamp)
-#  gpx_files_user_id_idx             (user_id)
-#  gpx_files_visible_visibility_idx  (visible,visibility)
+#  gpx_files_timestamp_idx            (timestamp)
+#  gpx_files_user_id_idx              (user_id)
+#  gpx_files_visible_visibility_idx   (visible,visibility)
+#  index_gpx_files_on_user_id_and_id  (user_id,id)

 #
 # Foreign Keys
 #
 #
 # Foreign Keys
 #


@@ -38,6 +39,7 @@ class Trace < ApplicationRecord
   scope :visible_to, ->(u) { visible.where(:visibility => %w[public identifiable]).or(visible.where(:user => u)) }
   scope :visible_to_all, -> { where(:visibility => %w[public identifiable]) }
   scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
   scope :visible_to, ->(u) { visible.where(:visibility => %w[public identifiable]).or(visible.where(:user => u)) }
   scope :visible_to_all, -> { where(:visibility => %w[public identifiable]) }
   scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }

+  scope :imported, -> { where(:inserted => true) }

 
   has_one_attached :file, :service => Settings.trace_file_storage
   has_one_attached :image, :service => Settings.trace_image_storage
 
   has_one_attached :file, :service => Settings.trace_file_storage
   has_one_attached :image, :service => Settings.trace_image_storage


@@ -80,16 +82,16 @@ class Trace < ApplicationRecord
             :content_type => content_type(attachable.path),
             :identify => false)
     else
             :content_type => content_type(attachable.path),
             :identify => false)
     else

-      super(attachable)
+      super

     end
   end
 
   def public?
     end
   end
 
   def public?

-    visibility == "public" || visibility == "identifiable"
+    %w[public identifiable].include?(visibility)

   end
 
   def trackable?
   end
 
   def trackable?

-    visibility == "trackable" || visibility == "identifiable"
+    %w[trackable identifiable].include?(visibility)

   end
 
   def identifiable?
   end
 
   def identifiable?


@@ -202,7 +204,7 @@ class Trace < ApplicationRecord
     logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
     file.open do |file|
     logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
     file.open do |file|

-      gpx = GPX::File.new(file.path)
+      gpx = GPX::File.new(file.path, :maximum_points => Settings.max_trace_size)

 
       f_lat = 0
       f_lon = 0
 
       f_lat = 0
       f_lon = 0