update
This commit is contained in:
@@ -10,7 +10,6 @@ from django.db.models import Count, OuterRef, Q, Subquery, IntegerField
|
||||
|
||||
from .schemas import (
|
||||
FlagIn,
|
||||
MyScoreOut,
|
||||
SubmissionFilter,
|
||||
SubmissionIn,
|
||||
SubmissionOut,
|
||||
@@ -123,27 +122,6 @@ def list_submissions(request, filters: SubmissionFilter = Query(...)):
|
||||
return submissions
|
||||
|
||||
|
||||
@router.get("/my-scores", response=List[MyScoreOut])
|
||||
@login_required
|
||||
def my_scores(request):
|
||||
seen = {}
|
||||
for s in Submission.objects.filter(
|
||||
user=request.user, task__task_type="challenge"
|
||||
).order_by("-score").select_related("task"):
|
||||
if s.task_id not in seen:
|
||||
seen[s.task_id] = s
|
||||
return [
|
||||
MyScoreOut(
|
||||
task_id=s.task_id,
|
||||
task_display=s.task.display,
|
||||
task_title=s.task.title,
|
||||
score=s.score,
|
||||
created=s.created.isoformat(),
|
||||
)
|
||||
for s in seen.values()
|
||||
]
|
||||
|
||||
|
||||
|
||||
@router.get("/by-user-task", response=List[SubmissionOut])
|
||||
@login_required
|
||||
|
||||
@@ -7,7 +7,7 @@ from django.utils import timezone
|
||||
from django.db.models.signals import post_save
|
||||
from django.dispatch import receiver # 导入receiver
|
||||
|
||||
from account.models import Profile, RoleChoices, User
|
||||
from account.models import RoleChoices, User
|
||||
from task.models import Task
|
||||
from prompt.models import Conversation
|
||||
|
||||
@@ -93,8 +93,6 @@ class Submission(TimeStampedModel):
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
super().save(*args, **kwargs)
|
||||
# if self.score > 0:
|
||||
# self.user.profile.update_total_score(self.score)
|
||||
|
||||
|
||||
class Rating(models.Model):
|
||||
@@ -141,4 +139,3 @@ def update_submission_score_on_save(sender, instance, **kwargs):
|
||||
当Rating保存时,更新对应的Submission的平均分
|
||||
"""
|
||||
instance.submission.update_score()
|
||||
instance.submission.user.profile.recalculate_total_score()
|
||||
|
||||
@@ -121,9 +121,3 @@ class FlagIn(Schema):
|
||||
flag: Optional[Literal["red", "blue", "green", "yellow"]] = None
|
||||
|
||||
|
||||
class MyScoreOut(Schema):
|
||||
task_id: int
|
||||
task_display: int
|
||||
task_title: str
|
||||
score: float
|
||||
created: str
|
||||
|
||||
Reference in New Issue
Block a user