Merge remote-tracking branch 'upstream/devdev' into devdev

Author: golony6449

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

@@ -7,9 +7,20 @@
 
 
 class SessionResource(resources.ModelResource):
-    def before_save_instance(self, instance: Session, using_transactions, dry_run):
-        instance.start_at = datetime.datetime.now()
+    def before_import_row(self, row, row_number=None, **kwargs):
+        row["room_num"] = int(row["room_num"])
 
     class Meta:
         model = Session
-        fields = ["id", "title", "difficulty", "duration", "language", "category"]
+        fields = [
+            "id",
+            "title",
+            "difficulty",
+            "duration",
+            "language",
+            "category",
+            "start_at",
+            "room_num",
+            "introduction",
+            "host_name"
+        ]

session/serializers.py

@@ -7,8 +7,8 @@
 class SessionSerializer(serializers.ModelSerializer):
     category_name = serializers.SerializerMethodField()
     accepted = serializers.BooleanField(read_only=True)
-    created_at = serializers.DateTimeField(read_only=True)
-    updated_at = serializers.DateTimeField(read_only=True)
+    day_of_week = serializers.SerializerMethodField()
+    start_at = serializers.DateTimeField(read_only=True)
 
     class Meta:
         model = Session
@@ -25,22 +25,28 @@ class Meta:
             "video_url",
             "slide_url",
             "room_num",
-            "created_at",
-            "updated_at",
+            "day_of_week",
+            "start_at",
+            "host_name"
         ]
 
     def to_representation(self, instance: Session):
         response = super().to_representation(instance)
-        response["user"] = UserExtSerializer(instance.user.userext).data
+        response["user"] = UserExtSerializer(instance.user.userext).data if instance.user else None
         return response
 
     @staticmethod
     def get_category_name(obj: Session):
         return obj.category.name
 
+    @staticmethod
+    def get_day_of_week(obj: Session):
+        return obj.start_at.strftime("%a") if obj.start_at else None
+
 
 class SessionListSerializer(serializers.ModelSerializer):
     category_name = serializers.SerializerMethodField()
+    day_of_week = serializers.SerializerMethodField()
 
     class Meta:
         model = Session
@@ -53,6 +59,7 @@ class Meta:
             "language",
             "category",
             "category_name",
+            "day_of_week",
         ]
 
     @staticmethod
@@ -63,6 +70,10 @@ def get_profile_img(obj: Session):
     def get_category_name(obj: Session):
         return obj.category.name
 
+    @staticmethod
+    def get_day_of_week(obj: Session):
+        return obj.start_at.strftime("%a") if obj.start_at else None
+
     def to_representation(self, instance: Session):
         response = super().to_representation(instance)
 

session/urls.py

@@ -2,10 +2,12 @@
 from rest_framework.routers import DefaultRouter
 
 from session.viewsets import SessionViewSet
+from session.views import get__timetable
 
 session_router = DefaultRouter()
 session_router.register("", SessionViewSet, basename="session")
 
 urlpatterns = [
+    path("timetable/", get__timetable),
     path("", include(session_router.urls)),
 ]

session/views.py

@@ -1,13 +1,34 @@
+import datetime
+
+from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
-from program.models import Session
+from session.models import Session
+from session.serializers import SessionSerializer
 
 
+@api_view(["GET"])
 def get__timetable(request):
     response = dict()
 
-    response["day1"] = Session.objects.filter()
+    MONTH = 8
+    FIRST_DAY = 12
+    SECOND_DAY = 13
+
+    response["day1"] = SessionSerializer(
+        Session.objects.filter(
+            start_at__month=MONTH,
+            start_at__day=FIRST_DAY
+        ),
+        many=True
+    ).data
 
-    response["day2"] = Session.objects.filter()
+    response["day2"] = SessionSerializer(
+        Session.objects.filter(
+            start_at__month=MONTH,
+            start_at__day=SECOND_DAY
+        ),
+        many=True
+    ).data
 
     return Response(data=response)

sponsor/viewsets.py

@@ -25,10 +25,10 @@ class SponsorViewSet(ModelViewSet):
     validator = SponsorValidater()
 
     def get_queryset(self):
-        return Sponsor.objects.all()
+        return Sponsor.objects.all().order_by("paid_at")
 
     def list(self, request, *args, **kwargs):
-        queryset = Sponsor.objects.filter(paid_at__isnull=False).order_by("level")
+        queryset = Sponsor.objects.filter(paid_at__isnull=False).order_by("level", "paid_at")
         serializer = SponsorListSerializer(queryset, many=True)
         return Response(serializer.data)
 

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),
+        ),
+    ]