projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9888: Move record-filtering code into model classes.
[arvados.git]
/
services
/
api
/
app
/
controllers
/
application_controller.rb
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index 6810d91d4cd6c235751365b1e6d1856a5f6a19b8..3c5bf94d2c4b06f8d1a1e301971cdf39673d8a44 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-14,13
+14,11
@@
class ActsAsApi::ApiTemplate
end
require 'load_param'
end
require 'load_param'
-require 'record_filters'
class ApplicationController < ActionController::Base
include CurrentApiClient
include ThemesForRails::ActionController
include LoadParam
class ApplicationController < ActionController::Base
include CurrentApiClient
include ThemesForRails::ActionController
include LoadParam
- include RecordFilters
respond_to :json
protect_from_forgery
respond_to :json
protect_from_forgery
@@
-207,11
+205,7
@@
class ApplicationController < ActionController::Base
def apply_filters model_class=nil
model_class ||= self.model_class
def apply_filters model_class=nil
model_class ||= self.model_class
- ft = record_filters @filters, model_class
- if ft[:cond_out].any?
- @objects = @objects.where('(' + ft[:cond_out].join(') AND (') + ')',
- *ft[:param_out])
- end
+ @objects = model_class.apply_filters(@objects, @filters)
end
def apply_where_limit_order_params model_class=nil
end
def apply_where_limit_order_params model_class=nil
@@
-301,15
+295,20
@@
class ApplicationController < ActionController::Base
return if limit_columns.empty?
model_class.transaction do
limit_query = @objects.
return if limit_columns.empty?
model_class.transaction do
limit_query = @objects.
+ except(:select).
select("(%s) as read_length" %
select("(%s) as read_length" %
- limit_columns.map { |s| "length(#{s})" }.join(" + "))
+ limit_columns.map { |s| "
octet_
length(#{s})" }.join(" + "))
new_limit = 0
read_total = 0
new_limit = 0
read_total = 0
- limit_query.
find_
each do |record|
+ limit_query.each do |record|
new_limit += 1
read_total += record.read_length.to_i
new_limit += 1
read_total += record.read_length.to_i
- break if ((read_total >= Rails.configuration.max_index_database_read) or
- (new_limit >= @limit))
+ if read_total >= Rails.configuration.max_index_database_read
+ new_limit -= 1 if new_limit > 1
+ break
+ elsif new_limit >= @limit
+ break
+ end
end
@limit = new_limit
@objects = @objects.limit(@limit)
end
@limit = new_limit
@objects = @objects.limit(@limit)
@@
-322,7
+321,7
@@
class ApplicationController < ActionController::Base
return @attrs if @attrs
@attrs = params[resource_name]
if @attrs.is_a? String
return @attrs if @attrs
@attrs = params[resource_name]
if @attrs.is_a? String
- @attrs = Oj.load @attrs, symbol_keys: true
+ @attrs = Oj.
strict_
load @attrs, symbol_keys: true
end
unless @attrs.is_a? Hash
message = "No #{resource_name}"
end
unless @attrs.is_a? Hash
message = "No #{resource_name}"
@@
-436,7
+435,7
@@
class ApplicationController < ActionController::Base
def load_json_value(hash, key, must_be_class=nil)
if hash[key].is_a? String
def load_json_value(hash, key, must_be_class=nil)
if hash[key].is_a? String
- hash[key] = Oj.load(hash[key], symbol_keys: false)
+ hash[key] = Oj.
strict_
load(hash[key], symbol_keys: false)
if must_be_class and !hash[key].is_a? must_be_class
raise TypeError.new("parameter #{key.to_s} must be a #{must_be_class.to_s}")
end
if must_be_class and !hash[key].is_a? must_be_class
raise TypeError.new("parameter #{key.to_s} must be a #{must_be_class.to_s}")
end