Trigger date alerts when user is watcher of work package

pull/11482/head
Christophe Bliard 2 years ago
parent e12b07b28f
commit 9eebcd119f
No known key found for this signature in database
GPG Key ID: 2BC07603210C3FA4
  1. 1
      app/models/work_package.rb
  2. 55
      app/models/work_packages/scopes/involving_user.rb
  3. 10
      app/workers/notifications/create_date_alerts_notifications_job.rb
  4. 91
      spec/models/work_packages/scopes/involving_user_spec.rb

@ -124,6 +124,7 @@ class WorkPackage < ApplicationRecord
:for_scheduling,
:include_derived_dates,
:include_spent_time,
:involving_user,
:left_join_self_and_descendants,
:relatable

@ -0,0 +1,55 @@
#-- 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.
#++
#
module WorkPackages::Scopes
module InvolvingUser
extend ActiveSupport::Concern
class_methods do
# Fetches all work packages for which a user is assigned to, responsible
# for, or watcher, via a group or themself
#
# @param user User the user involved in work packages.
def involving_user(user)
WorkPackage.left_joins(:watchers)
.where(watchers: { user: })
.or(WorkPackage.where(assigned_to: user))
.or(WorkPackage.where(assigned_to: group_having(user)))
.or(WorkPackage.where(responsible: user))
.or(WorkPackage.where(responsible: group_having(user)))
end
private
def group_having(user)
GroupUser.select(:group_id).where(user_id: user.id)
end
end
end
end

@ -44,7 +44,7 @@ module Notifications
end
def send_start_date_alert_notifications(user)
work_package_with_involved(user)
WorkPackage.with_status_open.involving_user(user)
.where(start_date: Date.current + 1.day)
.each do |work_package|
create_service = Notifications::CreateService.new(user:)
@ -58,14 +58,6 @@ module Notifications
end
end
def work_package_with_involved(user)
work_packages = WorkPackage
.joins(:status)
.where(statuses: { is_closed: false })
work_packages.where(assigned_to: user)
.or(work_packages.where(responsible: user))
end
def time_zones_covering_1am_local_time
UserPreferences::UpdateContract
.assignable_time_zones

@ -0,0 +1,91 @@
#-- 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 'spec_helper'
describe WorkPackages::Scopes::InvolvingUser do
create_shared_association_defaults_for_work_package_factory
shared_let(:user) do
create(
:user,
# project_with_types is from create_shared_association_defaults_for_work_package_factory helper
member_in_project: project_with_types,
member_with_permissions: %i[view_work_packages]
)
end
it 'returns work packages for which a user is assigned to' do
_work_package_blank = create(:work_package)
work_package_assigned1 = create(:work_package, assigned_to: user)
work_package_assigned2 = create(:work_package, assigned_to: user)
expect(WorkPackage.involving_user(user))
.to contain_exactly(work_package_assigned1, work_package_assigned2)
end
it 'returns work packages for which a user is accountable / responsible' do
_work_package_blank = create(:work_package)
work_package_responsible1 = create(:work_package, responsible: user)
work_package_responsible2 = create(:work_package, responsible: user)
expect(WorkPackage.involving_user(user))
.to contain_exactly(work_package_responsible1, work_package_responsible2)
end
it 'returns work packages for which a user is a watcher' do
_work_package_blank = create(:work_package)
work_package_watched1 = create(:work_package)
create(:watcher, watchable: work_package_watched1, user:)
work_package_watched2 = create(:work_package)
create(:watcher, watchable: work_package_watched2, user:)
expect(WorkPackage.involving_user(user))
.to contain_exactly(work_package_watched1, work_package_watched2)
end
context 'when user is part of a group' do
shared_let(:group) { create(:group, members: [user]) }
it 'returns work packages for which the group is assigned to' do
_work_package_blank = create(:work_package)
work_package_assigned = create(:work_package, assigned_to: group)
expect(WorkPackage.involving_user(user))
.to contain_exactly(work_package_assigned)
end
it 'returns work packages for which the group is accountable / responsible' do
_work_package_blank = create(:work_package)
work_package_responsible = create(:work_package, responsible: group)
expect(WorkPackage.involving_user(user))
.to contain_exactly(work_package_responsible)
end
end
end
Loading…
Cancel
Save