[keyserver] Update updateUserAvatar to use new user_container column
ClosedPublic
Actions

Authored by ashoat on May 10 2024, 8:40 AM.

Details

Reviewers

tomek

Commits

rCOMM4f75bef28080: [keyserver] Update updateUserAvatar to use new user_container column

Summary

This diff updates the keyserver function that handles user avatar assignment to assign based on the new user_container column. We still check the old container column to make sure that the upload in question has not already been assigned.

Depends on D11986

Test Plan

I tested the whole stack with the following steps:

Ran the migration on a backup of my production keyserver database from September 2023. Confirm that the uploads table has the new column, that it has an index, and that it's populated for all cases where the old column matched a user. Confirm that only 32 rows were updated, which matched the number of users with avatars in a prior query
Create a brand new database. Confirm that the Confirm that the uploads table has the new column, and that it has an index. Make sure DESCRIBE uploads; matches what it looked like in step 1
Run the migration on my local multi-keyserver testing database. Make sure I'm still able to log in with an existing user. Confirm I can change the existing user's avatar to a photo and that there are no errors in the logs. Confirm that the avatar is still there if I log out and back in
On the same database, try creating a new user with a photo avatar and confirm that it works, and that there are no errors in the logs. Confirm that the avatar is still there if I log out and back in
Ran git grep container in the keyserver folder and reviewed every result to consider whether it needs to be updated

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

ashoat created this revision.May 10 2024, 8:40 AM

ashoat added a child revision: D11988: [keyserver] Update user fetching to use new user_container column.

ashoat added inline comments.May 10 2024, 8:47 AM

keyserver/src/updaters/account-updaters.js
141	We leave this line and the one on line 151 to make sure that we don't assign an upload that has already been assigned

Harbormaster completed remote builds in B28835: Diff 40075.May 10 2024, 8:57 AM

ashoat requested review of this revision.May 10 2024, 8:57 AM

tomek accepted this revision.May 13 2024, 1:43 AM

This revision is now accepted and ready to land.May 13 2024, 1:43 AM

Closed by commit rCOMM4f75bef28080: [keyserver] Update updateUserAvatar to use new user_container column (authored by ashoat). · Explain WhyMay 13 2024, 6:08 AM

This revision was automatically updated to reflect the committed changes.

ashoat added a commit: rCOMM4f75bef28080: [keyserver] Update updateUserAvatar to use new user_container column.

Revision Contents
Changeset List

Path

Size

keyserver/

src/

updaters/

account-updaters.js

12 lines

Diff 40075

View Options

keyserver/src/updaters/account-updaters.js

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines	const mediaID =
request.type === 'image' \|\| request.type === 'encrypted_image'		request.type === 'image' \|\| request.type === 'encrypted_image'
? request.uploadID		? request.uploadID
: null;		: null;

const query = SQL`		const query = SQL`
START TRANSACTION;		START TRANSACTION;

UPDATE uploads		UPDATE uploads
SET container = NULL		SET user_container = NULL
WHERE uploader = ${viewer.userID}		WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID}		AND user_container = ${viewer.userID}
AND (		AND (
${mediaID} IS NULL		${mediaID} IS NULL
OR EXISTS (		OR EXISTS (
SELECT 1		SELECT 1
FROM uploads		FROM uploads
WHERE id = ${mediaID}		WHERE id = ${mediaID}
AND uploader = ${viewer.userID}		AND uploader = ${viewer.userID}
AND container IS NULL		AND container IS NULL
		ashoatAuthorUnsubmitted Done Inline Actions We leave this line and the one on line 151 to make sure that we don't assign an upload that has already been assigned ashoat: We leave this line and the one on line 151 to make sure that we don't assign an upload that has…
		AND user_container IS NULL
AND thread IS NULL		AND thread IS NULL
)		)
);		);

UPDATE uploads		UPDATE uploads
SET container = ${viewer.userID}		SET user_container = ${viewer.userID}
WHERE id = ${mediaID}		WHERE id = ${mediaID}
AND uploader = ${viewer.userID}		AND uploader = ${viewer.userID}
AND container IS NULL		AND container IS NULL
		AND user_container IS NULL
AND thread IS NULL;		AND thread IS NULL;

UPDATE users		UPDATE users
SET avatar = ${newAvatarValue}		SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID}		WHERE id = ${viewer.userID}
AND (		AND (
${mediaID} IS NULL		${mediaID} IS NULL
OR EXISTS (		OR EXISTS (
SELECT 1		SELECT 1
FROM uploads		FROM uploads
WHERE id = ${mediaID}		WHERE id = ${mediaID}
AND uploader = ${viewer.userID}		AND uploader = ${viewer.userID}
AND container = ${viewer.userID}		AND user_container = ${viewer.userID}
AND thread IS NULL		AND thread IS NULL
)		)
);		);

COMMIT;		COMMIT;

SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra		SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads		FROM uploads
WHERE id = ${mediaID}		WHERE id = ${mediaID}
AND uploader = ${viewer.userID}		AND uploader = ${viewer.userID}
AND container = ${viewer.userID};		AND user_container = ${viewer.userID};
`;		`;

const [resultSet] = await dbQuery(query, { multipleStatements: true });		const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop();		const selectResult = resultSet.pop();

const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);		const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates(		const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer,		viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines

[keyserver] Update updateUserAvatar to use new user_container columnClosedPublicActions