Skip to content

fix: 매칭 현황 리스트 조회 API 수정 #135

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
seungikLeee merged 4 commits into from
Jan 16, 2025
Merged

fix: 매칭 현황 리스트 조회 API 수정 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
422f787
fix: 산책 완료 api를 산책 상태 변경 api로 변경
eun0901 Jan 16, 2025
5c6b3a6
fix: #133 매칭 현황 리스트 조회 API 수정
seungikLeee Jan 16, 2025
9bdb138
fix: #133 매칭 현황 리스트 조회 API 수정
seungikLeee Jan 16, 2025
984b601
Merge pull request #134 from jullaene/fix/apply-#133
seungikLeee Jan 16, 2025
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
5 changes: 2 additions & 3 deletions src/main/java/org/jullaene/walkmong_back/api/apply/dto/res/MatchingResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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() {
Expand All @@ -37,5 +35,6 @@ public MatchingResponseDto() {
this.walkerName = null;
this.walkerProfile = null;
this.walkMatchingStatus = null;
this.boardId = null;
}
}
8 changes: 5 additions & 3 deletions src/main/java/org/jullaene/walkmong_back/api/board/rest/BoardController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -73,11 +74,12 @@ public ResponseEntity<BasicResponse<GeoRes>> getCurrentGeo (@PathVariable("board
/**
* 산책 완료
* */
@PatchMapping("/walk/complete/{boardId}")
@PatchMapping("/walk/status/{boardId}")
public ResponseEntity<BasicResponse<String>> 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)));
}

}
6 changes: 3 additions & 3 deletions src/main/java/org/jullaene/walkmong_back/api/board/service/BoardService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -243,7 +243,7 @@ public String completeWalking(Long boardId) {
}
log.info("반려인 또는 산책자 인증 완료");

board.updateWalkingStatus(WalkingStatus.AFTER);
board.updateWalkingStatus(walkingStatus);

return "SUCCESS";
}
Expand Down
Loading