feat(FE, BE): Contest list design change / use group permission

backend/contest/migrations/0014_auto_20220211_1432.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.12 on 2022-02-11 05:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0004_rename_is_admin_groupmember_is_group_admin'),
+        ('contest', '0013_contestannouncement_problem'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contest',
+            name='allowed_groups',
+            field=models.ManyToManyField(to='group.Group'),
+        ),
+        migrations.AddField(
+            model_name='contest',
+            name='prize',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name='contest',
+            name='scoring',
+            field=models.TextField(default='ACM-ICPC style'),
+        ),
+    ]

backend/contest/migrations/0015_auto_20220211_1433.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.12 on 2022-02-11 05:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0014_auto_20220211_1432'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contest',
+            name='constraints',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AddField(
+            model_name='contest',
+            name='requirements',
+            field=models.JSONField(default=list),
+        ),
+    ]

backend/contest/migrations/0016_rename_prize_contest_prizes.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-02-11 05:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0015_auto_20220211_1433'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='contest',
+            old_name='prize',
+            new_name='prizes',
+        ),
+    ]

backend/contest/migrations/0017_alter_contest_allowed_groups.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-02-11 05:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0004_rename_is_admin_groupmember_is_group_admin'),
+        ('contest', '0016_rename_prize_contest_prizes'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contest',
+            name='allowed_groups',
+            field=models.ManyToManyField(blank=True, to='group.Group'),
+        ),
+    ]

backend/contest/migrations/0018_auto_20220225_1422.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.2.12 on 2022-02-25 05:22
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0017_alter_contest_allowed_groups'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='contest',
+            name='prizes',
+        ),
+        migrations.CreateModel(
+            name='ContestPrize',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('color', models.TextField()),
+                ('name', models.TextField()),
+                ('reward', models.TextField()),
+                ('contest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contest.contest')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='acmcontestrank',
+            name='prize',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='contest.contestprize'),
+        ),
+        migrations.AddField(
+            model_name='oicontestrank',
+            name='prize',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='contest.contestprize'),
+        ),
+    ]

backend/contest/migrations/0019_alter_contestprize_contest.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-02-25 05:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0018_auto_20220225_1422'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contestprize',
+            name='contest',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='prizes', to='contest.contest'),
+        ),
+    ]

backend/contest/models.py

@@ -5,12 +5,17 @@
 
 from utils.constants import ContestStatus, ContestType
 from account.models import User
+from group.models import Group
 from utils.models import RichTextField
 
 
 class Contest(models.Model):
     title = models.TextField()
     description = RichTextField()
+    requirements = JSONField(default=list)
+    constraints = JSONField(default=list)
+    allowed_groups = models.ManyToManyField(Group, blank=True)
+    scoring = models.TextField(default="ACM-ICPC style")
     # show real time rank or cached rank
     real_time_rank = models.BooleanField()
     password = models.TextField(null=True)
@@ -55,10 +60,18 @@ class Meta:
         ordering = ("-start_time",)
 
 
