Skip to content

Commit 08e7179

Browse files
authored
Merge pull request #108 from golony6449/feature/golony/session
update: 세션 상세에 누락된 필드 추가
2 parents b5c2dc9 + ea0dc62 commit 08e7179

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

accounts/serializers.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from django.contrib.auth import get_user_model
2+
3+
import rest_framework.serializers as serializers
4+
5+
User = get_user_model()
6+
7+
8+
class UserSerializer(serializers.ModelSerializer):
9+
nickname = serializers.SerializerMethodField()
10+
bio = serializers.SerializerMethodField()
11+
12+
class Meta:
13+
model = User
14+
fields = [
15+
"nickname",
16+
"bio"
17+
]
18+
19+
@staticmethod
20+
def get_nickname(obj: User):
21+
return "{}{}".format(obj.last_name, obj.first_name)
22+
23+
@staticmethod
24+
def get_bio(obj: User):
25+
return obj.userext.bio

program/serializers.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from rest_framework import serializers
22

33
from program.models import Proposal, ProposalCategory
4+
from accounts.serializers import UserSerializer
45

56

67
class ProposalSerializer(serializers.ModelSerializer):
7-
username = serializers.SerializerMethodField()
88
category_name = serializers.SerializerMethodField()
99
accepted = serializers.BooleanField(read_only=True)
1010
created_at = serializers.DateTimeField(read_only=True)
@@ -14,7 +14,6 @@ class Meta:
1414
model = Proposal
1515
fields = [
1616
"id",
17-
"username",
1817
"title",
1918
"brief",
2019
"desc",
@@ -33,16 +32,16 @@ class Meta:
3332
"updated_at",
3433
]
3534

36-
@staticmethod
37-
def get_username(obj: Proposal):
38-
return "{}{}".format(obj.user.last_name, obj.user.first_name)
35+
def to_representation(self, instance: Proposal):
36+
response = super().to_representation(instance)
37+
response["user"] = UserSerializer(instance.user).data
38+
return response
3939

4040
@staticmethod
4141
def get_category_name(obj: Proposal):
4242
return obj.category.name
4343

4444

45-
4645
class ProposalListSerializer(serializers.ModelSerializer):
4746
class Meta:
4847
model = Proposal

0 commit comments

Comments
 (0)