update
This commit is contained in:
@@ -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 - 用户端"""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user