external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add package base name in request close notifications

Browse source 
Mention both the package base name and the request type in the subject
of request closure notification.

Implements FS#41607.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2018-05-20 16:45:00 +02:00
parent 16795eaf46
commit b70f048bc3
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aurweb/scripts/notify.py
View file

@ -443,9 +443,14 @@ class RequestCloseNotification(Notification):
'WHERE PackageRequests.ID = ?', [reqid]) 'WHERE PackageRequests.ID = ?', [reqid])
self._to = aurweb.config.get('options', 'aur_request_ml') self._to = aurweb.config.get('options', 'aur_request_ml')
self._cc = [row[0] for row in cur.fetchall()] self._cc = [row[0] for row in cur.fetchall()]
cur = conn.execute('SELECT ClosureComment FROM PackageRequests ' + cur = conn.execute('SELECT PackageRequests.ClosureComment, ' +
'WHERE ID = ?', [reqid]) 'RequestTypes.Name, ' +
self._text = cur.fetchone()[0] 'PackageRequests.PackageBaseName ' +
'FROM PackageRequests ' +
'INNER JOIN RequestTypes ' +
'ON RequestTypes.ID = PackageRequests.ReqTypeID ' +
'WHERE PackageRequests.ID = ?', [reqid])
self._text, self._reqtype, self._pkgbase = cur.fetchone()
self._reqid = int(reqid) self._reqid = int(reqid)
self._reason = reason self._reason = reason
@ -453,7 +458,10 @@ class RequestCloseNotification(Notification):
return [(self._to, 'en')] return [(self._to, 'en')]
def get_subject(self, lang): def get_subject(self, lang):
return '[PRQ#%d] Request %s' % (self._reqid, self._reason.title()) return '[PRQ#%d] %s Request for %s %s' % (self._reqid,
self._reqtype.title(),
self._pkgbase,
self._reason.title())
def get_body(self, lang): def get_body(self, lang):
if self._user: if self._user:

2
test/t1200-git-serve.sh
View file

@ -376,7 +376,7 @@ test_expect_success "Check whether package requests are closed when disowning."
SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=user AUR_PRIVILEGED=0 \ SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=user AUR_PRIVILEGED=0 \
"$GIT_SERVE" 2>&1 && "$GIT_SERVE" 2>&1 &&
cat <<-EOD >expected && cat <<-EOD >expected &&
Subject: [PRQ#1] Request Accepted Subject: [PRQ#1] Orphan Request for foobar Accepted
EOD EOD
grep "^Subject.*PRQ" sendmail.out >sendmail.parts && grep "^Subject.*PRQ" sendmail.out >sendmail.parts &&
test_cmp sendmail.parts expected && test_cmp sendmail.parts expected &&

6
test/t2500-notify.sh
View file

@ -304,7 +304,7 @@ test_expect_success 'Test subject and body of request close notifications.' '
"$NOTIFY" request-close 1 1 accepted && "$NOTIFY" request-close 1 1 accepted &&
grep ^Subject: sendmail.out >actual && grep ^Subject: sendmail.out >actual &&
cat <<-EOD >expected && cat <<-EOD >expected &&
Subject: [PRQ#1] Request Accepted Subject: [PRQ#1] Deletion Request for foobar Accepted
EOD EOD
test_cmp actual expected && test_cmp actual expected &&
sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
@ -322,7 +322,7 @@ test_expect_success 'Test subject and body of request close notifications (auto-
"$NOTIFY" request-close 0 1 accepted && "$NOTIFY" request-close 0 1 accepted &&
grep ^Subject: sendmail.out >actual && grep ^Subject: sendmail.out >actual &&
cat <<-EOD >expected && cat <<-EOD >expected &&
Subject: [PRQ#1] Request Accepted Subject: [PRQ#1] Deletion Request for foobar Accepted
EOD EOD
test_cmp actual expected && test_cmp actual expected &&
sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&
@ -342,7 +342,7 @@ test_expect_success 'Test subject and body of request close notifications with c
"$NOTIFY" request-close 1 1 accepted && "$NOTIFY" request-close 1 1 accepted &&
grep ^Subject: sendmail.out >actual && grep ^Subject: sendmail.out >actual &&
cat <<-EOD >expected && cat <<-EOD >expected &&
Subject: [PRQ#1] Request Accepted Subject: [PRQ#1] Deletion Request for foobar Accepted
EOD EOD
test_cmp actual expected && test_cmp actual expected &&
sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual &&