Skip to content

[FIX] 구매자 - 참여 리스트 모집완료 상태 분철글 상태를 따르게 #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
88guri merged 2 commits into from
Jan 23, 2026
Merged

[FIX] 구매자 - 참여 리스트 모집완료 상태 분철글 상태를 따르게 #200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d7afbe
refactor: #199 구매자 - 참여 리스트 모집완료 상태 분철글 상태를 따르게
88guri Jan 23, 2026
2045279
chore: #199 주석 수정
88guri Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/main/java/org/sopt/poti/domain/participation/service/ParticipationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ public LeaderUserIdResponse confirmDelivered(Long userId, Long participationId)

// OrderStatus기준 배송중(SHIPPED)일 때만 배송완료 확정 가능
if (order.getStatus() != OrderStatus.SHIPPED) {
throw new BusinessException(
ErrorStatus.ORDER_NOT_SHIPPED);
throw new BusinessException(ErrorStatus.ORDER_NOT_SHIPPED);
}

// 1 내 주문 배송완료 처리 (OrderStatus)
Expand All @@ -75,7 +74,7 @@ public LeaderUserIdResponse confirmDelivered(Long userId, Long participationId)
Long leaderUserId = order.getGroupBuyPost().getLeader().getId();
long remaining = orderService.countByGroupBuyPostIdAndStatusNot(postId, OrderStatus.DELIVERED);

// 3) 남은 주문이 0개 -> GroupBuyPostStatus도 배송완료로 변경
// 3 남은 주문이 0개 -> GroupBuyPostStatus도 배송완료로 변경
if (remaining == 0) {
GroupBuyPost post = order.getGroupBuyPost();

Expand All @@ -88,7 +87,6 @@ public LeaderUserIdResponse confirmDelivered(Long userId, Long participationId)
return new LeaderUserIdResponse(leaderUserId);
}


// OrderStatus가 DELIVERED면 COMPLETED로 봄
private boolean isCompleted(OrderStatus status) {
return status == OrderStatus.DELIVERED;
Expand All @@ -105,21 +103,25 @@ private boolean matchParticipationStatus(Order order, ParticipationStatus status
}

// OrderStatus를 GroupBuyPostStatus처럼 내려줌
private String mapToClientPostStatus(OrderStatus orderStatus) {
return switch (orderStatus) {
case RECRUITING -> GroupBuyPostStatus.RECRUITING.name();
// GroupBuyPostStatus 우선 반영(RECRUITING까지) -> CLOSED 이후에는 OrderStatus 기준
private String mapToClientPostStatus(GroupBuyPostStatus postStatus, OrderStatus orderStatus) {

case WAIT_PAY, WAIT_PAY_CHECK -> GroupBuyPostStatus.CLOSED.name();
// 1 분철글이 모집중이면 무조건 RECRUITING 고정
if (postStatus == GroupBuyPostStatus.RECRUITING) {
return GroupBuyPostStatus.RECRUITING.name();
}

return switch (orderStatus) {
case WAIT_PAY, WAIT_PAY_CHECK -> GroupBuyPostStatus.CLOSED.name();
case PAID, READY -> GroupBuyPostStatus.PAYMENT_DONE.name();

case SHIPPED -> GroupBuyPostStatus.SHIPPING.name();

case DELIVERED -> GroupBuyPostStatus.DELIVERED.name();

// 데이터가 꼬여 RECRUITING이 내려오는 경우, RECRUITING 그대로 반환
case RECRUITING -> GroupBuyPostStatus.RECRUITING.name();
};
}


// 응답 Status를 OrderStatus로 내려줌
private ParticipationListResponse toResponse(Order order) {
var post = order.getGroupBuyPost();
Expand All @@ -130,7 +132,7 @@ private ParticipationListResponse toResponse(Order order) {
post.getArtist().getName(),
post.getTitle(),
post.getRepresentativeImageUrl(),
mapToClientPostStatus(order.getStatus())
mapToClientPostStatus(post.getStatus(), order.getStatus())
);
}
}