添加提交

account/api.py

@@ -63,7 +63,7 @@ def list(request, username: str, role: str = None):
     users = User.objects.filter(username__icontains=username)
     if role:
         users = users.filter(role=role)
-    return [UserListSchema.from_orm(user) for user in users]
+    return [UserListSchema.get(user) for user in users]
 
 
 @router.post("/batch")

account/models.py

@@ -51,6 +51,10 @@ class Profile(models.Model):
     def __str__(self):
         return self.user.username
 
+    def update_total_score(self, score: int):
+        self.total_score = self.total_score + score
+        self.save()
+
 
 @receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):

account/schemas.py

@@ -6,8 +6,8 @@ from .models import User, RoleChoices
 
 
 class UserListSchema(ModelSchema):
-    @classmethod
+    @staticmethod
-    def from_orm(cls, obj):
+    def get(cls, obj):
         raw_password = obj.raw_password if obj.role == RoleChoices.NORMAL else ""
         return cls(
             id=obj.id,

api/urls.py

@@ -23,6 +23,7 @@ api = NinjaAPI()
 
 api.add_router("account/", "account.api.router")
 api.add_router("tutorial/", "task.tutorial.router")
+api.add_router("submission/", "submission.api.router")
 
 urlpatterns = [
     path("admin/", admin.site.urls),

submission/api.py

@@ -0,0 +1,102 @@
+from typing import List
+from uuid import UUID
+from ninja import Router, Query
+from ninja.errors import HttpError
+from ninja.pagination import paginate
+from django.shortcuts import get_object_or_404
+from django.contrib.auth.decorators import login_required
+
+from account.decorators import admin_required
+from .schemas import (
+    SubmissionFilter,
+    SubmissionIn,
+    SubmissionOut,
+    SubmissionScoreIn,
+    SubmissionScoreOut,
+)
+
+
+from .models import Submission
+from task.models import Task
+from account.models import RoleChoices
+
+router = Router()
+
+
+@router.post("/")
+@login_required
+def create_submission(request, payload: SubmissionIn):
+    """
+    创建一个新的提交
+    """
+    task = get_object_or_404(Task, id=payload.task_id)
+
+    Submission.objects.create(
+        user=request.user,
+        task=task,
+        html=payload.html,
+        css=payload.css,
+        js=payload.js,
+    )
+
+
+@router.get("/", response=List[SubmissionOut])
+@paginate
+def list_submissions(request, filters: SubmissionFilter = Query(...)):
+    """
+    获取提交列表，支持按任务和用户过滤
+    """
+    queryset = Submission.objects.all()
+
+    if filters.task_id:
+        queryset = queryset.filter(task_id=filters.task_id)
+    if filters.task_id:
+        queryset = queryset.filter(task_task_type=filters.task_type)
+    if filters.username:
+        queryset = queryset.filter(user_username=filters.username)
+
+    return [SubmissionOut.list(submission) for submission in queryset]
+
+
+@router.get("/{submission_id}", response=SubmissionOut)
+@login_required
+def get_submission(request, submission_id: UUID):
+    """
+    获取单个提交的详细信息
+    """
+    # 如果是普通用户，只能查看自己的提交
+    if request.user.role == RoleChoices.NORMAL:
+        submission = get_object_or_404(Submission, id=submission_id, user=request.user)
+    else:
+        submission = get_object_or_404(Submission, id=submission_id)
+
+    return SubmissionOut.get(submission)
+
+
+@router.put("/{submission_id}/score", response=SubmissionScoreOut)
+@admin_required
+def update_score(request, submission_id: UUID, payload: SubmissionScoreIn):
+    """
+    给提交打分
+    """
+    if payload.score <= 0:
+        raise HttpError(400, "分数不能为零")
+
+    submission = get_object_or_404(Submission, id=submission_id)
+
+    if submission.score > 0:
+        raise HttpError(400, "该提交已经有分数了")
+    if (
+        request.user.role == RoleChoices.NORMAL
+        and submission.user.id == request.user.id
+    ):
+        raise HttpError(400, "不能自己给自己打分")
+
+    submission.score = payload.score
+    submission.referee = request.user
+    submission.save()
+
+    return {
+        "id": submission.id,
+        "score": submission.score,
+    }

submission/migrations/0003_submission_referee_alter_submission_user.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.1.6 on 2025-03-18 04:42
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submission', '0002_alter_submission_css_alter_submission_html_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='referee',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='referee_submissions', to=settings.AUTH_USER_MODEL, verbose_name='打分人'),
+        ),
+        migrations.AlterField(
+            model_name='submission',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='my_submissions', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

submission/migrations/0004_alter_submission_id.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.6 on 2025-03-18 04:56
+
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submission', '0003_submission_referee_alter_submission_user'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='submission',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False),
+        ),
+    ]

