raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-20 00:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract schedule syncing logic into OrderCycleForm

Browse Source
This commit is contained in:
Rob Harrington
2018-03-08 16:21:31 +11:00
parent 21bd9d2e10
commit d9830749f1
4 changed files with 98 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/controllers/admin/order_cycles_controller.rb
View File

@@ -1,6 +1,4 @@
require 'open_food_network/permissions'
require 'open_food_network/order_cycle_form_applicator'
require 'open_food_network/proxy_order_syncer'
module Admin
class OrderCyclesController < ResourceController
@@ -9,11 +7,8 @@ module Admin
prepend_before_filter :load_data_for_index, :only => :index
before_filter :require_coordinator, only: :new
before_filter :remove_protected_attrs, only: [:update]
before_filter :check_editable_schedule_ids, only: [:create, :update]
before_filter :require_order_cycle_set_params, only: [:bulk_update]
around_filter :protect_invalid_destroy, only: :destroy
create.after :sync_subscriptions
update.after :sync_subscriptions
def index
respond_to do |format|
@@ -43,11 +38,10 @@ module Admin
end
def create
@order_cycle_form = OrderCycleForm.new(@order_cycle, params)
@order_cycle_form = OrderCycleForm.new(@order_cycle, params, spree_current_user)
if @order_cycle_form.save
OpenFoodNetwork::OrderCycleFormApplicator.new(@order_cycle, spree_current_user).go!
invoke_callbacks(:create, :after)
flash[:notice] = I18n.t(:order_cycles_create_notice)
render json: { success: true }
else
@@ -56,14 +50,13 @@ module Admin
end
def update
@order_cycle_form = OrderCycleForm.new(@order_cycle, params)
@order_cycle_form = OrderCycleForm.new(@order_cycle, params, spree_current_user)
if @order_cycle_form.save
unless params[:order_cycle][:incoming_exchanges].nil? && params[:order_cycle][:outgoing_exchanges].nil?
# Only update apply exchange information if it is actually submmitted
OpenFoodNetwork::OrderCycleFormApplicator.new(@order_cycle, spree_current_user).go!
end
invoke_callbacks(:update, :after)
flash[:notice] = I18n.t(:order_cycles_update_notice) if params[:reloading] == '1'
render json: { :success => true }
else
@@ -182,29 +175,6 @@ module Admin
end
end
def check_editable_schedule_ids
return unless params[:order_cycle][:schedule_ids]
requested = params[:order_cycle][:schedule_ids].map(&:to_i)
@existing_schedule_ids = @order_cycle.persisted? ? @order_cycle.schedule_ids : []
permitted = Schedule.where(id: requested | @existing_schedule_ids).merge(OpenFoodNetwork::Permissions.new(spree_current_user).editable_schedules).pluck(:id)
result = @existing_schedule_ids
result |= (requested & permitted) # add any requested & permitted ids
result -= ((result & permitted) - requested) # remove any existing and permitted ids that were not specifically requested
params[:order_cycle][:schedule_ids] = result
end
def sync_subscriptions
return unless params[:order_cycle][:schedule_ids]
removed_ids = @existing_schedule_ids - @order_cycle.schedule_ids
new_ids = @order_cycle.schedule_ids - @existing_schedule_ids
if removed_ids.any? || new_ids.any?
schedules = Schedule.where(id: removed_ids + new_ids)
subscriptions = Subscription.where(schedule_id: schedules)
syncer = OpenFoodNetwork::ProxyOrderSyncer.new(subscriptions)
syncer.sync!
end
end
def order_cycles_from_set
remove_unauthorized_bulk_attrs
OrderCycle.where(id: params[:order_cycle_set][:collection_attributes].map{ |k,v| v[:id] })