Merge pull request #11205 from opf/implementation/42923-handle-updating-schedule-as-non-working-days-are-changed
[#42923] Add job to reschedule on weekend days changespull/11261/head
Oliver Günther
2 years ago
committed by
GitHub
commit
2e6ae87747
@ -0,0 +1,78 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2022 the OpenProject GmbH |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See COPYRIGHT and LICENSE files for more details. |
||||
#++ |
||||
|
||||
class WorkPackages::ApplyWorkingDaysChangeJob < ApplicationJob |
||||
queue_with_priority :above_normal |
||||
|
||||
def perform(user_id:) |
||||
user = User.find(user_id) |
||||
|
||||
each_applicable_work_package do |work_package| |
||||
WorkPackages::UpdateService |
||||
.new(user:, model: work_package, contract_class: EmptyContract) |
||||
.call(duration: work_package.duration) |
||||
end |
||||
end |
||||
|
||||
private |
||||
|
||||
def each_applicable_work_package |
||||
WorkPackage |
||||
.where(ignore_non_working_days: false) |
||||
.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 unless dates_and_duration_mismatch?(work_package) |
||||
|
||||
yield work_package |
||||
end |
||||
end |
||||
|
||||
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 |
||||
@days ||= WorkPackages::Shared::WorkingDays.new |
||||
end |
||||
end |
||||
@ -0,0 +1,298 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2022 the OpenProject GmbH |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See COPYRIGHT and LICENSE files for more details. |
||||
#++ |
||||
|
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe WorkPackages::ApplyWorkingDaysChangeJob do |
||||
subject(:job) { described_class } |
||||
|
||||
shared_let(:user) { create(:user) } |
||||
|
||||
let!(:week) { create(:week_with_saturday_and_sunday_as_weekend) } |
||||
|
||||
def set_non_working_week_days(*days) |
||||
set_week_days(*days, working: false) |
||||
end |
||||
|
||||
def set_working_week_days(*days) |
||||
set_week_days(*days, working: true) |
||||
end |
||||
|
||||
def set_week_days(*days, working:) |
||||
days.each do |day| |
||||
wday = %w[xxx monday tuesday wednesday thursday friday saturday sunday].index(day.downcase) |
||||
WeekDay.find_by!(day: wday).update(working:) |
||||
end |
||||
end |
||||
|
||||
context 'when a work package includes a date that is now a non-working day' do |
||||
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 |
||||
set_non_working_week_days('wednesday') |
||||
end |
||||
|
||||
it 'moves the finish date to the corresponding number of now-excluded days to maintain duration [#31992]' do |
||||
job.perform_now(user_id: user.id) |
||||
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 was scheduled to start on a date that is now a non-working day' do |
||||
let_schedule(<<~CHART) |
||||
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 work package includes a date that is no more a non-working day' do |
||||
let_schedule(<<~CHART) |
||||
days | fssMTWTFSS | |
||||
work_package | X..XX | |
||||
CHART |
||||
|
||||
before do |
||||
set_working_week_days('saturday') |
||||
end |
||||
|
||||
it 'moves the finish date backwards to the corresponding number of now-included days to maintain duration [#31992]' do |
||||
job.perform_now(user_id: user.id) |
||||
expect(WorkPackage.all).to match_schedule(<<~CHART) |
||||
days | fssMTWTFSS | |
||||
work_package | XX.X | |
||||
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 a follower has a predecessor with dates covering a day that is now a working day' do |
||||
let!(:week) { create(:week, working_days: ['monday', 'tuesday', 'thursday', 'friday']) } |
||||
|
||||
let_schedule(<<~CHART) |
||||
days | MTWTFSS | |
||||
predecessor | X.X | working days work week |
||||
follower | XXX | working days include weekends, follows predecessor |
||||
CHART |
||||
|
||||
before do |
||||
set_working_week_days('wednesday') |
||||
end |
||||
|
||||
it 'moves the follower start date backwards by consequence of the predecessor dates shift' do |
||||
job.perform_now(user_id: user.id) |
||||
expect(WorkPackage.all).to match_schedule(<<~CHART) |
||||
days | MTWTFSS | |
||||
predecessor | XX | working days work week |
||||
follower | XXX | working days include weekends |
||||
CHART |
||||
end |
||||
end |
||||
|
||||
xcontext 'when a follower has a predecessor with a non-working day between them that is now a working day' do |
||||
let!(:week) { create(:week, working_days: ['monday', 'tuesday', 'thursday', 'friday']) } |
||||
|
||||
let_schedule(<<~CHART) |
||||
days | MTWTFSS | |
||||
predecessor | XX | |
||||
follower | XX | follows predecessor |
||||
CHART |
||||
|
||||
before do |
||||
set_working_week_days('wednesday') |
||||
end |
||||
|
||||
it 'moves the follower start date one day back to keep the same gap between them' do |
||||
job.perform_now(user_id: user.id) |
||||
expect(WorkPackage.all).to match_schedule(<<~CHART) |
||||
days | MTWTFSS | |
||||
predecessor | XX | |
||||
follower | XX | |
||||
CHART |
||||
end |
||||
end |
||||
|
||||
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 | |
||||
work_package | XXXX | working days include weekends |
||||
CHART |
||||
|
||||
before do |
||||
set_non_working_week_days('wednesday') |
||||
end |
||||
|
||||
it 'does not move any dates' do |
||||
job.perform_now(user_id: user.id) |
||||
expect(WorkPackage.all).to match_schedule(<<~CHART) |
||||
days | MTWTFSS | |
||||
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, and having days becoming non working days' do |
||||
let_schedule(<<~CHART) |
||||
days | MTWTFSS | |
||||
wp1 | X..XX | follows wp2 |
||||
wp2 | X | follows wp3 |
||||
wp3 | XXX | |
||||
CHART |
||||
|
||||
before do |
||||
set_non_working_week_days('tuesday', 'wednesday', 'friday') |
||||
end |
||||
|
||||
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 | MTWTFSSmtwtfssmtwtfss | |
||||
wp1 | X..X...X | |
||||
wp2 | X | |
||||
wp3 | X..X...X | |
||||
CHART |
||||
end |
||||
end |
||||
|
||||
xcontext 'when having multiple work packages following each other, and having days becoming working days' do |
||||
let!(:week) { create(:week, working_days: ['monday', 'thursday']) } |
||||
|
||||
let_schedule(<<~CHART) |
||||
days | MTWTFSSmtwtfssmtwtfss | |
||||
wp1 | X..X...X | follows wp2 |
||||
wp2 | X | follows wp3 |
||||
wp3 | X..X...X | |
||||
CHART |
||||
|
||||
before do |
||||
set_working_week_days('tuesday', 'wednesday', 'friday') |
||||
end |
||||
|
||||
it 'updates them only once' do |
||||
job.perform_now(user_id: user.id) |
||||
expect(WorkPackage.all).to match_schedule(<<~CHART) |
||||
days | MTWTFSSmt | |
||||
wp1 | X..XX | |
||||
wp2 | X | |
||||
wp3 | XXX | |
||||
CHART |
||||
expect(WorkPackage.pluck(:lock_version)).to all(be_less_or_equal_than(1)) |
||||
end |
||||
end |
||||
|
||||
context 'when having multiple work packages following each other and first one only has a due date' do |
||||
let_schedule(<<~CHART) |
||||
days | MTWTFSS | |
||||
wp1 | X..XX | follows wp2 |
||||
wp2 | XX | follows wp3 |
||||
wp3 | ] | |
||||
CHART |
||||
|
||||
before do |
||||
set_non_working_week_days('tuesday', 'wednesday', 'friday') |
||||
end |
||||
|
||||
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 | MTWTFSSm t ssm t ssm | |
||||
wp1 | X..X...X | |
||||
wp2 | X..X | |
||||
wp3 | ] | |
||||
CHART |
||||
end |
||||
end |
||||
end |
||||
Loading…
Reference in new issue