diff --git a/src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java b/src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java index be01771..f8042c7 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java +++ b/src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java @@ -2,10 +2,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; -import org.jullaene.walkmong_back.api.apply.dto.enums.WalkMatchingStatus; import org.jullaene.walkmong_back.common.enums.Gender; -import org.jullaene.walkmong_back.common.enums.TabStatus; -import org.springframework.cglib.core.Local; import java.time.LocalDateTime; @@ -23,6 +20,7 @@ public class MatchingResponseDto { private final String walkerName; private final String walkerProfile; private final String walkMatchingStatus; + private final Long boardId; public MatchingResponseDto() { @@ -37,5 +35,6 @@ public MatchingResponseDto() { this.walkerName = null; this.walkerProfile = null; this.walkMatchingStatus = null; + this.boardId = null; } } diff --git a/src/main/java/org/jullaene/walkmong_back/api/board/rest/BoardController.java b/src/main/java/org/jullaene/walkmong_back/api/board/rest/BoardController.java index e8c94fa..e3294f9 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/board/rest/BoardController.java +++ b/src/main/java/org/jullaene/walkmong_back/api/board/rest/BoardController.java @@ -2,6 +2,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.jullaene.walkmong_back.api.board.domain.enums.WalkingStatus; import org.jullaene.walkmong_back.api.board.dto.req.BoardRequestDto; import org.jullaene.walkmong_back.api.board.dto.req.GeoReq; import org.jullaene.walkmong_back.api.board.dto.req.MeetAddressReq; @@ -73,11 +74,12 @@ public ResponseEntity> getCurrentGeo (@PathVariable("board /** * 산책 완료 * */ - @PatchMapping("/walk/complete/{boardId}") + @PatchMapping("/walk/status/{boardId}") public ResponseEntity> completeWalking ( - @PathVariable("boardId") Long boardId + @PathVariable("boardId") Long boardId, + @RequestParam("status") WalkingStatus status ) { - return ResponseEntity.ok(BasicResponse.ofSuccess(boardService.completeWalking(boardId))); + return ResponseEntity.ok(BasicResponse.ofSuccess(boardService.changeWalkingStatus(boardId, status))); } } diff --git a/src/main/java/org/jullaene/walkmong_back/api/board/service/BoardService.java b/src/main/java/org/jullaene/walkmong_back/api/board/service/BoardService.java index a03e3a6..2f72d4b 100644 --- a/src/main/java/org/jullaene/walkmong_back/api/board/service/BoardService.java +++ b/src/main/java/org/jullaene/walkmong_back/api/board/service/BoardService.java @@ -224,10 +224,10 @@ public GeoRes getGeoPost(Long boardId) { } /** - * 산책 완료 처리 + * 산책 상태 변경 * */ @Transactional - public String completeWalking(Long boardId) { + public String changeWalkingStatus (Long boardId, WalkingStatus walkingStatus) { Member member = memberService.getMemberFromUserDetail(); Board board = boardRepository.findByBoardIdAndDelYn(boardId, "N") .orElseThrow(() -> new CustomException(HttpStatus.NOT_FOUND, ErrorType.INVALID_BOARD)); @@ -243,7 +243,7 @@ public String completeWalking(Long boardId) { } log.info("반려인 또는 산책자 인증 완료"); - board.updateWalkingStatus(WalkingStatus.AFTER); + board.updateWalkingStatus(walkingStatus); return "SUCCESS"; }