scopes shouldn't require generate flag

msimonborg · May 9, 2017 · 9b3a75a · 9b3a75a
1 parent 77a043f
commit 9b3a75a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -12,6 +12,10 @@ class ApplicationController < ActionController::API
 
   private
 
+  def scopes_present?
+    params[:generate] == 'true' || scopes_configuration.any? { |scope, _options| params.key? scope }
+  end
+
   def geo_params
     params.permit(:address, :lat, :long, :radius)
   end

diff --git a/app/controllers/office_locations_controller.rb b/app/controllers/office_locations_controller.rb
@@ -10,7 +10,7 @@ def index
       @office_locations = apply_scopes(geo.find_office_locations).each do |off|
         off.calculate_distance(geo.coordinates.latlon)
       end
-    elsif params[:generate] == 'true'
+    elsif scopes_present?
       @office_locations = apply_scopes(OfficeLocation).active.order(:office_id)
     else
       send_index_files :office_locations

diff --git a/app/controllers/reps_controller.rb b/app/controllers/reps_controller.rb
@@ -18,7 +18,7 @@ def index
         rep.sort_offices(geo.coordinates.latlon)
       end
       @district = geo.district
-    elsif params[:generate] == 'true'
+    elsif scopes_present?
       @reps = apply_scopes(Rep).active.order(:bioguide_id)
     else
       send_index_files :reps