From a21173f871d27abcbd4fed162fefd61252a42d99 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Sat, 26 Aug 2023 14:03:08 +0500 Subject: [PATCH 1/4] max submission per person and per day default values added --- .../migrations/0037_auto_20230826_0859.py | 23 +++++++++++++++++++ src/apps/competitions/models.py | 4 ++-- src/apps/competitions/unpackers/v1.py | 4 ++-- src/apps/competitions/unpackers/v2.py | 4 ++-- 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 src/apps/competitions/migrations/0037_auto_20230826_0859.py diff --git a/src/apps/competitions/migrations/0037_auto_20230826_0859.py b/src/apps/competitions/migrations/0037_auto_20230826_0859.py new file mode 100644 index 000000000..afe2d8e92 --- /dev/null +++ b/src/apps/competitions/migrations/0037_auto_20230826_0859.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2.17 on 2023-08-26 08:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('competitions', '0036_submission_queue'), + ] + + operations = [ + migrations.AlterField( + model_name='phase', + name='max_submissions_per_day', + field=models.PositiveIntegerField(blank=True, default=5, null=True), + ), + migrations.AlterField( + model_name='phase', + name='max_submissions_per_person', + field=models.PositiveIntegerField(blank=True, default=100, null=True), + ), + ] diff --git a/src/apps/competitions/models.py b/src/apps/competitions/models.py index f1b17412a..9eb843f17 100644 --- a/src/apps/competitions/models.py +++ b/src/apps/competitions/models.py @@ -279,8 +279,8 @@ class Phase(ChaHubSaveMixin, models.Model): hide_output = models.BooleanField(default=False) has_max_submissions = models.BooleanField(default=False) - max_submissions_per_day = models.PositiveIntegerField(null=True, blank=True) - max_submissions_per_person = models.PositiveIntegerField(null=True, blank=True) + max_submissions_per_day = models.PositiveIntegerField(default=5, null=True, blank=True) + max_submissions_per_person = models.PositiveIntegerField(default=100, null=True, blank=True) tasks = models.ManyToManyField('tasks.Task', blank=True, related_name='phases', through='PhaseTaskInstance') diff --git a/src/apps/competitions/unpackers/v1.py b/src/apps/competitions/unpackers/v1.py index 63a808629..a2dd694c4 100644 --- a/src/apps/competitions/unpackers/v1.py +++ b/src/apps/competitions/unpackers/v1.py @@ -80,8 +80,8 @@ def _unpack_phases(self): 'start': get_datetime(phase['start_date']), 'name': phase['label'], 'description': phase.get('description'), - 'max_submissions_per_day': phase.get('max_submissions_per_day'), - 'max_submissions_per_person': phase.get('max_submissions'), + 'max_submissions_per_day': phase.get('max_submissions_per_day', 5), + 'max_submissions_per_person': phase.get('max_submissions', 100), 'auto_migrate_to_this_phase': phase.get('auto_migration', False), } execution_time_limit = phase.get('execution_time_limit') diff --git a/src/apps/competitions/unpackers/v2.py b/src/apps/competitions/unpackers/v2.py index bce1e3bf5..6c335e9ea 100644 --- a/src/apps/competitions/unpackers/v2.py +++ b/src/apps/competitions/unpackers/v2.py @@ -188,8 +188,8 @@ def _unpack_phases(self): "description": phase_data.get('description'), "start": get_datetime(phase_data.get('start')), "end": get_datetime(phase_data.get('end')), - 'max_submissions_per_day': phase_data.get('max_submissions_per_day'), - 'max_submissions_per_person': phase_data.get('max_submissions'), + 'max_submissions_per_day': phase_data.get('max_submissions_per_day', 5), + 'max_submissions_per_person': phase_data.get('max_submissions', 100), 'auto_migrate_to_this_phase': phase_data.get('auto_migrate_to_this_phase', False), 'hide_output': phase_data.get('hide_output', False), } From 67420199f70f9ea1370281cd5859b9535c481987 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Sat, 26 Aug 2023 14:15:55 +0500 Subject: [PATCH 2/4] test data upated to match the changes --- src/apps/competitions/tests/unpacker_test_data.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/apps/competitions/tests/unpacker_test_data.py b/src/apps/competitions/tests/unpacker_test_data.py index 0d7aa3630..5fdf06319 100644 --- a/src/apps/competitions/tests/unpacker_test_data.py +++ b/src/apps/competitions/tests/unpacker_test_data.py @@ -20,6 +20,7 @@ "start_date": "2019-01-01", "execution_time_limit": 500, "max_submissions_per_day": 5, + "max_submissions_per_person": 100, "ingestion_program": "ingestion_program.zip", "input_data": "evaluation_data.zip", "scoring_program": "scoring_program.zip", @@ -32,6 +33,7 @@ "start_date": "2019-09-30", "execution_time_limit": 300, "max_submissions_per_day": 5, + "max_submissions_per_person": 100, "auto_migration": True, "ingestion_program": "ingestion_program.zip", "input_data": "evaluation_data.zip", @@ -105,6 +107,7 @@ "description": "Development phase", "execution_time_limit": 500, "max_submissions_per_day": 5, + "max_submissions_per_person" : 100, "start": "2019-01-01", "end": "2019-09-29", "tasks": [0] @@ -114,6 +117,7 @@ "description": "Final phase", "execution_time_limit": 300, "max_submissions_per_day": 5, + "max_submissions_per_person" : 100, "auto_migrate_to_this_phase": True, "start": "2019-09-30", "tasks": [1] From c9d5e93caaca1549faedf8bb6086471e0d0f08be Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Sat, 26 Aug 2023 14:21:39 +0500 Subject: [PATCH 3/4] test data upated to match the changes --- src/apps/competitions/tests/unpacker_test_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/competitions/tests/unpacker_test_data.py b/src/apps/competitions/tests/unpacker_test_data.py index 5fdf06319..fb613604f 100644 --- a/src/apps/competitions/tests/unpacker_test_data.py +++ b/src/apps/competitions/tests/unpacker_test_data.py @@ -107,7 +107,7 @@ "description": "Development phase", "execution_time_limit": 500, "max_submissions_per_day": 5, - "max_submissions_per_person" : 100, + "max_submissions_per_person": 100, "start": "2019-01-01", "end": "2019-09-29", "tasks": [0] @@ -117,7 +117,7 @@ "description": "Final phase", "execution_time_limit": 300, "max_submissions_per_day": 5, - "max_submissions_per_person" : 100, + "max_submissions_per_person": 100, "auto_migrate_to_this_phase": True, "start": "2019-09-30", "tasks": [1] From f45ed83605935e57eb6d655e1f7ea81309688d15 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Sat, 26 Aug 2023 14:41:18 +0500 Subject: [PATCH 4/4] test data updated --- src/apps/competitions/tests/unpacker_test_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/competitions/tests/unpacker_test_data.py b/src/apps/competitions/tests/unpacker_test_data.py index fb613604f..db69ec6dd 100644 --- a/src/apps/competitions/tests/unpacker_test_data.py +++ b/src/apps/competitions/tests/unpacker_test_data.py @@ -205,7 +205,7 @@ 'description': 'Development phase', 'execution_time_limit': 500, 'max_submissions_per_day': 5, - 'max_submissions_per_person': None, + 'max_submissions_per_person': 100, 'auto_migrate_to_this_phase': False, 'has_max_submissions': True, 'end': datetime.datetime(2019, 9, 29, 0, 0, tzinfo=timezone.now().tzinfo), @@ -221,7 +221,7 @@ 'description': 'Final phase', 'execution_time_limit': 300, 'max_submissions_per_day': 5, - 'max_submissions_per_person': None, + 'max_submissions_per_person': 100, 'auto_migrate_to_this_phase': True, 'has_max_submissions': True, 'end': None,