Feature/plans api filtering #2293
Conversation
…pi, add timestamps, completion to statistics-plans-api
|
Addresses #2217 |
|
|
||
| # Filter on list of users | ||
| user_ids = extract_param_list(params, "user") | ||
| @plans = @plans.where(roles: {user_id: user_ids}) if user_ids.present? |
There was a problem hiding this comment.
do we want to include all roles here (e.g. commenter and reviewer)?
There was a problem hiding this comment.
Reviewer is no longer a role, But we do probably want to keep this to editors/administrators/creators.
I have added a helper-function to the role model to allow us to extract the numbers which correspond to a bit_value
There was a problem hiding this comment.
ah right. forgot we had removed the reviewer role. thanks for adding the helper method
| @plans = @plans.where(updated_at: dates_to_range(params,"updated_after","updated_before")) | ||
| end | ||
| # filter on funder (dmptemplate_id) | ||
| template_ids = extract_param_list(params, "template") |
There was a problem hiding this comment.
might be more efficient to process template and plan id filtering before the dates
There was a problem hiding this comment.
I think it should be lazy-evaluating, so activerecord should apply all stages of filtering at the same time.
| # takes in the params hash and converts to a date-range | ||
| def dates_to_range(hash,start,stop) | ||
| today = Date.today | ||
| start_date = Date.parse(hash.fetch(start, today.prev_month.to_date.to_s)) |
There was a problem hiding this comment.
Would be useful to trap any exceptions thrown by the Date.parse here and either send the error back to the caller or default to a specific date like one month ago or something
There was a problem hiding this comment.
We should add that in and make it apply both here and in the statistics_controller, as I've copied this method over from there.
| @@ -25,7 +25,7 @@ def index | |||
| .where(org_id: @user.org_id, published: true) | |||
| .where.not(customization_of: nil) | |||
|
|
|||
| Template.published.order(:org_id, :version).each do |temp| | |||
| published_templates.order(:org_id, :version).each do |temp| | |||
…nto feature/plans_api_filtering
app/models/role.rb
Outdated
| # | ||
| # Returns [Integer] | ||
| def self.bit_values(access) | ||
| Role.send(access.to_s + "_condition").split(' in ').last[1...-2].split(',').map(&:to_i) |
There was a problem hiding this comment.
Try Role.send(:chained_flags_values, 'access', access) instead
Small bugfix for templates API (was throwing an error previously)
Added filtering on