Move common query time condition to mixin

[rails.git] / app / controllers / concerns / query_methods.rb

diff --git a/app/controllers/concerns/query_methods.rb b/app/controllers/concerns/query_methods.rb
index 2d0bfee53a307c95f7a27b944815c2e3e0f982f5..672a8c6027e31018cc7e6fe56236c2d5bd2e15f4 100644 (file)
--- a/app/controllers/concerns/query_methods.rb
+++ b/app/controllers/concerns/query_methods.rb
@@ -3,6 +3,43 @@ module QueryMethods
 
   private
 
+  ##
+  # Restrict the resulting items to those created during a particular time period
+  # Using 'to' requires specifying 'from' as well for historical reasons
+  def query_conditions_time(items, filter_property = :created_at)
+    interval = query_conditions_time_value
+
+    if interval
+      items.where(filter_property => interval)
+    else
+      items
+    end
+  end
+
+  ##
+  # Get query time interval from request parameters or nil
+  def query_conditions_time_value
+    if params[:from]
+      begin
+        from = Time.parse(params[:from]).utc
+      rescue ArgumentError
+        raise OSM::APIBadUserInput, "Date #{params[:from]} is in a wrong format"
+      end
+
+      begin
+        to = if params[:to]
+               Time.parse(params[:to]).utc
+             else
+               Time.now.utc
+             end
+      rescue ArgumentError
+        raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"
+      end
+
+      from..to
+    end
+  end
+
   ##
   # Limit the result according to request parameters and settings
   def query_limit(items)
@@ -12,8 +49,9 @@ module QueryMethods
   ##
   # 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