Skip to content

fix(user): migrate lastReultHashes to lastResultHashes safely (@Tryhard-source) #8055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tryhard-source wants to merge 9 commits into
base: master
Choose a base branch
from
+15 −12
Open

fix(user): migrate lastReultHashes to lastResultHashes safely (@Tryhard-source) #8055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1680d74
fix(user): migrate lastReultHashes to lastResultHashes safely
Jun 4, 2026
75def8e
chore: format code
Jun 4, 2026
357e133
fix: remove unused PersonalBests import
Jun 4, 2026
74f7840
chore: format code
Jun 4, 2026
7f9b163
Fixed legacy 'lastReultHashes' -> 'lastResultHashes' mapping causing …
Jun 4, 2026
0825f8d
fix(user): rename lastResultHashes + migrate legacy field
Jun 4, 2026
831ee9d
fix review comments
Jun 5, 2026
d9d9178
fix: address review feedback
Jun 5, 2026
39e2123
fix review comments
fehmer Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/src/api/controllers/result.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ export async function addResult(
}

if (req.ctx.configuration.users.lastHashesCheck.enabled) {
let lastHashes = user.lastReultHashes ?? [];
let lastHashes = user.lastResultHashes ?? [];
if (lastHashes.includes(resulthash)) {
void addLog(
"duplicate_result",
Expand Down
4 changes: 2 additions & 2 deletions backend/src/api/controllers/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ type RelevantUserInfo = Omit<
| "nameHistory"
| "lastNameChange"
| "_id"
| "lastReultHashes" //TODO fix typo
Comment thread
fehmer marked this conversation as resolved.
| "lastResultHashes"
| "note"
| "ips"
| "testActivity"
Expand All @@ -525,11 +525,11 @@ function getRelevantUserInfo(user: UserDAL.DBUser): RelevantUserInfo {
"nameHistory",
"lastNameChange",
"_id",
"lastReultHashes", //TODO fix typo
Comment thread
fehmer marked this conversation as resolved.
"note",
"ips",
"testActivity",
"suspicious",
"lastResultHashes",
]) as RelevantUserInfo;
}

Expand Down
20 changes: 12 additions & 8 deletions backend/src/dal/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@ import {
CountByYearAndDay,
Friend,
} from "@monkeytype/schemas/users";
import {
Mode,
Mode2,
PersonalBest,
PersonalBests,
} from "@monkeytype/schemas/shared";
import { Mode, Mode2, PersonalBest } from "@monkeytype/schemas/shared";
import { addImportantLog } from "./logs";
import { Result as ResultType } from "@monkeytype/schemas/results";
import { Configuration } from "@monkeytype/schemas/configuration";
Expand Down Expand Up @@ -67,6 +62,7 @@ export type DBUser = Omit<
testActivity?: CountByYearAndDay;
suspicious?: boolean;
note?: string;
lastResultHashes?: string[];
};

const SECONDS_PER_HOUR = 3600;
Expand Down Expand Up @@ -586,7 +582,10 @@ export async function updateLastHashes(
{ uid },
{
$set: {
lastReultHashes: lastHashes, //TODO fix typo
lastResultHashes: lastHashes,
},
$unset: {
lastReultHashes: "", // remove Legacy property
},
},
);
Expand Down Expand Up @@ -1368,7 +1367,7 @@ export async function getFriends(uid: string): Promise<DBFriend[]> {
);
}

function migrateUser<T extends { personalBests: PersonalBests }>(user: T): T {
function migrateUser<T extends DBUser>(user: T): T {
user.personalBests ??= {
time: {},
words: {},
Expand All @@ -1377,5 +1376,10 @@ function migrateUser<T extends { personalBests: PersonalBests }>(user: T): T {
custom: {},
};

if ("lastReultHashes" in user) {
user.lastResultHashes = user["lastReultHashes"] as string[];
delete user["lastReultHashes"];
}

return user;
}
1 change: 0 additions & 1 deletion packages/schemas/src/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ export const UserSchema = z.object({
uid: z.string(), //defined by firebase, no validation should be applied
addedAt: z.number().int().nonnegative(),
personalBests: PersonalBestsSchema,
lastReultHashes: z.array(z.string()).optional(), //TODO: fix typo (it's in the db too)
completedTests: z.number().int().nonnegative().optional(),
startedTests: z.number().int().nonnegative().optional(),
timeTyping: z
Expand Down
Loading