Merge branch 'devdev' into main

Author: emscb

program/migrations/0007_program_profile_img.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-07-16 13:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("program", "0006_alter_program_options_delete_proposal_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="program",
+            name="profile_img",
+            field=models.ImageField(blank=True, null=True, upload_to=""),
+        ),
+    ]

program/models.py

@@ -42,6 +42,7 @@ class Program(models.Model):
             (SPRINT, "스프린트"),
         ),
     )
+    profile_img = models.ImageField(null=True, blank=True)
 
     class Meta:
         verbose_name = "프로그램"

session/migrations/0003_session_host_name_alter_session_introduction.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.1.5 on 2023-07-16 13:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("session", "0002_remove_session_accepted"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="session",
+            name="host_name",
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name="session",
+            name="introduction",
+            field=models.TextField(
+                blank=True,
+                help_text="발표 소개 페이지에 들어가는 내용입니다.",
+                max_length=3000,
+                null=True,
+            ),
+        ),
+    ]

session/models.py

@@ -76,12 +76,13 @@ def __str__(self):
 
 class Session(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE, null=True, blank=True)
+    host_name = models.CharField(max_length=50, null=True, blank=True)
     title = models.CharField(max_length=255)
     introduction = models.TextField(
         max_length=3000,
         null=True,
         blank=True,
-        help_text="발표 소개 페이지에 들어가는 내용입니다. 변경 사항은 최대 60분 이내에 적용됩니다.",
+        help_text="발표 소개 페이지에 들어가는 내용입니다.",
     )
 
     difficulty = models.CharField(

session/resources.py

@@ -12,4 +12,15 @@ def before_import_row(self, row, row_number=None, **kwargs):
 
     class Meta:
         model = Session
-        fields = ["id", "title", "difficulty", "duration", "language", "category", "start_at", "room_num"]
+        fields = [
+            "id",
+            "title",
+            "difficulty",
+            "duration",
+            "language",
+            "category",
+            "start_at",
+            "room_num",
+            "introduction",
+            "host_name"
+        ]

session/serializers.py

@@ -26,7 +26,8 @@ class Meta:
             "slide_url",
             "room_num",
             "day_of_week",
-            "start_at"
+            "start_at",
+            "host_name"
         ]
 
     def to_representation(self, instance: Session):

ticket/migrations/0009_tickettype_buyable_url.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-07-16 13:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ticket', '0008_alter_ticket_refunded_at'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tickettype',
+            name='buyable_url',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

ticket/models.py

@@ -27,6 +27,7 @@ class TicketType(models.Model):
     )
     program = models.ForeignKey("program.Program", on_delete=models.PROTECT, null=True)
     is_refundable = models.BooleanField(default=True)
+    buyable_url = models.CharField(max_length=255, null=True, blank=True)
 
     def __str__(self):
         return self.name

ticket/view_models.py

@@ -24,6 +24,7 @@ class Program:
     program: Program
     is_refundable: bool
     is_buyable: property  # type: bool
+    buyable_url: Optional[str]
 
     def __init__(self, model: TicketType):
         self.id = str(model.id)
@@ -42,6 +43,7 @@ def __init__(self, model: TicketType):
         )
         self.is_refundable = model.is_refundable
         self.is_buyable = model.buyable
+        self.buyable_url = model.buyable_url
 
     def to_dict(self):
         return asdict(self)