mirror of
https://gitlab.com/megazordpobeda/DataRush.git
synced 2026-05-23 05:07:10 +00:00
feat: added achievements
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 182 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 193 KiB |
@@ -0,0 +1,32 @@
|
||||
from django.conf import settings
|
||||
from django.core.files import File
|
||||
from django.core.management import BaseCommand
|
||||
|
||||
from apps.achievement.models import Achievement
|
||||
|
||||
icons_dir = f"{settings.BASE_DIR}/apps/achievement/icons"
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = "Create achievement fixtures."
|
||||
|
||||
def handle(self, *args, **options):
|
||||
if not Achievement.objects.filter(slug="first_steps").exists():
|
||||
with open(f"{icons_dir}/first_steps.png", "rb") as f:
|
||||
first_steps_icon = File(f, name="first_steps.png")
|
||||
Achievement.objects.get_or_create(
|
||||
name="Первые шаги",
|
||||
description="Отправьте свое первое решение на задачу!",
|
||||
slug="first_steps",
|
||||
icon=first_steps_icon,
|
||||
)
|
||||
|
||||
if not Achievement.objects.filter(slug="welcome").exists():
|
||||
with open(f"{icons_dir}/welcome.png", "rb") as f:
|
||||
welcome_icon = File(f, name="welcome.png")
|
||||
Achievement.objects.get_or_create(
|
||||
name="Добро пожаловать!",
|
||||
description="Зарегистрируйтесь на платформе",
|
||||
slug="welcome",
|
||||
icon=welcome_icon,
|
||||
)
|
||||
@@ -1,6 +1,7 @@
|
||||
# Generated by Django 5.1.6 on 2025-03-02 21:24
|
||||
# Generated by Django 5.1.6 on 2025-03-02 22:53
|
||||
|
||||
import apps.achievement.models
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
from django.db import migrations, models
|
||||
|
||||
@@ -27,4 +28,15 @@ class Migration(migrations.Migration):
|
||||
'verbose_name_plural': 'ачивки',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='UserAchievement',
|
||||
fields=[
|
||||
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
|
||||
('received_at', models.DateTimeField(auto_now_add=True)),
|
||||
('achievement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='achievement.achievement')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
},
|
||||
),
|
||||
]
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
# Generated by Django 5.1.6 on 2025-03-02 22:53
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('achievement', '0001_initial'),
|
||||
('user', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='userachievement',
|
||||
name='user',
|
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user'),
|
||||
),
|
||||
]
|
||||
@@ -4,9 +4,6 @@ from apps.core.models import BaseModel
|
||||
|
||||
|
||||
class Achievement(BaseModel):
|
||||
class AchievementType(models.TextChoices):
|
||||
CORRECT_TASKS = "correct_tasks", "Выполненные задания"
|
||||
|
||||
def image_url_upload_to(instance, filename):
|
||||
return f"achievements/{instance.id}/icon/{filename}"
|
||||
|
||||
@@ -27,3 +24,10 @@ class Achievement(BaseModel):
|
||||
class Meta:
|
||||
verbose_name = "ачивка"
|
||||
verbose_name_plural = "ачивки"
|
||||
|
||||
|
||||
class UserAchievement(BaseModel):
|
||||
achievement = models.ForeignKey(Achievement, on_delete=models.CASCADE)
|
||||
user = models.ForeignKey("user.User", on_delete=models.CASCADE)
|
||||
|
||||
received_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Generated by Django 5.1.6 on 2025-03-02 21:24
|
||||
# Generated by Django 5.1.6 on 2025-03-02 22:53
|
||||
|
||||
import apps.competition.models
|
||||
import datetime
|
||||
|
||||
@@ -9,7 +9,11 @@ from django.utils import timezone
|
||||
|
||||
from apps.competition.models import Competition, State
|
||||
from apps.review.models import Reviewer
|
||||
from apps.task.models import CompetitionTask, CompetitionTaskSubmission, CompetitionTaskCriteria
|
||||
from apps.task.models import (
|
||||
CompetitionTask,
|
||||
CompetitionTaskCriteria,
|
||||
CompetitionTaskSubmission,
|
||||
)
|
||||
from apps.user.models import User, UserRole
|
||||
|
||||
|
||||
@@ -92,7 +96,7 @@ class Command(BaseCommand):
|
||||
task_types = [
|
||||
CompetitionTask.CompetitionTaskType.INPUT.value,
|
||||
CompetitionTask.CompetitionTaskType.REVIEW.value,
|
||||
CompetitionTask.CompetitionTaskType.INPUT.value
|
||||
CompetitionTask.CompetitionTaskType.INPUT.value,
|
||||
]
|
||||
for comp in competitions:
|
||||
# Create 3 tasks per competition
|
||||
@@ -110,7 +114,10 @@ class Command(BaseCommand):
|
||||
submission_reviewers_count=random.randint(2, 10),
|
||||
max_attempts=random.randint(1, 10),
|
||||
)
|
||||
if task_type == CompetitionTask.CompetitionTaskType.REVIEW.value:
|
||||
if (
|
||||
task_type
|
||||
== CompetitionTask.CompetitionTaskType.REVIEW.value
|
||||
):
|
||||
for j in range(5):
|
||||
CompetitionTaskCriteria.objects.create(
|
||||
task=task,
|
||||
|
||||
@@ -7,4 +7,4 @@ class CoreConfig(AppConfig):
|
||||
verbose_name = "Проверка"
|
||||
|
||||
def ready(self):
|
||||
import apps.review.signals
|
||||
pass
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Generated by Django 5.1.6 on 2025-03-02 21:24
|
||||
# Generated by Django 5.1.6 on 2025-03-02 22:53
|
||||
|
||||
import uuid
|
||||
from django.db import migrations, models
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Generated by Django 5.1.6 on 2025-03-02 21:24
|
||||
# Generated by Django 5.1.6 on 2025-03-02 22:53
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
@@ -2,13 +2,12 @@
|
||||
from django.db.models.signals import m2m_changed
|
||||
from django.dispatch import receiver
|
||||
|
||||
from apps.review.models import Review
|
||||
from apps.task.models import CompetitionTask, CompetitionTaskSubmission
|
||||
|
||||
|
||||
@receiver(m2m_changed, sender=CompetitionTask.reviewers.through)
|
||||
def print_reviewers(sender, instance, action, **kwargs):
|
||||
if action in ['post_add', 'post_remove', 'post_clear']:
|
||||
if action in ["post_add", "post_remove", "post_clear"]:
|
||||
submissions = CompetitionTaskSubmission.objects.filter(task=instance)
|
||||
for submission in submissions:
|
||||
submission.send_on_review()
|
||||
submission.send_on_review()
|
||||
|
||||
@@ -33,7 +33,7 @@ class CompetitionTaskSubmissionAdmin(admin.ModelAdmin):
|
||||
"user__username",
|
||||
"user__email",
|
||||
)
|
||||
list_filter = ("plagiarism_checked", "status",)
|
||||
list_filter = ("plagiarism_checked", "status")
|
||||
ordering = ["-timestamp"]
|
||||
|
||||
def has_add_permission(self, request, obj=None):
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Generated by Django 5.1.6 on 2025-03-02 21:24
|
||||
# Generated by Django 5.1.6 on 2025-03-02 22:53
|
||||
|
||||
import apps.task.models
|
||||
import django.db.models.deletion
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import httpx
|
||||
from celery import shared_task
|
||||
from django.core.files.base import ContentFile
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.files.base import ContentFile
|
||||
|
||||
|
||||
@shared_task(bind=True, max_retries=3)
|
||||
@@ -40,7 +39,7 @@ def analyze_data_task(self, submission_id):
|
||||
)
|
||||
submission.status = CompetitionTaskSubmission.StatusChoices.CHECKED
|
||||
|
||||
except httpx.RequestError as e:
|
||||
except httpx.RequestError:
|
||||
self.retry(countdown=2**self.request.retries)
|
||||
except Exception as e:
|
||||
submission.result = {"error": str(e), "success": False}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Generated by Django 5.1.6 on 2025-03-02 21:24
|
||||
# Generated by Django 5.1.6 on 2025-03-02 22:53
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@@ -6,3 +6,6 @@ class UsersConfig(AppConfig):
|
||||
name = "apps.user"
|
||||
label = "user"
|
||||
verbose_name = "Пользователи (веб)"
|
||||
|
||||
def ready(self):
|
||||
pass
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Generated by Django 5.1.6 on 2025-03-02 21:24
|
||||
# Generated by Django 5.1.6 on 2025-03-02 22:53
|
||||
|
||||
import uuid
|
||||
from django.db import migrations, models
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
from django.db.models.signals import post_save
|
||||
from django.dispatch import receiver
|
||||
|
||||
from apps.achievement.models import Achievement, UserAchievement
|
||||
from apps.user.models import User
|
||||
|
||||
|
||||
@receiver(post_save, sender=User)
|
||||
def assign_welcome_achievement(sender, instance, created, **kwargs):
|
||||
if created:
|
||||
welcome_achievement = Achievement.objects.get(slug="welcome")
|
||||
UserAchievement.objects.create(
|
||||
user=instance, achievement=welcome_achievement
|
||||
)
|
||||
Reference in New Issue
Block a user