mirror of
https://gitlab.com/megazordpobeda/DataRush.git
synced 2026-05-23 17:57:10 +00:00
Merge branch 'master' of https://gitlab.prodcontest.ru/team-15/project
This commit is contained in:
@@ -13,7 +13,7 @@ router = Router(tags=["competition"])
|
|||||||
|
|
||||||
|
|
||||||
@router.get(
|
@router.get(
|
||||||
"competition/{competition_id}",
|
"competitions/{competition_id}",
|
||||||
response={
|
response={
|
||||||
status.OK: schemas.CompetitionOut,
|
status.OK: schemas.CompetitionOut,
|
||||||
status.BAD_REQUEST: global_schemas.BadRequestError,
|
status.BAD_REQUEST: global_schemas.BadRequestError,
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ def get_me(request):
|
|||||||
|
|
||||||
|
|
||||||
@router.get(
|
@router.get(
|
||||||
path="/user/{user_id}",
|
path="/users/{user_id}",
|
||||||
response={
|
response={
|
||||||
status.OK: UserSchema,
|
status.OK: UserSchema,
|
||||||
status.BAD_REQUEST: BadRequestError,
|
status.BAD_REQUEST: BadRequestError,
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 5.1.6 on 2025-03-02 14:03
|
||||||
|
|
||||||
|
import apps.achievement.models
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('achievement', '0003_remove_achievement_need_count_and_more_squashed_0004_alter_achievement_slug'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='achievement',
|
||||||
|
name='icon',
|
||||||
|
field=models.ImageField(upload_to=apps.achievement.models.Achievement.image_url_upload_to, verbose_name='иконка достижения'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -14,7 +14,7 @@ class Achievement(BaseModel):
|
|||||||
max_length=30, verbose_name="название", unique=True
|
max_length=30, verbose_name="название", unique=True
|
||||||
)
|
)
|
||||||
description = models.TextField(verbose_name="описание")
|
description = models.TextField(verbose_name="описание")
|
||||||
icon = models.FileField(
|
icon = models.ImageField(
|
||||||
verbose_name="иконка достижения",
|
verbose_name="иконка достижения",
|
||||||
upload_to=image_url_upload_to,
|
upload_to=image_url_upload_to,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -25,10 +25,6 @@ COPY --from=builder /opt/venv /opt/venv
|
|||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
RUN adduser -D -g '' app && chown -R app:app ./
|
|
||||||
|
|
||||||
USER app
|
|
||||||
|
|
||||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||||
PYTHONUNBUFFERED=1 \
|
PYTHONUNBUFFERED=1 \
|
||||||
PYTHONOPTIMIZE=2 \
|
PYTHONOPTIMIZE=2 \
|
||||||
|
|||||||
Reference in New Issue
Block a user