Merge pull request #127 from pythonkr/devdev

운영 반영

Author: golony6449

session/resources.py

@@ -7,9 +7,9 @@
 
 
 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"]

session/serializers.py

@@ -7,6 +7,7 @@
 class SessionSerializer(serializers.ModelSerializer):
     category_name = serializers.SerializerMethodField()
     accepted = serializers.BooleanField(read_only=True)
+    day_of_week = serializers.SerializerMethodField()
     created_at = serializers.DateTimeField(read_only=True)
     updated_at = serializers.DateTimeField(read_only=True)
 
@@ -25,22 +26,28 @@ class Meta:
             "video_url",
             "slide_url",
             "room_num",
+            "day_of_week",
             "created_at",
             "updated_at",
         ]
 
     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 +60,7 @@ class Meta:
             "language",
             "category",
             "category_name",
+            "day_of_week",
         ]
 
     @staticmethod
@@ -63,6 +71,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)