Skip to content

Commit d58c124

Browse files
authored
Merge pull request #593 from PROCOLLAB-github/feature/new_invitation_method
Дополнен ответ при запросе на GET /invites/
2 parents 465e112 + 7fa0bad commit d58c124

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

invites/managers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
class InviteManager(Manager):
55
def get_invite_for_list_view(self):
6-
return self.get_queryset().select_related("project", "user")
6+
return self.get_queryset().select_related("project", "project__leader", "user")

invites/serializers.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,22 @@
44
from invites.models import Invite
55
from projects.models import Collaborator
66
from projects.serializers import ProjectListSerializer
7+
from users.models import CustomUser
78
from users.serializers import UserDetailSerializer
89

910

11+
class InviteSenderSerializer(serializers.ModelSerializer[CustomUser]):
12+
class Meta:
13+
model = CustomUser
14+
fields = [
15+
"id",
16+
"first_name",
17+
"last_name",
18+
"patronymic",
19+
"avatar",
20+
]
21+
22+
1023
class InviteListSerializer(serializers.ModelSerializer[Invite]):
1124
class Meta:
1225
model = Invite
@@ -67,6 +80,7 @@ def validate(self, attrs):
6780
class InviteDetailSerializer(serializers.ModelSerializer[Invite]):
6881
user = UserDetailSerializer(many=False, read_only=True)
6982
project = ProjectListSerializer(many=False, read_only=True)
83+
sender = InviteSenderSerializer(source="project.leader", read_only=True)
7084
specialization = serializers.CharField(
7185
required=False, allow_null=True, allow_blank=True
7286
)
@@ -77,6 +91,7 @@ class Meta:
7791
"id",
7892
"project",
7993
"user",
94+
"sender",
8095
"motivational_letter",
8196
"role",
8297
"specialization",

0 commit comments

Comments
 (0)