github
/
fair-web
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Fix NOI contest update score not locked

pull/6/head
Menci 8 years ago
parent
5e259450a3
commit
89296d3fa2
2 changed files with 83 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      models/contest.js
  2. 149
      models/contest_player.js

17
models/contest.js
Unescape View File

@ -123,9 +123,8 @@ class Contest extends Model {
let problems = await this.getProblems(); let problems = await this.getProblems();
if (!problems.includes(judge_state.problem_id)) throw new ErrorMessage('当前比赛中无此题目。'); if (!problems.includes(judge_state.problem_id)) throw new ErrorMessage('当前比赛中无此题目。');
let player; await syzoj.utils.lock(['Contest::newSubmission', judge_state.user_id], async () => {
await syzoj.utils.lock(['Contest::newSubmission', 'create_player', judge_state.user_id], async () => { let player = await ContestPlayer.findInContest({
player = await ContestPlayer.findInContest({
contest_id: this.id, contest_id: this.id,
user_id: judge_state.user_id user_id: judge_state.user_id
}); });
@ -136,14 +135,14 @@ class Contest extends Model {
user_id: judge_state.user_id user_id: judge_state.user_id
}); });
} }
});
await player.updateScore(judge_state); await player.updateScore(judge_state);
await player.save(); await player.save();
await this.loadRelationships(); await this.loadRelationships();
await this.ranklist.updatePlayer(this, player); await this.ranklist.updatePlayer(this, player);
await this.ranklist.save(); await this.ranklist.save();
});
} }
async isRunning(now) { async isRunning(now) {

149
models/contest_player.js
Unescape View File

@ -69,99 +69,100 @@ class ContestPlayer extends Model {
} }
async updateScore(judge_state) { async updateScore(judge_state) {
await syzoj.utils.lock(['ContestPlayer::updateScore', this.id], async () => { await this.loadRelationships();
await this.loadRelationships(); if (this.contest.type === 'ioi') {
if (this.contest.type === 'ioi') { if (!judge_state.pending) {
if (!judge_state.pending) { if (!this.score_details[judge_state.problem_id]) {
if (!this.score_details[judge_state.problem_id]) { this.score_details[judge_state.problem_id] = {
this.score_details[judge_state.problem_id] = {
score: judge_state.score,
judge_id: judge_state.id,
submissions: {}
};
}
this.score_details[judge_state.problem_id].submissions[judge_state.id] = {
judge_id: judge_state.id,
score: judge_state.score, score: judge_state.score,
time: judge_state.submit_time judge_id: judge_state.id,
submissions: {}
}; };
}
let arr = Object.values(this.score_details[judge_state.problem_id].submissions); this.score_details[judge_state.problem_id].submissions[judge_state.id] = {
arr.sort((a, b) => a.time - b.time); judge_id: judge_state.id,
score: judge_state.score,
let maxScoreSubmission = null; time: judge_state.submit_time
for (let x of arr) { };
if (!maxScoreSubmission || x.score >= maxScoreSubmission.score && maxScoreSubmission.score < 100) {
maxScoreSubmission = x;
}
}
this.score_details[judge_state.problem_id].judge_id = maxScoreSubmission.judge_id; let arr = Object.values(this.score_details[judge_state.problem_id].submissions);
this.score_details[judge_state.problem_id].score = maxScoreSubmission.score; arr.sort((a, b) => a.time - b.time);
this.score_details[judge_state.problem_id].time = maxScoreSubmission.time;
this.score = 0; let maxScoreSubmission = null;
for (let x in this.score_details) { for (let x of arr) {
this.score += this.score_details[x].score; if (!maxScoreSubmission || x.score >= maxScoreSubmission.score && maxScoreSubmission.score < 100) {
maxScoreSubmission = x;
} }
} }
} else if (this.contest.type === 'noi') {
this.score_details[judge_state.problem_id] = { this.score_details[judge_state.problem_id].judge_id = maxScoreSubmission.judge_id;
score: judge_state.score, this.score_details[judge_state.problem_id].score = maxScoreSubmission.score;
judge_id: judge_state.id this.score_details[judge_state.problem_id].time = maxScoreSubmission.time;
};
this.score = 0; this.score = 0;
for (let x in this.score_details) { for (let x in this.score_details) {
this.score += this.score_details[x].score; this.score += this.score_details[x].score;
} }
} else if (this.contest.type === 'acm') { }
if (!judge_state.pending) { } else if (this.contest.type === 'noi') {
if (!this.score_details[judge_state.problem_id]) { if (this.score_details[judge_state.problem_id] && this.score_details[judge_state.problem_id].judge_id > judge_state.id) return;
this.score_details[judge_state.problem_id] = {
accepted: false,
unacceptedCount: 0,
acceptedTime: 0,
judge_id: 0,
submissions: {}
};
}
this.score_details[judge_state.problem_id].submissions[judge_state.id] = { this.score_details[judge_state.problem_id] = {
judge_id: judge_state.id, score: judge_state.score,
accepted: judge_state.status === 'Accepted', judge_id: judge_state.id
compiled: judge_state.status !== 'Compile Error', };
time: judge_state.submit_time
this.score = 0;
for (let x in this.score_details) {
this.score += this.score_details[x].score;
}
} else if (this.contest.type === 'acm') {
if (!judge_state.pending) {
if (!this.score_details[judge_state.problem_id]) {
this.score_details[judge_state.problem_id] = {
accepted: false,
unacceptedCount: 0,
acceptedTime: 0,
judge_id: 0,
submissions: {}
}; };
}
let arr = Object.values(this.score_details[judge_state.problem_id].submissions); this.score_details[judge_state.problem_id].submissions[judge_state.id] = {
arr.sort((a, b) => a.time - b.time); judge_id: judge_state.id,
accepted: judge_state.status === 'Accepted',
this.score_details[judge_state.problem_id].unacceptedCount = 0; compiled: judge_state.status !== 'Compile Error',
this.score_details[judge_state.problem_id].judge_id = 0; time: judge_state.submit_time
this.score_details[judge_state.problem_id].accepted = 0; };
for (let x of arr) {
if (x.accepted) {
this.score_details[judge_state.problem_id].accepted = true;
this.score_details[judge_state.problem_id].acceptedTime = x.time;
this.score_details[judge_state.problem_id].judge_id = x.judge_id;
break;
} else if (x.compiled) {
this.score_details[judge_state.problem_id].unacceptedCount++;
}
}
if (!this.score_details[judge_state.problem_id].accepted) { let arr = Object.values(this.score_details[judge_state.problem_id].submissions);
this.score_details[judge_state.problem_id].judge_id = arr[arr.length - 1].judge_id; arr.sort((a, b) => a.time - b.time);
this.score_details[judge_state.problem_id].unacceptedCount = 0;
this.score_details[judge_state.problem_id].judge_id = 0;
this.score_details[judge_state.problem_id].accepted = 0;
for (let x of arr) {
if (x.accepted) {
this.score_details[judge_state.problem_id].accepted = true;
this.score_details[judge_state.problem_id].acceptedTime = x.time;
this.score_details[judge_state.problem_id].judge_id = x.judge_id;
break;
} else if (x.compiled) {
this.score_details[judge_state.problem_id].unacceptedCount++;
} }
}
this.score = 0; if (!this.score_details[judge_state.problem_id].accepted) {
for (let x in this.score_details) { this.score_details[judge_state.problem_id].judge_id = arr[arr.length - 1].judge_id;
if (this.score_details[x].accepted) this.score++; }
}
this.score = 0;
for (let x in this.score_details) {
if (this.score_details[x].accepted) this.score++;
} }
} }
}); }
} }
getModel() { return model; } getModel() { return model; }

Write Preview
Loading…
Cancel
Save