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

Store timestamp and user ID when closing requests

Browse source 
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2019-11-23 12:00:52 -05:00
parent 4b97789bab
commit 2422fb020b
5 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aurweb/git/serve.py
View file

@ -207,18 +207,22 @@ def pkgreq_close(reqid, user, reason, comments, autoclose=False):
conn = aurweb.db.Connection() conn = aurweb.db.Connection()
if autoclose: if autoclose:
userid = 0 userid = None
else: else:
cur = conn.execute("SELECT ID FROM Users WHERE Username = ?", [user]) cur = conn.execute("SELECT ID FROM Users WHERE Username = ?", [user])
userid = cur.fetchone()[0] userid = cur.fetchone()[0]
if userid == 0: if userid == 0:
raise aurweb.exceptions.InvalidUserException(user) raise aurweb.exceptions.InvalidUserException(user)
conn.execute("UPDATE PackageRequests SET Status = ?, ClosureComment = ? " + now = int(time.time())
"WHERE ID = ?", [status, comments, reqid]) conn.execute("UPDATE PackageRequests SET Status = ?, ClosedTS = ?, " +
"ClosedUID = ?, ClosureComment = ? " +
"WHERE ID = ?", [status, now, userid, comments, reqid])
conn.commit() conn.commit()
conn.close() conn.close()
if not userid:
userid = 0
subprocess.Popen((notify_cmd, 'request-close', str(userid), str(reqid), subprocess.Popen((notify_cmd, 'request-close', str(userid), str(reqid),
reason)).wait() reason)).wait()

5
schema/aur-schema.sql
View file

@ -336,11 +336,14 @@ CREATE TABLE PackageRequests (
Comments TEXT NOT NULL, Comments TEXT NOT NULL,
ClosureComment TEXT NOT NULL, ClosureComment TEXT NOT NULL,
RequestTS BIGINT UNSIGNED NOT NULL DEFAULT 0, RequestTS BIGINT UNSIGNED NOT NULL DEFAULT 0,
ClosedTS BIGINT UNSIGNED NULL DEFAULT NULL,
ClosedUID INTEGER UNSIGNED NULL DEFAULT NULL,
Status TINYINT UNSIGNED NOT NULL DEFAULT 0, Status TINYINT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (ID), PRIMARY KEY (ID),
FOREIGN KEY (ReqTypeID) REFERENCES RequestTypes(ID) ON DELETE NO ACTION, FOREIGN KEY (ReqTypeID) REFERENCES RequestTypes(ID) ON DELETE NO ACTION,
FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE SET NULL, FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE SET NULL,
FOREIGN KEY (PackageBaseID) REFERENCES PackageBases(ID) ON DELETE SET NULL FOREIGN KEY (PackageBaseID) REFERENCES PackageBases(ID) ON DELETE SET NULL,
FOREIGN KEY (ClosedUID) REFERENCES Users(ID) ON DELETE SET NULL
) ENGINE = InnoDB; ) ENGINE = InnoDB;
CREATE INDEX RequestsUsersID ON PackageRequests (UsersID); CREATE INDEX RequestsUsersID ON PackageRequests (UsersID);
CREATE INDEX RequestsPackageBaseID ON PackageRequests (PackageBaseID); CREATE INDEX RequestsPackageBaseID ON PackageRequests (PackageBaseID);

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

@ -381,9 +381,9 @@ test_expect_success "Check whether package requests are closed when disowning."
grep "^Subject.*PRQ" sendmail.out >sendmail.parts && grep "^Subject.*PRQ" sendmail.out >sendmail.parts &&
test_cmp sendmail.parts expected && test_cmp sendmail.parts expected &&
cat <<-EOD >expected && cat <<-EOD >expected &&
1|2|3|foobar||4||The user user disowned the package.|0|2 1|2||The user user disowned the package.
EOD EOD
echo "SELECT * FROM PackageRequests WHERE Status = 2;" | sqlite3 aur.db >actual && echo "SELECT ID, Status, ClosedUID, ClosureComment FROM PackageRequests WHERE ClosedTS > 0;" | sqlite3 aur.db >actual &&
test_cmp actual expected test_cmp actual expected
' '

6
upgrading/4.9.0.txt Normal file
View file

@ -0,0 +1,6 @@
1. Add new columns to store the timestamp and UID when closing requests:
----
ALTER TABLE PackageRequests ADD COLUMN ClosedTS BIGINT UNSIGNED NULL DEFAULT NULL;
ALTER TABLE PackageRequests ADD COLUMN ClosedUID INTEGER UNSIGNED NULL DEFAULT NULL;
----

2
web/lib/pkgreqfuncs.inc.php
View file

@ -247,6 +247,8 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
} }
$q = "UPDATE PackageRequests SET Status = " . intval($status) . ", "; $q = "UPDATE PackageRequests SET Status = " . intval($status) . ", ";
$q.= "ClosedTS = " . strval(time()) . ", ";
$q.= "ClosedUID = " . ($uid == 0 ? "NULL" : intval($uid)) . ", ";
$q.= "ClosureComment = " . $dbh->quote($comments) . " "; $q.= "ClosureComment = " . $dbh->quote($comments) . " ";
$q.= "WHERE ID = " . intval($id); $q.= "WHERE ID = " . intval($id);
$dbh->exec($q); $dbh->exec($q);