TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle start / due only dates + optimize order

Browse Source 
Work packages must also be sorted on due dates when they do not have any start date. Also it is useless to have work packages without start and due dates.
pull/11205/head
Christophe Bliard 2 years ago
parent 4e2dd77892
commit 6e034390b7
No known key found for this signature in database
GPG Key ID: 2BC07603210C3FA4
2 changed files with 94 additions and 59 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 24
      app/workers/work_packages/apply_working_days_change_job.rb
  2. 119
      spec/workers/work_packages/apply_working_days_change_job_spec.rb

24
app/workers/work_packages/apply_working_days_change_job.rb
Unescape View File

@ -44,20 +44,32 @@ class WorkPackages::ApplyWorkingDaysChangeJob < ApplicationJob
def each_applicable_work_package
WorkPackage
.where(ignore_non_working_days: false)
.order(start_date: :asc)
.where.not(start_date: nil, due_date: nil)
.order(WorkPackage.arel_table[:start_date].asc.nulls_first,
WorkPackage.arel_table[:due_date].asc)
.pluck(:id)
.each do |id|
work_package = WorkPackage.find(id)
next if dates_and_duration_match?(work_package)
next unless dates_and_duration_mismatch?(work_package)
yield work_package
end
end
def dates_and_duration_match?(work_package)
days.working?(work_package.start_date) \
&& days.working?(work_package.due_date) \
&& days.duration(work_package.start_date, work_package.due_date) == work_package.duration
def dates_and_duration_mismatch?(work_package)
# precondition: ignore_non_working_days is false
non_working?(work_package.start_date) \
|| non_working?(work_package.due_date) \
|| wrong_duration?(work_package)
end
def non_working?(date)
date && !days.working?(date)
end
def wrong_duration?(work_package)
computed_duration = days.duration(work_package.start_date, work_package.due_date)
computed_duration && work_package.duration != computed_duration
end
def days

119
spec/workers/work_packages/apply_working_days_change_job_spec.rb
Unescape View File

@ -42,9 +42,13 @@ RSpec.describe WorkPackages::ApplyWorkingDaysChangeJob do
end
context 'when a work package includes a date that is now a non-working day' do
let_schedule(<<~CHART, ignore_non_working_days: false)
let_schedule(<<~CHART)
days | MTWTFSS |
work_package | XXXX |
work_package_on_start | XX |
work_package_on_due | XXX |
wp_start_only | [ |
wp_due_only | ] |
CHART
before do
@ -56,58 +60,92 @@ RSpec.describe WorkPackages::ApplyWorkingDaysChangeJob do
expect(WorkPackage.all).to match_schedule(<<~CHART)
days | MTWTFSS |
work_package | XX.XX |
work_package_on_start | XX |
work_package_on_due | XX.X |
wp_start_only | [ |
wp_due_only | ] |
CHART
end
end
context 'when a work package includes a date that is now a non-working day, but has working days include weekends' do
context 'when a work package was scheduled to start on a date that is now a non-working day' do
let_schedule(<<~CHART)
days | MTWTFSS |
work_package | XXXX | working days include weekends
work_package | XX |
CHART
before do
set_non_working_week_days('wednesday')
end
it 'does not move any dates' do
it 'moves the start date to the earliest working day in the future, ' \
'and the finish date changes by consequence [#31992]' do
job.perform_now(user_id: user.id)
expect(WorkPackage.all).to match_schedule(<<~CHART)
days | MTWTFSS |
work_package | XXXX | working days include weekends
work_package | XX |
CHART
end
end
context 'when a follower has a predecessor with dates covering a day that is now a non-working day' do
let_schedule(<<~CHART)
days | MTWTFSS |
predecessor | XX | working days work week
follower | XXX | working days include weekends, follows predecessor
CHART
before do
set_non_working_week_days('wednesday')
end
it 'moves the follower start date by consequence of the predecessor dates shift [#31992]' do
job.perform_now(user_id: user.id)
expect(WorkPackage.all).to match_schedule(<<~CHART)
days | MTWTFSS |
predecessor | X.X | working days work week
follower | XXX | working days include weekends
CHART
end
end
context 'when having multiple work packages' do
let_schedule(<<~CHART, ignore_non_working_days: false)
context 'when a work package has working days include weekends, and includes a date that is now a non-working day' do
let_schedule(<<~CHART)
days | MTWTFSS |
wp1 | XX |
wp2 | XX |
wp3 | XX |
wp4 | XX |
wp5 | XXXXX |
work_package | XXXX | working days include weekends
CHART
before do
set_non_working_week_days('wednesday')
end
it 'updates all impacted work packages' do
it 'does not move any dates' do
job.perform_now(user_id: user.id)
expect(WorkPackage.all).to match_schedule(<<~CHART)
days | MTWTFSS |
wp1 | XX |
wp2 | X.X |
wp3 | XX |
wp4 | XX |
wp5 | XX.XX..X |
work_package | XXXX | working days include weekends
CHART
end
end
context 'when a work package only has a duration' do
let_schedule(<<~CHART)
days | MTWTFSS |
work_package | | duration 3 days
CHART
before do
set_non_working_week_days('wednesday')
end
it 'does not change anything' do
job.perform_now(user_id: user.id)
expect(work_package.duration).to eq(3)
end
end
context 'when having multiple work packages following each other' do
let_schedule(<<~CHART, ignore_non_working_days: false)
let_schedule(<<~CHART)
days | MTWTFSS |
wp1 | X..XX | follows wp2
wp2 | X | follows wp3
@ -132,43 +170,28 @@ RSpec.describe WorkPackages::ApplyWorkingDaysChangeJob do
end
end
context 'when a work package was scheduled to start on a date that is now a non-working day' do
let_schedule(<<~CHART, ignore_non_working_days: false)
days | MTWTFSS |
work_package | XX |
CHART
before do
set_non_working_week_days('wednesday')
end
it 'moves the start date to the earliest working day in the future, ' \
'and the finish date changes by consequence [#31992]' do
job.perform_now(user_id: user.id)
expect(WorkPackage.all).to match_schedule(<<~CHART)
days | MTWTFSS |
work_package | XX |
CHART
end
end
context 'when a follower has a predecessor with dates covering a day that is now a non-working day' do
context 'when having multiple work packages following each other and first one only has a due date' do
let_schedule(<<~CHART)
days | MTWTFSS |
predecessor | XX | working days work week
follower | XXX | working days include weekends, follows predecessor
wp1 | X..XX | follows wp2
wp2 | XX | follows wp3
wp3 | ] |
CHART
before do
set_non_working_week_days('wednesday')
set_non_working_week_days('tuesday', 'wednesday', 'friday')
end
it 'moves the follower start date by consequence of the predecessor dates shift [#31992]' do
job.perform_now(user_id: user.id)
it 'updates them only once' do
expect { job.perform_now(user_id: user.id) }
.to change { WorkPackage.pluck(:lock_version) }
.from([0, 0, 0])
.to([1, 1, 1])
expect(WorkPackage.all).to match_schedule(<<~CHART)
days | MTWTFSS |
predecessor | X.X | working days work week
follower | XXX | working days include weekends
days | MTWTFSSm t ssm t ssm |
wp1 | X..X...X |
wp2 | X..X |
wp3 | ] |
CHART
end
end

Write Preview
Loading…
Cancel
Save