Skip to content

Commit cdd0929

Browse files
authored
Merge pull request #123 from golony6449/feature/golony/session
시간표 API 추가
2 parents 475f08a + 4614788 commit cdd0929

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

session/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Meta:
3131

3232
def to_representation(self, instance: Session):
3333
response = super().to_representation(instance)
34-
response["user"] = UserExtSerializer(instance.user.userext).data
34+
response["user"] = UserExtSerializer(instance.user.userext).data if instance.user else None
3535
return response
3636

3737
@staticmethod

session/urls.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
from rest_framework.routers import DefaultRouter
33

44
from session.viewsets import SessionViewSet
5+
from session.views import get__timetable
56

67
session_router = DefaultRouter()
78
session_router.register("", SessionViewSet, basename="session")
89

910
urlpatterns = [
1011
path("", include(session_router.urls)),
12+
path("timetable", get__timetable),
1113
]

session/views.py

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,34 @@
1+
import datetime
2+
3+
from rest_framework.decorators import api_view
14
from rest_framework.response import Response
25

3-
from program.models import Session
6+
from session.models import Session
7+
from session.serializers import SessionSerializer
48

59

10+
@api_view(["GET"])
611
def get__timetable(request):
712
response = dict()
813

9-
response["day1"] = Session.objects.filter()
14+
MONTH = 8
15+
FIRST_DAY = 12
16+
SECOND_DAY = 13
17+
18+
response["day1"] = SessionSerializer(
19+
Session.objects.filter(
20+
start_at__month=MONTH,
21+
start_at__day=FIRST_DAY
22+
),
23+
many=True
24+
).data
1025

11-
response["day2"] = Session.objects.filter()
26+
response["day2"] = SessionSerializer(
27+
Session.objects.filter(
28+
start_at__month=MONTH,
29+
start_at__day=SECOND_DAY
30+
),
31+
many=True
32+
).data
1233

1334
return Response(data=response)

0 commit comments

Comments
 (0)