submission/migrations/0005_alter_submission_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.6 on 2025-03-18 06:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submission', '0004_alter_submission_id'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='submission',
+            options={'ordering': ('-created',)},
+        ),
+    ]

submission/models.py

@@ -1,7 +1,5 @@
+import uuid
 from django.db import models
-from django.db.models import Sum
-from django.db.models.signals import post_save
-from django.dispatch import receiver
 from django_extensions.db.models import TimeStampedModel
 
 from account.models import Profile, User
@@ -9,13 +7,29 @@ from task.models import Task
 
 
 class Submission(TimeStampedModel):
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+    user = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        related_name="my_submissions",
+    )
     task = models.ForeignKey(Task, on_delete=models.CASCADE)
     score = models.IntegerField(default=0, verbose_name="分数")
+    referee = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+        related_name="referee_submissions",
+        verbose_name="打分人",
+    )
     html = models.TextField(null=True, blank=True, verbose_name="HTML代码")
     css = models.TextField(null=True, blank=True, verbose_name="CSS代码")
     js = models.TextField(null=True, blank=True, verbose_name="JS代码")
 
+    class Meta:
+        ordering = ("-created",)
+
     def __str__(self):
         return f"{self.user.username} - {self.task.title}"
 
@@ -27,21 +41,5 @@ class Submission(TimeStampedModel):
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
-        self.user.profile.update_total_score()
+        if self.score > 0:
-
+            self.user.profile.update_total_score(self.score)
-
-# 信号处理函数
-@receiver(post_save, sender=Submission)
-def update_user_score(sender, instance, **kwargs):
-    """
-    当 Submission 保存后，自动更新用户的总分
-    """
-    total_score = (
-        Submission.objects.filter(user=instance.user).aggregate(
-            total_score=Sum("score")
-        )["total_score"]
-        or 0
-    )
-    profile, created = Profile.objects.get_or_create(user=instance.user)
-    profile.total_score = total_score
-    profile.save()

submission/schemas.py

@@ -0,0 +1,71 @@
+from typing import Optional, Literal
+from ninja import Schema
+from uuid import UUID
+
+
+class SubmissionIn(Schema):
+    task_id: int
+    html: Optional[str] = None
+    css: Optional[str] = None
+    js: Optional[str] = None
+
+
+class SubmissionOut(Schema):
+    id: UUID
+    userid: int
+    username: str
+    task_id: int
+    task_title: str
+    task_type: Literal["tutorial", "challenge"]
+    score: int
+    html: Optional[str] = None
+    css: Optional[str] = None
+    js: Optional[str] = None
+    created: str
+    modified: str
+
+    @staticmethod
+    def list(submission):
+        return {
+            "id": submission.id,
+            "userid": submission.user.id,
+            "username": submission.user.username,
+            "task_id": submission.task.id,
+            "task_title": submission.task.title,
+            "task_type": submission.task.task_type,
+            "score": submission.score,
+            "created": submission.created.isoformat(),
+            "modified": submission.modified.isoformat(),
+        }
+
+    @staticmethod
+    def get(submission):
+        return {
+            "id": submission.id,
+            "userid": submission.user.id,
+            "username": submission.user.username,
+            "task_id": submission.task.id,
+            "task_title": submission.task.title,
+            "task_type": submission.task.task_type,
+            "score": submission.score,
+            "html": submission.html,
+            "css": submission.css,
+            "js": submission.js,
+            "created": submission.created.isoformat(),
+            "modified": submission.modified.isoformat(),
+        }
+
+
+class SubmissionScoreIn(Schema):
+    score: int
+
+
+class SubmissionScoreOut(Schema):
+    id: UUID
+    score: int
+
+
+class SubmissionFilter(Schema):
+    task_id: Optional[int] = None
+    task_type: Optional[Literal["tutorial", "challenge"]] = None
+    username: Optional[str] = None

