@@ -39,7 +39,7 @@ public PartyDto(Party party, Mission mission) {
3939 this .leaderId = party .getLeader ().getId ();
4040
4141 this .currentMembers = (int ) party .getPartyMembers ().stream ()
42- .filter (pm -> pm .getStatus () == PartyMemberStatus .ACCEPTED )
42+ .filter (pm -> pm .getStatus () == PartyMemberStatus .ACCEPTED || pm . getStatus () == PartyMemberStatus . COMPLETED )
4343 .count ();
4444
4545 this .maxMembers = party .getMaxMembers ();
@@ -66,11 +66,11 @@ public PartyDto(Party party, Mission mission) {
6666 }
6767
6868 this .members = party .getPartyMembers ().stream ()
69- .filter (pm -> pm .getStatus () == PartyMemberStatus .ACCEPTED )
69+ .filter (pm -> pm .getStatus () == PartyMemberStatus .ACCEPTED || pm . getStatus () == PartyMemberStatus . COMPLETED )
7070 .map (partyMember -> {
7171 return new PartyMemberDto (
7272 partyMember .getMember (),
73- null
73+ partyMember . getStatus (). name ()
7474 );
7575 })
7676 .collect (Collectors .toList ());
@@ -82,7 +82,7 @@ public PartyDto(Party party) {
8282 this .leaderId = party .getLeader ().getId ();
8383
8484 this .currentMembers = (int ) party .getPartyMembers ().stream ()
85- .filter (pm -> pm .getStatus () == PartyMemberStatus .ACCEPTED )
85+ .filter (pm -> pm .getStatus () == PartyMemberStatus .ACCEPTED || pm . getStatus () == PartyMemberStatus . COMPLETED )
8686 .count ();
8787
8888 this .maxMembers = party .getMaxMembers ();
@@ -98,8 +98,8 @@ public PartyDto(Party party) {
9898 this .missionIsCompleted = null ;
9999
100100 this .members = party .getPartyMembers ().stream ()
101- .filter (pm -> pm .getStatus () == PartyMemberStatus .ACCEPTED )
102- .map (partyMember -> new PartyMemberDto (partyMember .getMember (), null ))
101+ .filter (pm -> pm .getStatus () == PartyMemberStatus .ACCEPTED || pm . getStatus () == PartyMemberStatus . COMPLETED )
102+ .map (partyMember -> new PartyMemberDto (partyMember .getMember (), partyMember . getStatus (). name () ))
103103 .collect (Collectors .toList ());
104104 }
105105
0 commit comments