Add changeset comment query limit settings; use common query limit in changeset comme...

diff --git a/app/controllers/changeset_comments/feeds_controller.rb b/app/controllers/changeset_comments/feeds_controller.rb
index fef48bb188f885dbfac1188f0541002f16bba88b..148873eea8321b338d54dfd9a51b37045fd1a97e 100644 (file)
--- a/app/controllers/changeset_comments/feeds_controller.rb
+++ b/app/controllers/changeset_comments/feeds_controller.rb
@@ -1,5 +1,7 @@
 module ChangesetComments
   class FeedsController < ApplicationController
 module ChangesetComments
   class FeedsController < ApplicationController

+    include QueryMethods
+

     before_action :authorize_web
     before_action :set_locale
 
     before_action :authorize_web
     before_action :set_locale
 


@@ -19,10 +21,13 @@ module ChangesetComments
         changeset = Changeset.find(changeset_id)
 
         # Return comments for this changeset only
         changeset = Changeset.find(changeset_id)
 
         # Return comments for this changeset only

-        @comments = changeset.comments.includes(:author, :changeset).reverse_order.limit(comments_limit)
+        @comments = changeset.comments.includes(:author, :changeset).reverse_order
+        @comments = query_limit(@comments)

       else
         # Return comments
       else
         # Return comments

-        @comments = ChangesetComment.includes(:author, :changeset).where(:visible => true).order("created_at DESC").limit(comments_limit).preload(:changeset)
+        @comments = ChangesetComment.includes(:author, :changeset).where(:visible => true).order("created_at DESC")
+        @comments = query_limit(@comments)
+        @comments = @comments.preload(:changeset)

       end
 
       # Render the result
       end
 
       # Render the result


@@ -32,21 +37,5 @@ module ChangesetComments
     rescue OSM::APIBadUserInput
       head :bad_request
     end
     rescue OSM::APIBadUserInput
       head :bad_request
     end

-
-    private
-
-    ##
-    # Get the maximum number of comments to return
-    def comments_limit
-      if params[:limit]
-        if params[:limit].to_i.positive? && params[:limit].to_i <= 10000
-          params[:limit].to_i
-        else
-          raise OSM::APIBadUserInput, "Comments limit must be between 1 and 10000"
-        end
-      else
-        100
-      end
-    end

   end
 end
   end
 end

diff --git a/app/controllers/concerns/query_methods.rb b/app/controllers/concerns/query_methods.rb
index 2d0bfee53a307c95f7a27b944815c2e3e0f982f5..2656eb4af4c22ffc96451fc484c427c898a99584 100644 (file)
--- a/app/controllers/concerns/query_methods.rb
+++ b/app/controllers/concerns/query_methods.rb
@@ -12,8 +12,9 @@ module QueryMethods
   ##
   # Get query limit value from request parameters and settings
   def query_limit_value
   ##
   # Get query limit value from request parameters and settings
   def query_limit_value

-    max_limit = Settings["max_#{controller_name.singularize}_query_limit"]
-    default_limit = Settings["default_#{controller_name.singularize}_query_limit"]
+    name = controller_path.sub(%r{^api/}, "").tr("/", "_").singularize
+    max_limit = Settings["max_#{name}_query_limit"]
+    default_limit = Settings["default_#{name}_query_limit"]

     if params[:limit]
       if params[:limit].to_i.positive? && params[:limit].to_i <= max_limit
         params[:limit].to_i
     if params[:limit]
       if params[:limit].to_i.positive? && params[:limit].to_i <= max_limit
         params[:limit].to_i

diff --git a/config/settings.yml b/config/settings.yml
index 2e0346f0031c891d226deeddaa284adb2801cc31..33b5bfb3246b4552ea7b77302997efb7f7b82e92 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -35,6 +35,10 @@ tracepoints_per_page: 5000
 default_changeset_query_limit: 100
 # Maximum limit on the number of changesets returned by the changeset query api method
 max_changeset_query_limit: 100
 default_changeset_query_limit: 100
 # Maximum limit on the number of changesets returned by the changeset query api method
 max_changeset_query_limit: 100

+# Default limit on the number of changeset comments in feeds
+default_changeset_comments_feed_query_limit: 100
+# Maximum limit on the number of changesets comments in feeds
+max_changeset_comments_feed_query_limit: 10000

 # Maximum number of nodes that will be returned by the api in a map request
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)
 # Maximum number of nodes that will be returned by the api in a map request
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)