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

Billable periods from the future are not obsolete

Browse Source
This commit is contained in:
Rob Harrington
2015-07-09 00:10:03 +08:00
parent aa8e486a45
commit ddb0aa4e74
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/jobs/update_billable_periods.rb
View File

@@ -83,10 +83,10 @@ class UpdateBillablePeriods
def clean_up_untouched_billable_periods_for(enterprise, job_start_time)
# Snag and then delete any BillablePeriods which overlap
obsolete_billable_periods = enterprise.billable_periods.where('ends_at >= (?) AND updated_at < (?)', start_date, job_start_time)
obsolete_billable_periods = enterprise.billable_periods.where('ends_at >= (?) AND begins_at <= (?) AND updated_at < (?)', start_date, end_date, job_start_time)
if obsolete_billable_periods.any?
current_billable_periods = enterprise.billable_periods.where('ends_at >= (?) AND updated_at >= (?)', start_date, job_start_time)
current_billable_periods = enterprise.billable_periods.where('ends_at >= (?) AND begins_at <= (?) AND updated_at < (?)', start_date, end_date, job_start_time)
Delayed::Worker.logger.info "#{enterprise.name} #{start_date.strftime("%F %T")} #{job_start_time.strftime("%F %T")}"
Delayed::Worker.logger.info "#{obsolete_billable_periods.first.updated_at.strftime("%F %T")}"

9
spec/jobs/update_billable_periods_spec.rb
View File

@@ -449,13 +449,20 @@ describe UpdateBillablePeriods do
context "cleaning up untouched billable periods" do
let(:job_start_time) { Time.now }
let(:enterprise) { create(:enterprise) }
# Updated after start
let!(:bp1) { create(:billable_period, enterprise: enterprise, updated_at: job_start_time + 2.seconds, begins_at: start_of_july, ends_at: start_of_july + 5.days ) }
let!(:bp2) { create(:billable_period, enterprise: enterprise, updated_at: job_start_time + 2.seconds, begins_at: start_of_july + 5.days, ends_at: start_of_july + 10.days ) }
# Updated before start
let!(:bp3) { create(:billable_period, enterprise: enterprise, updated_at: job_start_time - 5.seconds, begins_at: start_of_july, ends_at: start_of_july + 10.days ) }
# Updated before start but begins after end_date
let!(:bp4) { create(:billable_period, enterprise: enterprise, updated_at: job_start_time - 5.seconds, begins_at: start_of_july + 10.days, ends_at: start_of_july + 15.days ) }
# Updated before start but ends before start_date
let!(:bp5) { create(:billable_period, enterprise: enterprise, updated_at: job_start_time - 5.seconds, begins_at: start_of_july - 10.days, ends_at: start_of_july - 5.days ) }
before do
allow(Bugsnag).to receive(:notify)
allow(updater).to receive(:start_date) { start_of_july }
allow(updater).to receive(:end_date) { start_of_july + 8.days }
updater.clean_up_untouched_billable_periods_for(enterprise, job_start_time)
end
@@ -463,6 +470,8 @@ describe UpdateBillablePeriods do
expect(bp1.reload.deleted_at).to be_nil
expect(bp2.reload.deleted_at).to be_nil
expect(bp3.reload.deleted_at).to_not be_nil
expect(bp4.reload.deleted_at).to be_nil
expect(bp5.reload.deleted_at).to be_nil
end
it "notifies bugsnag" do