monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2026-02-20 09:15:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

moved leaderboard code into a transaction to avoid collisions

Browse source
This commit is contained in:
Jack 2020-08-21 23:13:24 +01:00
parent 49952512e3
commit 2399fac316
1 changed files with 39 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
functions/index.js
View file

@ -1320,54 +1320,42 @@ async function checkLeaderboards(
["15", "60"].includes(String(resultObj.mode2)) &&
resultObj.language === "english"
) {
return db
.collection("leaderboards")
.where("mode", "==", String(resultObj.mode))
.where("mode2", "==", String(resultObj.mode2))
.where("type", "==", type)
.get()
.then((ret) => {
if (ret.docs.length === 0) {
//no lb found, create
console.log(
`no ${resultObj.mode} ${resultObj.mode2} ${type} leaderboard found - creating`
);
let toAdd = {
size: 20,
mode: String(resultObj.mode),
mode2: String(resultObj.mode2),
type: type,
};
return db
return await db.runTransaction(async (t) => {
const lbdoc = await t.get(
db
.collection("leaderboards")
.where("mode", "==", String(resultObj.mode))
.where("mode2", "==", String(resultObj.mode2))
.where("type", "==", type)
);
let lbData;
let docid = `${String(resultObj.mode)}_${String(
resultObj.mode2
)}_${type}`;
if (lbdoc.docs.length === 0) {
console.log(
`no ${resultObj.mode} ${resultObj.mode2} ${type} leaderboard found - creating`
);
let toAdd = {
size: 20,
mode: String(resultObj.mode),
mode2: String(resultObj.mode2),
type: type,
};
await t.set(
db
.collection("leaderboards")
.doc(
`${String(resultObj.mode)}_${String(resultObj.mode2)}_${type}`
)
.set(toAdd)
.then((ret) => {
return cont(
`${String(resultObj.mode)}_${String(
resultObj.mode2
)}_${type}`,
toAdd
);
});
} else {
//continue
return cont(
`${String(resultObj.mode)}_${String(resultObj.mode2)}_${type}`,
ret.docs[0].data()
);
}
});
function cont(docid, documentData) {
let boardInfo = documentData;
let boardData = boardInfo.board;
// console.log(`info ${JSON.stringify(boardInfo)}`);
// console.log(`data ${JSON.stringify(boardData)}`);
),
toAdd
);
lbData = toAdd;
} else {
lbData = lbdoc.docs[0].data();
}
let boardInfo = lbData;
let boardData = lbData.board;
let lb = new Leaderboard(
boardInfo.size,
resultObj.mode,
@ -1375,18 +1363,8 @@ async function checkLeaderboards(
boardInfo.type,
boardData
);
// console.log("board created");
// lb.logBoard();
console.log(
`inserting result by user ${resultObj.uid} ${resultObj.wpm} ${resultObj.rawWpm} ${resultObj.acc} into leaderboard ${resultObj.mode} ${resultObj.mode2} ${type}`
);
let insertResult = lb.insert(resultObj);
// console.log("board after inseft");
// lb.logBoard();
// console.log(lb);
if (insertResult.insertedAt >= 0) {
//update the database here
console.log(
@ -1394,22 +1372,17 @@ async function checkLeaderboards(
resultObj.mode2
} ${type} - ${JSON.stringify(lb.board)}`
);
db.collection("leaderboards").doc(docid).set(
{
size: lb.size,
type: lb.type,
board: lb.board,
},
{ merge: true }
);
} else {
// console.log("board is the same");
await t.update(db.collection("leaderboards").doc(docid), {
size: lb.size,
type: lb.type,
board: lb.board,
});
}
return {
insertedAt: insertResult,
};
}
});
} else {
return {
insertedAt: null,