Merge branch 'master' into stored_favorite_membership_counts

.gitignore

@@ -6,6 +6,7 @@
 # Python files
 __pycache__/
 *.pyc
+.python-version
 
 # Distribution
 /frontend/public/storybook/
@@ -27,6 +28,8 @@ db.sqlite3
 
 # React
 node_modules/
+.yarn
+.yarnrc.yml
 .next/
 
 # Development Enviroment

backend/clubs/admin.py

@@ -15,6 +15,7 @@
     Advisor,
     ApplicationCommittee,
     ApplicationCycle,
+    ApplicationExtension,
     ApplicationMultipleChoice,
     ApplicationQuestion,
     ApplicationQuestionResponse,
@@ -412,6 +413,7 @@ class ApplicationSubmissionAdmin(admin.ModelAdmin):
 
 admin.site.register(Asset)
 admin.site.register(ApplicationCommittee)
+admin.site.register(ApplicationExtension)
 admin.site.register(ApplicationMultipleChoice)
 admin.site.register(ApplicationQuestion)
 admin.site.register(ApplicationQuestionResponse)

backend/clubs/management/commands/populate.py

@@ -394,6 +394,12 @@ def get_image(url):
         tag_undergrad, _ = Tag.objects.get_or_create(name="Undergraduate")
         tag_generic, _ = Tag.objects.get_or_create(name="Generic")
 
+        wharton_badge, _ = Badge.objects.get_or_create(
+            label="Wharton Council",
+            purpose="Dummy badge to mock Wharton-affiliated clubs",
+            visible=True,
+        )
+
         for i in range(1, 50):
             club, created = Club.objects.get_or_create(
                 code="z-club-{}".format(i),
@@ -406,6 +412,10 @@ def get_image(url):
                 },
             )
 
+            if 10 <= i <= 15:
+                # Make some clubs Wharton-affiliated
+                club.badges.add(wharton_badge)
+
             if created:
                 club.available_virtually = i % 2 == 0
                 club.appointment_needed = i % 3 == 0

backend/clubs/migrations/0091_applicationextension.py

@@ -0,0 +1,47 @@
+# Generated by Django 3.2.18 on 2023-11-25 03:58
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("clubs", "0090_auto_20230106_1443"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ApplicationExtension",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("end_time", models.DateTimeField()),
+                (
+                    "application",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="extensions",
+                        to="clubs.clubapplication",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={"unique_together": {("user", "application")}},
+        ),
+    ]

backend/clubs/migrations/0091_clubapplication_application_end_time_exception.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-11-17 22:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("clubs", "0090_auto_20230106_1443"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="clubapplication",
+            name="application_end_time_exception",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+    ]

backend/clubs/migrations/0092_merge_20240106_1117.py

@@ -0,0 +1,13 @@
+# Generated by Django 3.2.18 on 2024-01-06 16:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("clubs", "0091_applicationextension"),
+        ("clubs", "0091_clubapplication_application_end_time_exception"),
+    ]
+
+    operations = []

backend/clubs/migrations/0093_auto_20240106_1153.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.18 on 2024-01-06 16:53
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("clubs", "0092_merge_20240106_1117"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="applicationquestionresponse",
+            unique_together={("question", "submission")},
+        ),
+        migrations.AlterUniqueTogether(
+            name="applicationsubmission",
+            unique_together={("user", "application", "committee")},
+        ),
+    ]

backend/clubs/migrations/0094_applicationcycle_release_date.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2024-01-11 14:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("clubs", "0093_auto_20240106_1153"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="applicationcycle",
+            name="release_date",
+            field=models.DateTimeField(null=True),
+        ),
+    ]