task/migrations/0004_alter_task_task_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-03-18 06:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('task', '0003_alter_task_content_alter_task_display_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='task',
+            name='task_type',
+            field=models.CharField(choices=[('challenge', '挑战'), ('tutorial', '教程')], editable=False, max_length=20, verbose_name='类型'),
+        ),
+    ]

task/models.py

@@ -2,17 +2,20 @@ from django.db import models
 from django_extensions.db.models import TimeStampedModel
 
 
-class Task(TimeStampedModel):
+class TaskTypeChoices(models.TextChoices):
-    TASK_TYPE_CHOICES = [
+    CHALLENGE = "challenge", "挑战"
-        ("challenge", "Challenge"),
+    TUTORIAL = "tutorial", "教程"
-        ("tutorial", "Tutorial"),
-    ]
 
+
+class Task(TimeStampedModel):
     display = models.IntegerField(unique=True, db_index=True, verbose_name="序号")
     title = models.CharField(max_length=100, verbose_name="标题")
     content = models.TextField(verbose_name="内容")
     task_type = models.CharField(
-        max_length=20, choices=TASK_TYPE_CHOICES, editable=False, verbose_name="类型"
+        max_length=20,
+        choices=TaskTypeChoices.choices,
+        editable=False,
+        verbose_name="类型",
     )
     is_public = models.BooleanField(default=False, verbose_name="是否公开")
 

task/tutorial.py

@@ -1,6 +1,7 @@
 from typing import List
 from ninja import Router
 from ninja.errors import HttpError
+from django.shortcuts import get_object_or_404
 from account.decorators import super_required
 from .schemas import TutorialAll, TutorialIn, TutorialSlim
 from .models import Tutorial
@@ -11,20 +12,23 @@ router = Router()
 @router.get("/list", response=List[TutorialSlim])
 @super_required
 def tutorial(request):
+    """
+    后台显示所有的列表
+    """
     return Tutorial.objects.all()
 
 
 @router.get("/display", response=List[int])
 def get_all_public_display(request):
+    """
+    前台显示所有公开的 display
+    """
     return Tutorial.objects.filter(is_public=True).values_list("display", flat=True)
 
 
 @router.get("/{display}", response=TutorialAll)
-async def get(request, display: int):
+def get(request, display: int):
-    try:
+    return get_object_or_404(Tutorial, display=display)
-        return await Tutorial.objects.aget(display=display)
-    except Tutorial.DoesNotExist:
-        raise HttpError(404, "此序号无教程")
 
 
 @router.post("/")
@@ -45,14 +49,11 @@ def create_or_update(request, payload: TutorialIn):
 @router.put("/public/{display}")
 @super_required
 def toggle_public(request, display: int):
-    try:
+    item = get_object_or_404(Tutorial, display=display)
-        item = Tutorial.objects.get(display=display)
+    item.is_public = not item.is_public
-        item.is_public = not item.is_public
+    item.save()
-        item.save()
+    label = "公开" if item.is_public else "隐藏"
-        label = "公开" if item.is_public else "隐藏"
+    return {"message": f"【{item.display}】{item.title} 已{label}"}
-        return {"message": f"【{item.display}】{item.title} 已{label}"}
-    except Tutorial.DoesNotExist:
-        raise HttpError(404, "此序号无教程")
 
 
 @router.delete("/{display}")