diff --git a/src/main/java/com/dnd/dndtravel/auth/controller/AuthController.java b/src/main/java/com/dnd/dndtravel/auth/controller/AuthController.java index 78b0ba9..68adab6 100644 --- a/src/main/java/com/dnd/dndtravel/auth/controller/AuthController.java +++ b/src/main/java/com/dnd/dndtravel/auth/controller/AuthController.java @@ -39,6 +39,6 @@ public void withdraw( @RequestBody @Valid AppleWithdrawRequest withdrawRequest, AuthenticationMember authenticationMember ) { - authService.processAppleRevoke(withdrawRequest.refreshToken(), authenticationMember.id()); + authService.processAppleRevoke(withdrawRequest.appleRefreshToken(), authenticationMember.id()); } } \ No newline at end of file diff --git a/src/main/java/com/dnd/dndtravel/auth/controller/request/AppleWithdrawRequest.java b/src/main/java/com/dnd/dndtravel/auth/controller/request/AppleWithdrawRequest.java index 7c3cfa7..440b1bd 100644 --- a/src/main/java/com/dnd/dndtravel/auth/controller/request/AppleWithdrawRequest.java +++ b/src/main/java/com/dnd/dndtravel/auth/controller/request/AppleWithdrawRequest.java @@ -10,6 +10,6 @@ public record AppleWithdrawRequest( @Schema(description = "애플 refreshToken", requiredMode = REQUIRED) @NotBlank(message = "refreshToken은 필수 입니다.") @Size(max = 300, message = "refreshToken 형식이 아닙니다.") - String refreshToken + String appleRefreshToken ) { } diff --git a/src/main/java/com/dnd/dndtravel/map/controller/swagger/MapControllerSwagger.java b/src/main/java/com/dnd/dndtravel/map/controller/swagger/MapControllerSwagger.java index 3532351..8fd4ba2 100644 --- a/src/main/java/com/dnd/dndtravel/map/controller/swagger/MapControllerSwagger.java +++ b/src/main/java/com/dnd/dndtravel/map/controller/swagger/MapControllerSwagger.java @@ -4,11 +4,14 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; import com.dnd.dndtravel.config.AuthenticationMember; import com.dnd.dndtravel.map.controller.request.RecordRequest; import com.dnd.dndtravel.map.controller.request.UpdateRecordRequest; +import com.dnd.dndtravel.map.controller.request.validation.PhotoValidation; import com.dnd.dndtravel.map.service.dto.response.AttractionRecordResponse; import com.dnd.dndtravel.map.service.dto.response.AttractionRecordsResponse; import com.dnd.dndtravel.map.service.dto.response.RegionResponse; @@ -64,9 +67,14 @@ RegionResponse map( }) @AuthenticationCommonResponse void memo( - @Parameter(hidden = true) AuthenticationMember authenticationMember, - @Parameter(description = "사진", schema = @Schema(type = "array", format = "binary")) List photos, - @Parameter(description = "기록 요청 정보", required = true) RecordRequest recordRequest + @Parameter(hidden = true) + AuthenticationMember authenticationMember, + @Parameter(description = "사진", schema = @Schema(type = "array", format = "binary")) + @PhotoValidation @RequestPart(value = "photos", required = false) + List photos, + @Parameter(description = "기록 요청 정보", required = true) + @RequestPart("recordRequest") + RecordRequest recordRequest ); @Operation( @@ -87,8 +95,10 @@ AttractionRecordsResponse findRecords( @Parameter(hidden = true) AuthenticationMember authenticationMember, @Parameter(description = "게시글의 ID값, 0 혹은 미입력시 가장최신 페이지 조회", example = "이전요청의 마지막 게시글ID가 7인경우 7로 요청시 다음 페이지 게시글 조회") + @RequestParam(defaultValue = "0") long cursorNo, @Parameter(description = "페이지당 조회할 게시글 개수, 미입력시 10으로 지정") + @RequestParam(defaultValue = "10") int displayPerPage ); @@ -110,8 +120,10 @@ void updateRecord( @Parameter(description = "방문기록 id값", required = true) long recordId, @Parameter(description = "수정요청한 사진", required = false) + @PhotoValidation @RequestPart(value = "photos", required = false) List photos, @Parameter(description = "수정요청 값", required = true) + @RequestPart("updateRecordRequest") UpdateRecordRequest updateRecordRequest );