Skip to content

Commit e883380

Browse files
use EntityMember data for leaders
1 parent 24b00c1 commit e883380

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

backend/apps/api/rest/v0/chapter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ChapterDetail(ChapterBase):
4444
@staticmethod
4545
def resolve_leaders(obj):
4646
"""Resolve leaders."""
47-
return obj.leaders_raw
47+
return [leader.member_name for leader in obj.entity_leaders]
4848

4949

5050
class ChapterError(Schema):

backend/apps/api/rest/v0/project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ProjectDetail(ProjectBase):
4545
@staticmethod
4646
def resolve_leaders(obj):
4747
"""Resolve leaders."""
48-
return obj.leaders_raw
48+
return [leader.member_name for leader in obj.entity_leaders]
4949

5050

5151
class ProjectError(Schema):

backend/tests/apps/api/rest/v0/chapter_test.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@
2727
],
2828
)
2929
def test_chapter_serializer_validation(chapter_data):
30+
class MockEntityMember:
31+
def __init__(self, name):
32+
self.member_name = name
33+
3034
class MockChapter:
3135
def __init__(self, data):
3236
for key, value in data.items():
3337
setattr(self, key, value)
3438
self.nest_key = data["key"]
35-
self.leaders_raw = ["Alice", "Bob"]
39+
self.entity_leaders = [MockEntityMember("Alice"), MockEntityMember("Bob")]
3640

3741
chapter = ChapterDetail.from_orm(MockChapter(chapter_data))
3842

backend/tests/apps/api/rest/v0/project_test.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@
2727
],
2828
)
2929
def test_project_serializer_validation(project_data):
30+
class MockEntityMember:
31+
def __init__(self, name):
32+
self.member_name = name
33+
3034
class MockProject:
3135
def __init__(self, data):
3236
for key, value in data.items():
3337
setattr(self, key, value)
3438
self.nest_key = data["key"]
35-
self.leaders_raw = ["Alice", "Bob"]
39+
self.entity_leaders = [MockEntityMember("Alice"), MockEntityMember("Bob")]
3640

3741
project = ProjectDetail.from_orm(MockProject(project_data))
3842

0 commit comments

Comments
 (0)