Merge remote-tracking branch 'origin/master'

This commit is contained in:
Андрей Сумин committed 2025-03-01 20:20:43 +03:00
commit 054e23be8e
11 files changed
+37 -22

No files matched your search

+4 -3
View File
@@ -1,10 +1,9 @@
from typing import Literal
from uuid import UUID
from django.http import HttpRequest
from ninja import ModelSchema, Schema
from apps.review.models import Reviewer, Review
from apps.review.models import Review, Reviewer
from apps.task.models import CompetitionTaskSubmission
@@ -34,4 +33,6 @@ class SubmissionsOut(Schema):
@staticmethod
def resolve_submissions(self, context) -> list[SubmissionOut]:
return list(Review.objects.filter(reviewer=context.get("request").auth))
return list(
Review.objects.filter(reviewer=context.get("request").auth)
)
+8 -5
View File
@@ -1,4 +1,3 @@
import logging
from http import HTTPStatus as status
from uuid import UUID
@@ -8,7 +7,6 @@ from ninja import Router
from api.v1 import schemas as global_schemas
from api.v1.review import schemas
from api.v1.task.schemas import TaskSubmissionIn
from apps.task.models import CompetitionTaskSubmission
router = Router(tags=["review"])
@@ -19,9 +17,11 @@ router = Router(tags=["review"])
response={
status.OK: schemas.SubmissionsOut,
},
description="Список отправок, на проверку которых назначен ревьюер"
description="Список отправок, на проверку которых назначен ревьюер",
)
def get_submissions(request: HttpRequest, token: str) -> tuple[status, schemas.SubmissionsOut]:
def get_submissions(
request: HttpRequest, token: str
) -> tuple[status, schemas.SubmissionsOut]:
return status.OK, schemas.SubmissionsOut()
@@ -36,12 +36,15 @@ def get_submissions(request: HttpRequest, token: str) -> tuple[status, schemas.S
def get_reviewer_profile(request: HttpRequest, token: str):
return status.OK, request.auth
@router.get(
"{token}/submissions/{submition_id}",
response={
status.OK: schemas.SubmissionOut,
},
)
def get_submission(request: HttpRequest, token: str, submition_id: UUID) -> tuple[status, schemas.SubmissionsOut]:
def get_submission(
request: HttpRequest, token: str, submition_id: UUID
) -> tuple[status, schemas.SubmissionsOut]:
submission = get_object_or_404(CompetitionTaskSubmission, id=submition_id)
return status.OK, submission
+1 -1
View File
@@ -13,9 +13,9 @@ from api.v1.task.schemas import (
)
from apps.competition.models import State
from apps.task.models import (
CompetitionTaskSubmission,
Competition,
CompetitionTask,
CompetitionTaskSubmission,
)
router = Router(tags=["competition"])