update

2025-10-23 16:09:40 +08:00
parent 03f1bfdf86
commit 1b06e94473
5 changed files with 196 additions and 35 deletions
--- a/problemset/views/admin.py
+++ b/problemset/views/admin.py
@@ -177,6 +177,9 @@ class ProblemSetProblemAdminAPI(APIView):
            hint=data.get("hint", ""),
        )

+        # 同步所有用户的进度
+        ProblemSetProgress.sync_all_progress_for_problemset(problem_set)
+
        return self.success("题目已添加到题单")

    @super_admin_required
@@ -208,6 +211,10 @@ class ProblemSetProblemAdminAPI(APIView):
            problem_set_problem.hint = data["hint"]

        problem_set_problem.save()
+        
+        # 同步所有用户的进度
+        ProblemSetProgress.sync_all_progress_for_problemset(problem_set)
+        
        return self.success("题目已更新")

    @super_admin_required
@@ -224,6 +231,10 @@ class ProblemSetProblemAdminAPI(APIView):
                id=problem_set_problem_id, problemset=problem_set
            )
            problem_set_problem.delete()
+            
+            # 同步所有用户的进度
+            ProblemSetProgress.sync_all_progress_for_problemset(problem_set)
+            
            return self.success("题目已从题单中移除")
        except ProblemSetProblem.DoesNotExist:
            return self.error("题目不在该题单中")
@@ -277,6 +288,10 @@ class ProblemSetBadgeAdminAPI(APIView):
            return self.error("奖章不存在")

        data = request.data
+        
+        # 记录是否修改了条件相关的字段
+        condition_changed = False
+        
        # 更新奖章属性
        if "name" in data:
            badge.name = data["name"]
@@ -286,12 +301,23 @@ class ProblemSetBadgeAdminAPI(APIView):
            badge.icon = data["icon"]
        if "condition_type" in data:
            badge.condition_type = data["condition_type"]
+            condition_changed = True
        if "condition_value" in data:
            badge.condition_value = data["condition_value"]
+            condition_changed = True
        if "level" in data:
            badge.level = data["level"]

        badge.save()
+        
+        # 如果修改了条件，重新计算所有用户的徽章资格
+        if condition_changed:
+            try:
+                badge.recalculate_user_badges()
+                return self.success("奖章已更新，并重新计算了所有用户的徽章资格")
+            except Exception as e:
+                return self.error(f"奖章已更新，但重新计算徽章资格时出错: {str(e)}")
+        
        return self.success("奖章已更新")

    @super_admin_required
@@ -348,6 +374,24 @@ class ProblemSetProgressAdminAPI(APIView):
            return self.error("用户未加入该题单")


+class ProblemSetSyncAPI(APIView):
+    """题单同步管理API"""
+    
+    @super_admin_required
+    def post(self, request, problem_set_id):
+        """手动同步题单的所有用户进度（管理员）"""
+        try:
+            problem_set = ProblemSet.objects.get(id=problem_set_id)
+            ensure_created_by(problem_set, request.user)
+        except ProblemSet.DoesNotExist:
+            return self.error("题单不存在")
+        
+        # 同步所有用户的进度
+        synced_count = ProblemSetProgress.sync_all_progress_for_problemset(problem_set)
+        
+        return self.success(f"已同步 {synced_count} 个用户的进度")
+
+
 class ProblemSetVisibleAPI(APIView):
    """题单可见性管理API"""

--- a/problemset/views/oj.py
+++ b/problemset/views/oj.py
@@ -1,4 +1,3 @@
-from ssl import HAS_SNI
 from django.db.models import Q
 from django.utils import timezone

@@ -191,21 +190,27 @@ class ProblemSetProgressAPI(APIView):
        # 更新进度
        progress.update_progress()

-        submission = Submission.objects.get(id=data["submission_id"])
-        problem = Problem.objects.get(id=problem_id)
+        # 只有当提供了submission_id时才创建ProblemSetSubmission记录
+        if "submission_id" in data and data["submission_id"]:
+            try:
+                submission = Submission.objects.get(id=data["submission_id"])
+                problem = Problem.objects.get(id=problem_id)

-        has_accepted = ProblemSetSubmission.objects.filter(
-            problemset=problem_set,
-            user=request.user,
-            problem=problem,
-        ).exists()
-        if not has_accepted:
-            ProblemSetSubmission.objects.create(
-                problemset=problem_set,
-                user=request.user,
-                submission=submission,
-                problem=problem,
-            )
+                has_accepted = ProblemSetSubmission.objects.filter(
+                    problemset=problem_set,
+                    user=request.user,
+                    problem=problem,
+                ).exists()
+                if not has_accepted:
+                    ProblemSetSubmission.objects.create(
+                        problemset=problem_set,
+                        user=request.user,
+                        submission=submission,
+                        problem=problem,
+                    )
+            except Submission.DoesNotExist:
+                # 如果提交记录不存在，记录错误但不中断流程
+                pass

        # 检查是否获得奖章
        self._check_badges(progress)
@@ -215,38 +220,20 @@ class ProblemSetProgressAPI(APIView):
    def _check_badges(self, progress):
        """检查是否获得奖章"""
        badges = ProblemSetBadge.objects.filter(problemset=progress.problemset)
-        print(f"[BadgeCheck] 检查用户 {progress.user.username} 的徽章，题单 {progress.problemset.title}")
-        print(f"[BadgeCheck] 已完成题目数: {progress.completed_problems_count}, 总题目数: {progress.total_problems_count}")
-        print(f"[BadgeCheck] 总分数: {progress.total_score}")
-        print(f"[BadgeCheck] 找到 {badges.count()} 个徽章")

        for badge in badges:
-            print(f"[BadgeCheck] 检查徽章: {badge.name} (条件: {badge.condition_type}, 值: {badge.condition_value})")
-            
-            # 检查是否已经获得该奖章
            if UserBadge.objects.filter(user=progress.user, badge=badge).exists():
-                print(f"[BadgeCheck] 用户已获得徽章: {badge.name}")
                continue

-            # 检查是否满足获得条件
            if badge.condition_type == "all_problems":
                if progress.completed_problems_count == progress.total_problems_count:
-                    print(f"[BadgeCheck] 满足条件，创建徽章: {badge.name}")
                    UserBadge.objects.create(user=progress.user, badge=badge)
-                else:
-                    print(f"[BadgeCheck] 不满足条件: 已完成 {progress.completed_problems_count}/{progress.total_problems_count}")
            elif badge.condition_type == "problem_count":
                if progress.completed_problems_count >= badge.condition_value:
-                    print(f"[BadgeCheck] 满足条件，创建徽章: {badge.name}")
                    UserBadge.objects.create(user=progress.user, badge=badge)
-                else:
-                    print(f"[BadgeCheck] 不满足条件: 已完成 {progress.completed_problems_count} < {badge.condition_value}")
            elif badge.condition_type == "score":
                if progress.total_score >= badge.condition_value:
-                    print(f"[BadgeCheck] 满足条件，创建徽章: {badge.name}")
                    UserBadge.objects.create(user=progress.user, badge=badge)
-                else:
-                    print(f"[BadgeCheck] 不满足条件: 总分数 {progress.total_score} < {badge.condition_value}")


 class UserProgressAPI(APIView):
@@ -271,7 +258,6 @@ class UserBadgeAPI(APIView):
        return self.success(serializer.data)


-
 class ProblemSetBadgeAPI(APIView):
    """题单奖章API - 用户端"""