Skip to content

fix(user): migrate lastReultHashes typo to lastResultHashes safely (@mukundangopalachary) #7830

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
mukundangopalachary wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −5
Open

fix(user): migrate lastReultHashes typo to lastResultHashes safely (@mukundangopalachary) #7830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -402,7 +402,7 @@ export async function addResult(
}

if (req.ctx.configuration.users.lastHashesCheck.enabled) {
let lastHashes = user.lastReultHashes ?? [];
let lastHashes = user.lastResultHashes ?? user.lastReultHashes ?? [];
if (lastHashes.includes(resulthash)) {
void addLog(
"duplicate_result",
Expand Down
6 changes: 4 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 @@ -509,7 +509,8 @@ type RelevantUserInfo = Omit<
| "nameHistory"
| "lastNameChange"
| "_id"
| "lastReultHashes" //TODO fix typo
| "lastResultHashes"
| "lastReultHashes"
| "note"
| "ips"
| "testActivity"
Expand All @@ -524,7 +525,8 @@ function getRelevantUserInfo(user: UserDAL.DBUser): RelevantUserInfo {
"nameHistory",
"lastNameChange",
"_id",
"lastReultHashes", //TODO fix typo
"lastResultHashes",
"lastReultHashes",
"note",
"ips",
"testActivity",
Expand Down
5 changes: 4 additions & 1 deletion backend/src/dal/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,10 @@ export async function updateLastHashes(
{ uid },
{
$set: {
lastReultHashes: lastHashes, //TODO fix typo
lastResultHashes: lastHashes,
},
$unset: {
lastReultHashes: 1,
},
},
);
Expand Down
3 changes: 2 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 @@ -243,7 +243,8 @@ 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)
lastResultHashes: z.array(z.string()).optional(),
lastReultHashes: z.array(z.string()).optional(), //legacy typo, kept for backwards compatibility
completedTests: z.number().int().nonnegative().optional(),
startedTests: z.number().int().nonnegative().optional(),
timeTyping: z
Expand Down
Loading