raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make import_date query modification conditional

Browse Source
This commit is contained in:
Matt-Yorkley
2019-07-25 19:10:09 +01:00
parent 0470725112
commit c127110192
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/api/products_controller.rb
View File

@@ -47,9 +47,14 @@ module Api
# TODO: This should be named 'managed'. Is the action above used? Maybe we should remove it.
def bulk_products
@products = OpenFoodNetwork::Permissions.new(current_api_user).editable_products.
merge(product_scope).
order('created_at DESC').
product_query = OpenFoodNetwork::Permissions.new(current_api_user).
editable_products.merge(product_scope)
if params[:import_date].present?
product_query = product_query.joins(:variants).merge(import_date_scope).group_by_products_id
end
@products = product_query.order('created_at DESC').
ransack(params[:q]).result.
page(params[:page]).per(params[:per_page])
@@ -104,8 +109,8 @@ module Api
end
def import_date_scope
return if params[:import_date].blank?
Spree::Variant.where(import_date: params[:import_date])
import_date = params[:import_date].to_datetime
Spree::Variant.where(import_date: import_date..import_date + 24.hours)
end
def paged_products_for_producers(producers)