Skip to content

Commit 40dee68

Browse files
authored
feat : enum 확장 (#125)
1 parent ffc7d7a commit 40dee68

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

backend/src/main/java/com/back/domain/party/party/dto/PartyDto.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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

backend/src/main/java/com/back/domain/party/party/entity/PartyMemberStatus.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
public enum PartyMemberStatus {
44
PENDING, // 초대 대기
55
ACCEPTED, // 파티원
6+
COMPLETED, // 미션 완료
7+
LEFT // 도중에 나감 또는 중도 포기
68
}

0 commit comments

Comments
 (0)