From c477f8c2300eb9de3d786114f2b16efae0fc72f2 Mon Sep 17 00:00:00 2001 From: lin-d-hop Date: Tue, 29 Oct 2019 19:47:38 +0000 Subject: [PATCH 1/3] Update end date on delivery report to ensure all of todays orders are included --- lib/open_food_network/order_cycle_management_report.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb index 4d67ffa80d..d87769603a 100644 --- a/lib/open_food_network/order_cycle_management_report.rb +++ b/lib/open_food_network/order_cycle_management_report.rb @@ -138,7 +138,7 @@ module OpenFoodNetwork def sanitize_params(params) params[:q] ||= {} params[:q][:completed_at_gt] ||= Time.zone.today - DEFAULT_DATE_INTERVAL - params[:q][:completed_at_lt] ||= Time.zone.today + params[:q][:completed_at_lt] ||= Time.zone.today + 1.day params end end From c1f427b0e3ea3bd3d7b31599b3e09cf9ae285f15 Mon Sep 17 00:00:00 2001 From: lin-d-hop Date: Wed, 30 Oct 2019 10:44:06 +0000 Subject: [PATCH 2/3] Modifications for variable consistency etc --- lib/open_food_network/order_cycle_management_report.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb index d87769603a..49fb2e7365 100644 --- a/lib/open_food_network/order_cycle_management_report.rb +++ b/lib/open_food_network/order_cycle_management_report.rb @@ -2,7 +2,7 @@ require 'open_food_network/user_balance_calculator' module OpenFoodNetwork class OrderCycleManagementReport - DEFAULT_DATE_INTERVAL = 1.month + DEFAULT_DATE_INTERVAL = { from: -1.month, to: 1.day }.freeze attr_reader :params def initialize(user, params = {}, render_table = false) @params = sanitize_params(params) @@ -137,8 +137,8 @@ module OpenFoodNetwork def sanitize_params(params) params[:q] ||= {} - params[:q][:completed_at_gt] ||= Time.zone.today - DEFAULT_DATE_INTERVAL - params[:q][:completed_at_lt] ||= Time.zone.today + 1.day + params[:q][:completed_at_gt] ||= Time.zone.today + DEFAULT_DATE_INTERVAL[:from] + params[:q][:completed_at_lt] ||= Time.zone.today + DEFAULT_DATE_INTERVAL[:to] params end end From 472aef0904c8e3297b08b6b9f00f3f62245691ea Mon Sep 17 00:00:00 2001 From: lin-d-hop Date: Thu, 31 Oct 2019 18:28:13 +0000 Subject: [PATCH 3/3] Fixing spec --- .../open_food_network/order_cycle_management_report_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/open_food_network/order_cycle_management_report_spec.rb b/spec/lib/open_food_network/order_cycle_management_report_spec.rb index 675c5e6cd9..a9db775335 100644 --- a/spec/lib/open_food_network/order_cycle_management_report_spec.rb +++ b/spec/lib/open_food_network/order_cycle_management_report_spec.rb @@ -27,8 +27,8 @@ module OpenFoodNetwork context "default date range" do it "fetches orders completed in the past month" do - o1 = create(:order, completed_at: Time.zone.today - OrderCycleManagementReport::DEFAULT_DATE_INTERVAL - 1.day) - o2 = create(:order, completed_at: Time.zone.today - OrderCycleManagementReport::DEFAULT_DATE_INTERVAL + 1.day) + o1 = create(:order, completed_at: 1.month.ago - 1.day) + o2 = create(:order, completed_at: 1.month.ago + 1.day) expect(subject.orders).to eq([o2]) end end