tidy ups

Author: Tim Wright

app/params/supplejack_api/concerns/helpers_params.rb

@@ -24,14 +24,14 @@ def cast_param(_name, value)
         def integer_param(param, value)
           @user = User.find_by_auth_token(params[:api_key])
 
-          if self.class.max_values[param] < value
-            if @user.nil? || @user&.role == 'anonymous'
+          if param == 'page' && (@user.nil? || @user&.role == 'anonymous') && 100 < value
               # rubocop:disable Layout/LineLength
               errors << "The #{param} parameter for anonymous users (without an API key) can not exceed #{self.class.max_values[param]}"
               # rubocop:enable Layout/LineLength
-            else
-              errors << "The #{param} parameter can not exceed #{self.class.max_values[param]}"
-            end
+          end
+
+          if self.class.max_values[param] < value
+            errors << "The #{param} parameter can not exceed #{self.class.max_values[param]}"
           end
 
           value = value.to_i

app/params/supplejack_api/mlt_params.rb

@@ -16,7 +16,7 @@ class MltParams < BaseParams
     class_attribute :max_values
 
     self.max_values = {
-      page: @user.nil? || @user&.role == 'anonymous' ? 100 : 50_000,
+      page: 50_000,
       per_page: 100
     }
 
@@ -37,7 +37,6 @@ def initialize(**kwargs)
       @record_type = @params[:record_type]
 
       @debug = kwargs[:debug] == 'true'
-      @user = User.find_by_auth_token(params[:api_key])
     end
 
     def valid?

app/params/supplejack_api/search_params.rb

@@ -27,7 +27,7 @@ class SearchParams < BaseParams
     class_attribute :max_values
 
     self.max_values = {
-      page: @user.nil? || @user&.role == 'anonymous' ? 100 : 50_000,
+      page: 50_000,
       per_page: 100,
       facets_per_page: 350,
       facets_page: 5000
@@ -55,7 +55,6 @@ def initialize(**kwargs)
 
       @solr_query = @params[:solr_query]
       @debug = @params[:debug] == 'true'
-      @user = User.find_by_auth_token(params[:api_key])
     end
 
     private