Skip to content

Commit b5c2dc9

Browse files
authored
Merge pull request #107 from golony6449/feature/golony/session
세션 상세에 사용자이름, 카테코리명 필드 추가
2 parents 1fe372c + 4a3ea6a commit b5c2dc9

File tree

3 files changed

+24
-8
lines changed

3 files changed

+24
-8
lines changed

program/models.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ class ProposalCategory(models.Model):
1111
visible = models.BooleanField(default=True)
1212

1313
class Meta:
14-
verbose_name = "프로그램 카테고리"
15-
verbose_name_plural = "프로그램 카테고리들"
14+
verbose_name = "세션 카테고리"
15+
verbose_name_plural = "세션 카테고리들"
1616

1717
def __str__(self):
1818
return self.name
@@ -92,8 +92,8 @@ class Proposal(models.Model):
9292
updated_at = models.DateTimeField(auto_now=True)
9393

9494
class Meta:
95-
verbose_name = "프로그램"
96-
verbose_name_plural = "프로그램들"
95+
verbose_name = "세션"
96+
verbose_name_plural = "세션들"
9797

9898
def __str__(self):
9999
return self.title
@@ -137,5 +137,9 @@ class Program(models.Model):
137137
),
138138
)
139139

140+
class Meta:
141+
verbose_name = "프로그램"
142+
verbose_name_plural = "프로그램들"
143+
140144
def __str__(self):
141145
return self.title

program/serializers.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55

66
class ProposalSerializer(serializers.ModelSerializer):
7+
username = serializers.SerializerMethodField()
8+
category_name = serializers.SerializerMethodField()
79
accepted = serializers.BooleanField(read_only=True)
810
created_at = serializers.DateTimeField(read_only=True)
911
updated_at = serializers.DateTimeField(read_only=True)
@@ -12,7 +14,7 @@ class Meta:
1214
model = Proposal
1315
fields = [
1416
"id",
15-
"user",
17+
"username",
1618
"title",
1719
"brief",
1820
"desc",
@@ -21,6 +23,7 @@ class Meta:
2123
"duration",
2224
"language",
2325
"category",
26+
"category_name",
2427
"accepted",
2528
"introduction",
2629
"video_url",
@@ -30,6 +33,15 @@ class Meta:
3033
"updated_at",
3134
]
3235

36+
@staticmethod
37+
def get_username(obj: Proposal):
38+
return "{}{}".format(obj.user.last_name, obj.user.first_name)
39+
40+
@staticmethod
41+
def get_category_name(obj: Proposal):
42+
return obj.category.name
43+
44+
3345

3446
class ProposalListSerializer(serializers.ModelSerializer):
3547
class Meta:

program/urls.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
from program.viewsets import ProposalViewSet
55

6-
router = DefaultRouter()
7-
router.register("", ProposalViewSet, basename="program")
6+
session_router = DefaultRouter()
7+
session_router.register("sessions", ProposalViewSet, basename="session")
88

99
urlpatterns = [
10-
path("", include(router.urls)),
10+
path("", include(session_router.urls)),
1111
]

0 commit comments

Comments
 (0)