From be64ca7b0e88bf913e31a1f51b2f5ef0620df220 Mon Sep 17 00:00:00 2001
From: Bert Peters via aur-dev <aur-dev@lists.archlinux.org>
Date: Sun, 11 Jul 2021 20:29:17 +0200
Subject: [PATCH] Send request notifications to co-maintainers
This is in addition to the current recipients. Co-maintainers should
also be made aware when their package has pending requests.
---
aurweb/scripts/notify.py | 6 ++++++
test/t2500-notify.t | 17 +++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index 7f8e7168e..1fb4707bb 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -435,9 +435,12 @@ class RequestOpenNotification(Notification):
cur = conn.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' +
'INNER JOIN PackageBases ' +
'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
+ 'LEFT JOIN PackageComaintainers ' +
+ 'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +
'INNER JOIN Users ' +
'ON Users.ID = PackageRequests.UsersID ' +
'OR Users.ID = PackageBases.MaintainerUID ' +
+ 'OR Users.ID = PackageComaintainers.UsersID ' +
'WHERE PackageRequests.ID = ? AND ' +
'Users.Suspended = 0', [reqid])
self._to = aurweb.config.get('options', 'aur_request_ml')
@@ -492,9 +495,12 @@ class RequestCloseNotification(Notification):
cur = conn.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' +
'INNER JOIN PackageBases ' +
'ON PackageBases.ID = PackageRequests.PackageBaseID ' +
+ 'LEFT JOIN PackageComaintainers ' +
+ 'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +
'INNER JOIN Users ' +
'ON Users.ID = PackageRequests.UsersID ' +
'OR Users.ID = PackageBases.MaintainerUID ' +
+ 'OR Users.ID = PackageComaintainers.UsersID ' +
'WHERE PackageRequests.ID = ? AND ' +
'Users.Suspended = 0', [reqid])
self._to = aurweb.config.get('options', 'aur_request_ml')
diff --git a/test/t2500-notify.t b/test/t2500-notify.t
index 713b31e3d..c0592c910 100755
--- a/test/t2500-notify.t
+++ b/test/t2500-notify.t
@@ -369,6 +369,23 @@ test_expect_success 'Test subject and body of request close notifications (auto-
test_cmp actual expected
'
+test_expect_success 'Test Cc of request close notification with co-maintainer.' '
+ cat <<-EOD | sqlite3 aur.db &&
+ /* Use package base IDs which can be distinguished from user IDs. */
+ INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1001, 3, 1);
+ EOD
+ >sendmail.out &&
+ "$NOTIFY" request-close 0 3001 accepted &&
+ grep ^Cc: sendmail.out >actual &&
+ cat <<-EOD >expected &&
+ Cc: user@localhost, tu@localhost, dev@localhost
+ EOD
+ test_cmp actual expected &&
+ cat <<-EOD | sqlite3 aur.db
+ DELETE FROM PackageComaintainers;
+ EOD
+'
+
test_expect_success 'Test subject and body of request close notifications with closure comment.' '
cat <<-EOD | sqlite3 aur.db &&
UPDATE PackageRequests SET ClosureComment = "This is a test closure comment." WHERE ID = 3001;
--
GitLab