+class ContestPrize(models.Model):
+    contest = models.ForeignKey(Contest, on_delete=models.CASCADE, related_name="prizes")
+    color = models.TextField()
+    name = models.TextField()
+    reward = models.TextField()
+
+
 class AbstractContestRank(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     contest = models.ForeignKey(Contest, on_delete=models.CASCADE)
     submission_number = models.IntegerField(default=0)
+    prize = models.ForeignKey(ContestPrize, on_delete=models.SET_NULL, blank=True, null=True)
 
     class Meta:
         abstract = True

backend/contest/serializers.py

@@ -1,12 +1,31 @@
 from utils.api import UsernameSerializer, serializers
 
-from .models import Contest, ContestAnnouncement, ContestRuleType
+from .models import Contest, ContestAnnouncement, ContestPrize, ContestRuleType
 from .models import ACMContestRank, OIContestRank
+from group.serializers import GroupSummarySerializer
+
+
+class CreateOrEditContestPrizeSerializer(serializers.Serializer):
+    id = serializers.IntegerField(required=False)
+    color = serializers.CharField(max_length=20)
+    name = serializers.CharField(max_length=20)
+    reward = serializers.CharField(max_length=20)
+
+
+class ContestPrizeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ContestPrize
+        fields = "__all__"
 
 
 class CreateConetestSeriaizer(serializers.Serializer):
     title = serializers.CharField(max_length=128)
     description = serializers.CharField()
+    requirements = serializers.ListField(child=serializers.CharField(max_length=128))
+    constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
+    allowed_groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
+    scoring = serializers.CharField()
+    prizes = serializers.ListField(child=CreateOrEditContestPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     rule_type = serializers.ChoiceField(choices=[ContestRuleType.ACM, ContestRuleType.OI])
@@ -20,6 +39,11 @@ class EditConetestSeriaizer(serializers.Serializer):
     id = serializers.IntegerField()
     title = serializers.CharField(max_length=128)
     description = serializers.CharField()
+    requirements = serializers.ListField(child=serializers.CharField(max_length=128))
+    constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
+    allowed_groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
+    scoring = serializers.CharField()
+    prizes = serializers.ListField(child=CreateOrEditContestPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     password = serializers.CharField(allow_blank=True, allow_null=True, max_length=32)
@@ -32,13 +56,18 @@ class ContestAdminSerializer(serializers.ModelSerializer):
     created_by = UsernameSerializer()
     status = serializers.CharField()
     contest_type = serializers.CharField()
+    allowed_groups = GroupSummarySerializer(many=True)
+    prizes = ContestPrizeSerializer(many=True)
 
     class Meta:
         model = Contest
         fields = "__all__"
 
 
 class ContestSerializer(ContestAdminSerializer):
+    participants_count = serializers.IntegerField(required=False)
+    prizes = ContestPrizeSerializer(many=True)
+
     class Meta:
         model = Contest
         exclude = ("password", "visible", "allowed_ip_ranges")
@@ -75,10 +104,11 @@ class ContestPasswordVerifySerializer(serializers.Serializer):
 
 class ACMContestRankSerializer(serializers.ModelSerializer):
     username = serializers.SerializerMethodField()
+    prize = ContestPrizeSerializer()
 
     class Meta:
         model = ACMContestRank
-        fields = ["accepted_number", "total_time", "total_penalty", "submission_info", "username"]
+        fields = ["id", "accepted_number", "total_time", "total_penalty", "submission_info", "username", "prize"]
 
     def __init__(self, *args, **kwargs):
         self.is_contest_admin = kwargs.pop("is_contest_admin", False)

backend/contest/tests.py

@@ -2,6 +2,7 @@
 from datetime import datetime, timedelta
 
 from django.utils import timezone
+from group.models import Group
 
 from utils.api.tests import APITestCase
 
@@ -22,6 +23,14 @@
                         "rule_type": "ACM", "hint": "<p>test</p>", "source": "test"}
 
 DEFAULT_CONTEST_DATA = {"title": "test title", "description": "test description",
+                        "requirements": ["SKKU undergrate enrolled 2021 Spring"],
+                        "constraints": ["Not Awarded in same past competition"],
+                        "scoring": "ACM-ICPC style",
+                        "prizes": [{"color": "#FF6663", "name": "Top 2", "reward": "1,000,000 Won"},
+                                   {"color": "#FFD700", "name": "3(3~5)", "reward": "500,000 Won"},
+                                   {"color": "#C0C0C0", "name": "5(6~10)", "reward": "100,000 Won"},
+                                   {"color": "#CD7F32", "name": "10(11~20)", "reward": "50,000 Won"}],
+                        "allowed_groups": [],
                         "start_time": timezone.localtime(timezone.now()),
                         "end_time": timezone.localtime(timezone.now()) + timedelta(days=1),
                         "rule_type": ContestRuleType.ACM,
@@ -32,7 +41,7 @@
 
 class ContestAdminAPITest(APITestCase):
     def setUp(self):
-        self.create_super_admin()
+        self.super_admin = self.create_super_admin()
         self.url = self.reverse("contest_admin_api")
         self.data = copy.deepcopy(DEFAULT_CONTEST_DATA)
 
@@ -46,17 +55,38 @@ def test_create_contest_with_invalid_cidr(self):
         resp = self.client.post(self.url, data=self.data)
         self.assertTrue(resp.data["data"].endswith("is not a valid cidr network"))
 
+    def test_create_contest_with_group_not_existing(self):
+        self.data["allowed_groups"] = [1]
+        response = self.client.post(self.url, data=self.data)
+        self.assertFailed(response)
+
+    def test_create_contest_with_group_existing(self):
+        group = Group.objects.create(
+            created_by=self.super_admin,
+            name="SKKUding",
+            short_description="post group registration request",
+            description="post group registration request",
+            is_official=True
+        )
+        group.members.add(self.super_admin, through_defaults={"is_group_admin": False})
+        self.data["allowed_groups"] = [group.id]
+        response = self.client.post(self.url, data=self.data)
+        self.assertSuccess(response)
+
     def test_update_contest(self):
         id = self.test_create_contest().data["data"]["id"]
         update_data = {"id": id, "title": "update title",
                        "description": "update description",
                        "password": "12345",
-                       "visible": False, "real_time_rank": False}
+                       "visible": False, "real_time_rank": False
+                       }
         data = copy.deepcopy(self.data)
         data.update(update_data)
         response = self.client.put(self.url, data=data)
         self.assertSuccess(response)
         response_data = response.data["data"]
+        response_data.pop("prizes")
+        data.pop("prizes")
         for k in data.keys():
             if isinstance(data[k], datetime):
                 continue
@@ -76,7 +106,14 @@ def test_get_one_contest(self):
 class ContestAPITest(APITestCase):
     def setUp(self):
         user = self.create_admin()
-        self.contest = Contest.objects.create(created_by=user, **DEFAULT_CONTEST_DATA)
+        group = self.create_group(created_by=user)
+        data = copy.deepcopy(DEFAULT_CONTEST_DATA)
+        data.pop("allowed_groups")
+        data.pop("prizes")
+        allowed_groups = [group.id]
+        allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
+        self.contest = Contest.objects.create(created_by=user, **data)
+        self.contest.allowed_groups.set(allowed_groups_qs)
         self.url = self.reverse("contest_api") + "?id=" + str(self.contest.id)
 
     def test_get_contest_list(self):
@@ -111,6 +148,19 @@ def test_regular_user_access_contest(self):
         resp = self.client.get(self.url)
         self.assertSuccess(resp)
 
+    def test_not_group_member_access_contest(self):
+        self.create_user("test2", "test1234")
+        url = self.reverse("contest_access_api")
+        resp = self.client.get(url + "?contest_id=" + str(self.contest.id))
+        self.assertFalse(resp.data["data"]["access"])
+
+        password_url = self.reverse("contest_password_api")
+        resp = self.client.post(password_url,
+                                {"contest_id": self.contest.id, "password": DEFAULT_CONTEST_DATA["password"]})
+        self.assertSuccess(resp)
+        resp = self.client.get(self.url)
+        self.assertSuccess(resp)
+
 
 class ContestAnnouncementAdminAPITest(APITestCase):
     def setUp(self):

backend/contest/urls/admin.py

@@ -1,9 +1,10 @@
 from django.urls import path
 
-from ..views.admin import ContestAnnouncementAPI, ContestAPI, DownloadContestSubmissions
+from ..views.admin import ContestAnnouncementAPI, ContestAPI, ContestRankAPI, DownloadContestSubmissions
 
 urlpatterns = [
     path("contest/", ContestAPI.as_view(), name="contest_admin_api"),
     path("contest/announcement/", ContestAnnouncementAPI.as_view(), name="contest_announcement_admin_api"),
     path("download_submissions/", DownloadContestSubmissions.as_view(), name="acm_contest_helper"),
+    path("contest/rank/", ContestRankAPI.as_view(), name="contest_rank_api")
 ]