mirror of
https://gitlab.com/megazordpobeda/DataRush.git
synced 2026-05-23 09:47:09 +00:00
feat: added achievements
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
from ninja import ModelSchema
|
||||
from ninja import ModelSchema, Schema
|
||||
from pydantic import Field
|
||||
|
||||
from apps.achievement.models import Achievement
|
||||
from apps.achievement.models import Achievement, UserAchievement
|
||||
|
||||
|
||||
class AchievementSchema(ModelSchema):
|
||||
@@ -12,3 +13,13 @@ class AchievementSchema(ModelSchema):
|
||||
"description",
|
||||
"icon",
|
||||
)
|
||||
|
||||
|
||||
class UserAchievementSchema(Schema):
|
||||
name: str = Field(..., alias="achievement.name")
|
||||
description: str = Field(..., alias="achievement.description")
|
||||
icon: str = Field(..., alias="achievement.icon")
|
||||
|
||||
class Meta:
|
||||
model = UserAchievement
|
||||
fields = ("received_at",)
|
||||
|
||||
@@ -6,15 +6,16 @@ from api.v1.achievement.schemas import AchievementSchema
|
||||
from api.v1.schemas import UnauthorizedError
|
||||
from apps.achievement.models import Achievement
|
||||
|
||||
router = Router()
|
||||
router = Router(tags=["achievement"])
|
||||
|
||||
|
||||
@router.get(
|
||||
"",
|
||||
"all",
|
||||
response={
|
||||
status.OK: list[AchievementSchema],
|
||||
status.UNAUTHORIZED: UnauthorizedError,
|
||||
},
|
||||
auth=None,
|
||||
)
|
||||
def get_all_achievements(request):
|
||||
return Achievement.objects.all()
|
||||
|
||||
@@ -3,6 +3,7 @@ from functools import partial
|
||||
from ninja import NinjaAPI
|
||||
|
||||
from api.v1 import handlers
|
||||
from api.v1.achievement.views import router as achievement_router
|
||||
from api.v1.auth import BearerAuth
|
||||
from api.v1.competition.views import router as competition_router
|
||||
from api.v1.ping.views import router as ping_router
|
||||
@@ -49,6 +50,11 @@ router.add_router(
|
||||
team_router,
|
||||
auth=BearerAuth(),
|
||||
)
|
||||
router.add_router(
|
||||
"achievements",
|
||||
achievement_router,
|
||||
auth=BearerAuth(),
|
||||
)
|
||||
|
||||
|
||||
for exception, handler in handlers.exception_handlers:
|
||||
|
||||
@@ -12,6 +12,7 @@ from api.v1.task.schemas import (
|
||||
TaskOutSchema,
|
||||
TaskSubmissionOut,
|
||||
)
|
||||
from apps.achievement.models import Achievement, UserAchievement
|
||||
from apps.competition.models import State
|
||||
from apps.task.models import (
|
||||
Competition,
|
||||
@@ -102,6 +103,11 @@ def submit_task(
|
||||
CompetitionTask, competition=competition, id=task_id
|
||||
)
|
||||
|
||||
if not CompetitionTaskSubmission.objects.filter(user=user).exists():
|
||||
first_steps_achievement = Achievement.objects.get(slug="first_steps")
|
||||
UserAchievement.objects.create(
|
||||
user=user, achievement=first_steps_achievement
|
||||
)
|
||||
if task.type == CompetitionTask.CompetitionTaskType.INPUT:
|
||||
submission = CompetitionTaskSubmission.objects.create(
|
||||
user=user,
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from ninja import ModelSchema, Schema
|
||||
|
||||
from api.v1.achievement.schemas import UserAchievementSchema
|
||||
from apps.achievement.models import UserAchievement
|
||||
from apps.user.models import User
|
||||
|
||||
|
||||
@@ -20,9 +22,17 @@ class LoginSchema(ModelSchema):
|
||||
|
||||
|
||||
class UserSchema(ModelSchema):
|
||||
achievements: list[UserAchievementSchema] = None
|
||||
|
||||
@staticmethod
|
||||
def resolve_achievements(self, context):
|
||||
return UserAchievement.objects.filter(
|
||||
user=context.get("request").auth
|
||||
).order_by("-received_at")
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ["id", "email", "username", "created_at", "achievements"]
|
||||
fields = ["id", "email", "username", "created_at"]
|
||||
|
||||
|
||||
class StatSchema(Schema):
|
||||
|
||||
@@ -11,17 +11,18 @@ from api.v1.schemas import (
|
||||
BadRequestError,
|
||||
ConflictError,
|
||||
ForbiddenError,
|
||||
NotFoundError, UnauthorizedError,
|
||||
NotFoundError,
|
||||
UnauthorizedError,
|
||||
)
|
||||
from api.v1.user.schemas import (
|
||||
LoginSchema,
|
||||
RegisterSchema,
|
||||
StatSchema,
|
||||
TokenSchema,
|
||||
UserSchema,
|
||||
StatSchema
|
||||
)
|
||||
from apps.task.models import CompetitionTaskSubmission
|
||||
from apps.user.models import User
|
||||
from apps.task.models import CompetitionTaskSubmission, ReviewStatusChoices
|
||||
|
||||
router = Router(tags=["user"])
|
||||
|
||||
@@ -91,16 +92,15 @@ def get_user(request, user_id: str):
|
||||
|
||||
@router.get(
|
||||
"/me/stat",
|
||||
response={
|
||||
status.OK: StatSchema,
|
||||
status.UNAUTHORIZED: UnauthorizedError
|
||||
},
|
||||
response={status.OK: StatSchema, status.UNAUTHORIZED: UnauthorizedError},
|
||||
)
|
||||
def get_my_stat(request):
|
||||
user_submissions = CompetitionTaskSubmission.objects.filter(
|
||||
user=request.auth
|
||||
)
|
||||
checked_attempts = user_submissions.filter(status=CompetitionTaskSubmission.StatusChoices.CHECKED).all()
|
||||
checked_attempts = user_submissions.filter(
|
||||
status=CompetitionTaskSubmission.StatusChoices.CHECKED
|
||||
).all()
|
||||
success_attempts_cnt = 0
|
||||
|
||||
for attempt in checked_attempts:
|
||||
@@ -112,6 +112,5 @@ def get_my_stat(request):
|
||||
success_attempts_cnt += 1
|
||||
|
||||
return StatSchema(
|
||||
total_attempts=len(user_submissions),
|
||||
solved_tasks=success_attempts_cnt
|
||||
total_attempts=len(user_submissions), solved_tasks=success_attempts_cnt
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user