From 422f7876b7e12955875ffe04705d0b7d2b435fe2 Mon Sep 17 00:00:00 2001 From: Eunjeong Lee Date: Thu, 16 Jan 2025 20:26:53 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EC=82=B0=EC=B1=85=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20api=EB=A5=BC=20=EC=82=B0=EC=B1=85=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EB=B3=80=EA=B2=BD=20api=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../walkmong_back/api/board/rest/BoardController.java | 8 +++++--- .../walkmong_back/api/board/service/BoardService.java | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) 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"; } From 5c6b3a670cf2d313a19bf4e62e164a8ce7b3781c Mon Sep 17 00:00:00 2001 From: Seung Ik Lee Date: Thu, 16 Jan 2025 21:40:36 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20#133=20=EB=A7=A4=EC=B9=AD=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../walkmong_back/api/apply/dto/res/MatchingResponseDto.java | 2 ++ 1 file changed, 2 insertions(+) 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..fdbcce2 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 @@ -23,6 +23,7 @@ public class MatchingResponseDto { private final String walkerName; private final String walkerProfile; private final String walkMatchingStatus; + private final Long boardId; public MatchingResponseDto() { @@ -37,5 +38,6 @@ public MatchingResponseDto() { this.walkerName = null; this.walkerProfile = null; this.walkMatchingStatus = null; + this.boardId = null; } } From 9bdb1385ee5ead6d7f3b5db99b86ce9f3e1520b8 Mon Sep 17 00:00:00 2001 From: Seung Ik Lee Date: Thu, 16 Jan 2025 21:41:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20#133=20=EB=A7=A4=EC=B9=AD=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../walkmong_back/api/apply/dto/res/MatchingResponseDto.java | 3 --- 1 file changed, 3 deletions(-) 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 fdbcce2..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;