From 9ca726b71ee0dc94454cb2c1d42d5afbdbaad2be Mon Sep 17 00:00:00 2001 From: Timur Date: Sun, 2 Mar 2025 17:41:51 +0300 Subject: [PATCH 1/4] make achievement icon imagefield --- .../migrations/0005_alter_achievement_icon.py | 19 +++++++++++++++++++ services/backend/apps/achievement/models.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 services/backend/apps/achievement/migrations/0005_alter_achievement_icon.py diff --git a/services/backend/apps/achievement/migrations/0005_alter_achievement_icon.py b/services/backend/apps/achievement/migrations/0005_alter_achievement_icon.py new file mode 100644 index 0000000..7ed0851 --- /dev/null +++ b/services/backend/apps/achievement/migrations/0005_alter_achievement_icon.py @@ -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='иконка достижения'), + ), + ] diff --git a/services/backend/apps/achievement/models.py b/services/backend/apps/achievement/models.py index 2c7724f..292598f 100644 --- a/services/backend/apps/achievement/models.py +++ b/services/backend/apps/achievement/models.py @@ -14,7 +14,7 @@ class Achievement(BaseModel): max_length=30, verbose_name="название", unique=True ) description = models.TextField(verbose_name="описание") - icon = models.FileField( + icon = models.ImageField( verbose_name="иконка достижения", upload_to=image_url_upload_to, ) From a5975709d1cd180bfef2d35b2abfef4dc47ddc21 Mon Sep 17 00:00:00 2001 From: ITQ Date: Sun, 2 Mar 2025 19:16:05 +0300 Subject: [PATCH 2/4] (scope): [body] [footer(s)] --- services/checker/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/checker/Dockerfile b/services/checker/Dockerfile index 9f0295f..6db5156 100644 --- a/services/checker/Dockerfile +++ b/services/checker/Dockerfile @@ -25,10 +25,6 @@ COPY --from=builder /opt/venv /opt/venv COPY . . -RUN adduser -D -g '' app && chown -R app:app ./ - -USER app - ENV PYTHONDONTWRITEBYTECODE=1 \ PYTHONUNBUFFERED=1 \ PYTHONOPTIMIZE=2 \ From 640f99dc80ce21a5f2c5a62252f72205e57cd291 Mon Sep 17 00:00:00 2001 From: Timur Date: Sun, 2 Mar 2025 19:18:10 +0300 Subject: [PATCH 3/4] make core path plural at competitions --- services/backend/api/v1/competition/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backend/api/v1/competition/views.py b/services/backend/api/v1/competition/views.py index 1f7eb77..4dacad9 100644 --- a/services/backend/api/v1/competition/views.py +++ b/services/backend/api/v1/competition/views.py @@ -13,7 +13,7 @@ router = Router(tags=["competition"]) @router.get( - "competition/{competition_id}", + "competitions/{competition_id}", response={ status.OK: schemas.CompetitionOut, status.BAD_REQUEST: global_schemas.BadRequestError, From a48dc934c15037b80df237c1d4f7b43c598e3bd4 Mon Sep 17 00:00:00 2001 From: Timur Date: Sun, 2 Mar 2025 19:18:31 +0300 Subject: [PATCH 4/4] make user path names plural --- services/backend/api/v1/user/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backend/api/v1/user/views.py b/services/backend/api/v1/user/views.py index c9fad87..2b9cdbe 100644 --- a/services/backend/api/v1/user/views.py +++ b/services/backend/api/v1/user/views.py @@ -75,7 +75,7 @@ def get_me(request): @router.get( - path="/user/{user_id}", + path="/users/{user_id}", response={ status.OK: UserSchema, status.BAD_REQUEST: BadRequestError,