Fix NOI contest update score not locked

models/contest.js

@@ -123,9 +123,8 @@ class Contest extends Model {
     let problems = await this.getProblems();
     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,
         user_id: judge_state.user_id
       });
@@ -136,7 +135,6 @@ class Contest extends Model {
           user_id: judge_state.user_id
         });
       }
-    });
 
       await player.updateScore(judge_state);
       await player.save();
@@ -144,6 +142,7 @@ class Contest extends Model {
       await this.loadRelationships();
       await this.ranklist.updatePlayer(this, player);
       await this.ranklist.save();
+    });
   }
 
   async isRunning(now) {

models/contest_player.js

@@ -69,7 +69,6 @@ class ContestPlayer extends Model {
   }
 
   async updateScore(judge_state) {
-    await syzoj.utils.lock(['ContestPlayer::updateScore', this.id], async () => {
     await this.loadRelationships();
     if (this.contest.type === 'ioi') {
       if (!judge_state.pending) {
@@ -107,10 +106,13 @@ class ContestPlayer extends Model {
         }
       }
     } else if (this.contest.type === 'noi') {
+      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] = {
         score: judge_state.score,
         judge_id: judge_state.id
       };
+
       this.score = 0;
       for (let x in this.score_details) {
         this.score += this.score_details[x].score;
@@ -161,7 +163,6 @@ class ContestPlayer extends Model {
         }
       }
     }
-    });
   }
 
   getModel() { return model; }