From dc0bb335dc5fd50812da2f29ceaeeeb5aed438e4 Mon Sep 17 00:00:00 2001 From: ITQ Date: Sun, 2 Mar 2025 20:32:23 +0300 Subject: [PATCH 1/3] (scope): [body] [footer(s)] --- services/checker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/checker/Dockerfile b/services/checker/Dockerfile index 6db5156..d4266d1 100644 --- a/services/checker/Dockerfile +++ b/services/checker/Dockerfile @@ -33,6 +33,6 @@ ENV PYTHONDONTWRITEBYTECODE=1 \ EXPOSE 8080 HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --start-interval=2s --retries=3 \ - CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:8000/ping || exit 1 + CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:8000/health || exit 1 CMD uvicorn main:app --host 0.0.0.0 --port 8000 From 8259ba1916dd6ed6775252130e2c041fd9f9898d Mon Sep 17 00:00:00 2001 From: ITQ Date: Sun, 2 Mar 2025 20:48:21 +0300 Subject: [PATCH 2/3] (scope): [body] [footer(s)] --- services/backend/integrations/checker/healthcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backend/integrations/checker/healthcheck.py b/services/backend/integrations/checker/healthcheck.py index 1ab32f5..cf48951 100644 --- a/services/backend/integrations/checker/healthcheck.py +++ b/services/backend/integrations/checker/healthcheck.py @@ -11,7 +11,7 @@ class CheckerHealthCheck(BaseHealthCheckBackend): def check_status(self) -> None: try: response = httpx.get( - f"{settings.CHECKER_API_ENDPOINT}/ping", timeout=1 + f"{settings.CHECKER_API_ENDPOINT}/health", timeout=10 ) if response.status_code >= status.INTERNAL_SERVER_ERROR: self.add_error("Checker service is unaccessible") From 7ea027e83dd2d5cfa6df2047b77f3e6169afd04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A1=D1=83=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Sun, 2 Mar 2025 20:59:31 +0300 Subject: [PATCH 3/3] feat: added criteries in data generation --- .../apps/core/management/commands/generate_data.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/services/backend/apps/core/management/commands/generate_data.py b/services/backend/apps/core/management/commands/generate_data.py index d78d0a5..756130c 100644 --- a/services/backend/apps/core/management/commands/generate_data.py +++ b/services/backend/apps/core/management/commands/generate_data.py @@ -9,7 +9,7 @@ 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 +from apps.task.models import CompetitionTask, CompetitionTaskSubmission, CompetitionTaskCriteria from apps.user.models import User, UserRole @@ -91,6 +91,8 @@ class Command(BaseCommand): tasks = [] task_types = [ CompetitionTask.CompetitionTaskType.INPUT.value, + CompetitionTask.CompetitionTaskType.REVIEW.value, + CompetitionTask.CompetitionTaskType.INPUT.value ] for comp in competitions: # Create 3 tasks per competition @@ -108,6 +110,15 @@ class Command(BaseCommand): submission_reviewers_count=random.randint(2, 10), max_attempts=random.randint(1, 10), ) + if task_type == CompetitionTask.CompetitionTaskType.REVIEW.value: + for j in range(5): + CompetitionTaskCriteria.objects.create( + task=task, + name=f"Criteria_{j}", + slug=f"criteria_{j}", + description=f"Criteria description {j}", + max_value=random.randint(1, 10), + ) tasks.append(task) self.stdout.write(f"Created task: {title} (type: {task_type})") self.add_reviewers_to_task(tasks)