[Feat] 정산 api 수정(동일한 api로 정산 완료/미완 상태 변경하기) #364

src/docs/asciidoc/api/challenge.adoc

@@ -19,6 +19,17 @@ operation::challenge/get-challenge-page[snippets='http-request,http-response,res
 
 현재 접속한 사용자가 참여하고 있는 챌린지 목록을 반환합니다.
 
+
+챌린지 상태의 경우, 다음의 7가지 상태 중 하나가 문자열로 전달됩니다.
+
+[ "SCHEDULED"(진행 예정),
+"IN_PROGRESS"(진행 중),
+"COMPLETED_PENDING_SETTLEMENT"(완료, 정산 안 됨),
+"COMPLETED_SETTLED"(완료, 정산됨),
+"CANCELED"(중도 취소),
+"CANCELED_SETTLED"(중도 취소, 정산됨),
+"CANCELED_BEFORE_START"(시작 전 취소함) ]
+
 operation::challenge/get-my-challenge-list[snippets='http-request,http-response,response-fields']
 
 === 다른 멤버의 챌린지 참여 목록 조회

src/main/java/com/habitpay/habitpay/domain/challenge/application/ChallengeSettlementService.java

@@ -33,11 +33,14 @@ public SuccessResponse<Void> settleChallenge(Long challengeId, Member member) {
             throw new BadRequestException(ErrorCode.INVALID_CHALLENGE_SETTLEMENT_TIME);
         }
 
-        if (!(challenge.getState() == ChallengeState.COMPLETED_PENDING_SETTLEMENT)) {
-            throw new BadRequestException(ErrorCode.INVALID_CHALLENGE_STATE_FOR_SETTLEMENT);
+        switch (challenge.getState()) {
+            case COMPLETED_PENDING_SETTLEMENT -> challenge.setStateCompletedSettled();
+            case COMPLETED_SETTLED -> challenge.setStateCompletedPendingSettlement();
+            case CANCELED -> challenge.setStateCanceledSettled();
+            case CANCELED_SETTLED -> challenge.setStateCanceled();
+            default -> throw new BadRequestException(ErrorCode.INVALID_CHALLENGE_STATE_FOR_SETTLEMENT);
         }
 
-        challenge.setStateCompletedSettled();
         challengeRepository.save(challenge);
 
         return SuccessResponse.of(SuccessCode.CHALLENGE_SETTLEMENT_SUCCESS);

src/main/java/com/habitpay/habitpay/domain/challenge/domain/Challenge.java

@@ -157,6 +157,7 @@ public void setStateInProgress() {
     }
 
     public void setStateCompletedPendingSettlement() {
+        this.isPaidAll = false;
         this.state = ChallengeState.COMPLETED_PENDING_SETTLEMENT;
     }
 
@@ -165,6 +166,16 @@ public void setStateCompletedSettled() {
         this.state = ChallengeState.COMPLETED_SETTLED;
     }
 
+    public void setStateCanceledSettled() {
+        this.isPaidAll = true;
+        this.state = ChallengeState.CANCELED_SETTLED;
+    }
+
+    public void setStateCanceled() {
+        this.isPaidAll = false;
+        this.state = ChallengeState.CANCELED;
+    }
+
     public boolean isTodayParticipatingDay() {
         ZonedDateTime nowInLocal = TimeZoneConverter.convertEtcToLocalTimeZone(ZonedDateTime.now());
         DayOfWeek today = nowInLocal.getDayOfWeek();

src/main/java/com/habitpay/habitpay/domain/challenge/domain/ChallengeState.java

@@ -9,5 +9,6 @@ public enum ChallengeState {
     COMPLETED_PENDING_SETTLEMENT,
     COMPLETED_SETTLED,
     CANCELED,
+    CANCELED_SETTLED,
     CANCELED_BEFORE_START;
 }

src/main/java/com/habitpay/habitpay/domain/challenge/dto/ChallengeDetailsResponse.java

@@ -28,6 +28,7 @@ public class ChallengeDetailsResponse {
     private Boolean isHost;
     private Boolean isMemberEnrolledInChallenge;
     private Boolean isGivenUp;
+    private String challengeState;
 
     public static ChallengeDetailsResponse of(Member member, Challenge challenge,
                                               List<String> enrolledMembersProfileImageList,
@@ -50,6 +51,7 @@ public static ChallengeDetailsResponse of(Member member, Challenge challenge,
                 .isHost(challenge.getHost().getId().equals(member.getId()))
                 .isMemberEnrolledInChallenge(isMemberEnrolledInChallenge)
                 .isGivenUp(isGivenUp)
+                .challengeState(String.valueOf(challenge.getState()))
                 .build();
     }
 }

src/main/java/com/habitpay/habitpay/domain/challenge/dto/ChallengeEnrolledListItemResponse.java

@@ -27,6 +27,7 @@ public class ChallengeEnrolledListItemResponse {
     private int successCount;
     private Boolean isTodayParticipatingDay;
     private Boolean isParticipatedToday;
+    private String challengeState;
 
     public static ChallengeEnrolledListItemResponse of(Challenge challenge, ChallengeEnrollment challengeEnrollment, ParticipationStat stat, String hostProfileImage, boolean isParticipatedToday) {
         return ChallengeEnrolledListItemResponse.builder()
@@ -46,6 +47,7 @@ public static ChallengeEnrolledListItemResponse of(Challenge challenge, Challeng
                 .successCount(stat.getSuccessCount())
                 .isTodayParticipatingDay(challenge.isTodayParticipatingDay())
                 .isParticipatedToday(isParticipatedToday)
+                .challengeState(String.valueOf(challenge.getState()))
                 .build();
     }
 }

src/main/java/com/habitpay/habitpay/global/error/exception/ErrorCode.java

@@ -47,7 +47,7 @@ public enum ErrorCode {
     NOT_ALLOWED_TO_CANCEL_ENROLLMENT_OF_HOST(HttpStatus.BAD_REQUEST, "챌린지 주최자는 참여 취소가 불가능 합니다."),
     NOT_ALLOWED_TO_DELETE_CHALLENGE(HttpStatus.FORBIDDEN, "챌린지 삭제는 챌린지 주최자만 가능합니다."),
     INVALID_CHALLENGE_SETTLEMENT_TIME(HttpStatus.BAD_REQUEST, "정산은 챌린지 종료 이후에 가능합니다."),
-    INVALID_CHALLENGE_STATE_FOR_SETTLEMENT(HttpStatus.BAD_REQUEST, "정산은 챌린지가 종료 이후 정산 대기 상태일 때만 가능합니다."),
+    INVALID_CHALLENGE_STATE_FOR_SETTLEMENT(HttpStatus.BAD_REQUEST, "정산 혹은 정산 취소 처리가 불가한 상태입니다."),
 
     // Challenge Participation Record
     RECORD_NOT_FOUND(HttpStatus.NOT_FOUND, "챌린지 참여 기록이 존재하지 않습니다."),

src/main/java/com/habitpay/habitpay/global/response/SuccessCode.java

@@ -22,7 +22,7 @@ public enum SuccessCode {
     CANCEL_CHALLENGE_ENROLLMENT_SUCCESS("정상적으로 챌린지 등록을 취소했습니다."),
     GIVING_UP_CHALLENGE("정상적으로 챌린지 중도 포기 처리가 되었습니다."),
     DELETE_CHALLENGE_SUCCESS("정상적으로 챌린지를 삭제했습니다."),
-    CHALLENGE_SETTLEMENT_SUCCESS("정상적으로 챌린지 정산이 완료되었습니다."),
+    CHALLENGE_SETTLEMENT_SUCCESS("정상적으로 챌린지 정산 상태가 변경되었습니다."),
 
     // Post
     CREATE_POST_SUCCESS("정상적으로 포스트를 생성했습니다."),