diff --git a/src/main/java/com/tobe/healthy/member/presentation/MemberAuthController.java b/src/main/java/com/tobe/healthy/member/presentation/MemberAuthController.java index 62bd9864..b0785092 100644 --- a/src/main/java/com/tobe/healthy/member/presentation/MemberAuthController.java +++ b/src/main/java/com/tobe/healthy/member/presentation/MemberAuthController.java @@ -30,7 +30,7 @@ public class MemberAuthController { @ApiResponse(responseCode = "200", description = "사용 가능한 아이디입니다.") }) @GetMapping("/validation/user-id") - public ResponseHandler validateUsernameDuplication(@RequestParam(name = "userId") String userId) { + public ResponseHandler validateUsernameDuplication(@RequestParam String userId) { return ResponseHandler.builder() .data(memberAuthService.validateUserIdDuplication(userId)) .message("사용할 수 있는 아이디입니다.") diff --git a/src/main/java/com/tobe/healthy/member/presentation/MemberCommandController.java b/src/main/java/com/tobe/healthy/member/presentation/MemberCommandController.java index 6179113f..cbf49e16 100644 --- a/src/main/java/com/tobe/healthy/member/presentation/MemberCommandController.java +++ b/src/main/java/com/tobe/healthy/member/presentation/MemberCommandController.java @@ -12,7 +12,6 @@ import com.tobe.healthy.member.domain.entity.AlarmStatus; import com.tobe.healthy.member.domain.entity.AlarmType; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -95,7 +94,7 @@ public ResponseHandler changeProfile(@AuthenticationP @ApiResponse(responseCode = "200", description = "이름이 변경되었습니다.") }) @PatchMapping("/name") - public ResponseHandler changeName(@Parameter(description = "변경할 이름", example = "홍길동") @RequestParam String name, + public ResponseHandler changeName(@RequestParam String name, @AuthenticationPrincipal CustomMemberDetails member) { return ResponseHandler.builder() .data(memberCommandService.changeName(name, member.getMemberId())) @@ -139,7 +138,7 @@ public ResponseHandler updateMemo(@AuthenticationPrincipal CustomMemberDet @PostMapping("/nickname/{studentId}") @PreAuthorize("hasAuthority('ROLE_TRAINER')") public ResponseHandler assignNickname(@PathVariable Long studentId, - @Parameter(description = "등록할 닉네임", example = "홍박사") @RequestParam String nickname) { + @RequestParam String nickname) { return ResponseHandler.builder() .data(memberCommandService.assignNickname(nickname, studentId)) .message("닉네임을 지정하였습니다.") @@ -165,8 +164,7 @@ public ResponseHandler changeEmail(@RequestBody @Valid CommandChangeEma @ApiResponse(responseCode = "200", description = "스케줄 공지 보기 여부가 변경되었습니다.") }) @PatchMapping("/schedule-notice") - public ResponseHandler changeScheduleNotice(@Parameter(description = "변경할 상태", example = "ENABLED") - @RequestParam AlarmStatus alarmStatus, + public ResponseHandler changeScheduleNotice(@RequestParam AlarmStatus alarmStatus, @AuthenticationPrincipal CustomMemberDetails member) { return ResponseHandler.builder() .data(memberCommandService.changeScheduleNotice(alarmStatus, member.getMemberId())) diff --git a/src/main/java/com/tobe/healthy/member/presentation/MemberController.java b/src/main/java/com/tobe/healthy/member/presentation/MemberController.java index 4435749b..23bf640e 100644 --- a/src/main/java/com/tobe/healthy/member/presentation/MemberController.java +++ b/src/main/java/com/tobe/healthy/member/presentation/MemberController.java @@ -16,14 +16,12 @@ import com.tobe.healthy.workout.application.WorkoutHistoryService; import com.tobe.healthy.workout.domain.dto.out.WorkoutHistoryDto; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; -import org.springframework.data.repository.query.Param; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @@ -59,8 +57,7 @@ public ResponseHandler getMemberInfo(@AuthenticationPrincipal @ApiResponse(responseCode = "200", description = "회원 정보가 조회되었습니다.") }) @GetMapping("/{memberId}") - public ResponseHandler getMemberInfo(@Parameter(description = "조회할 회원 아이디", example = "1") - @PathVariable("memberId") Long memberId) { + public ResponseHandler getMemberInfo(@PathVariable Long memberId) { return ResponseHandler.builder() .data(memberService.getMemberInfo(memberId)) .message("회원정보가 조회 되었습니다.") @@ -75,9 +72,9 @@ public ResponseHandler getMemberInfo(@Parameter(description = @ApiResponse(responseCode = "200", description = "운동기록, 페이징을 반환한다.") }) @GetMapping("/me/workout-histories") - public ResponseHandler> getWorkoutHistory(@AuthenticationPrincipal CustomMemberDetails loginMember, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, - Pageable pageable) { + public ResponseHandler> getWorkoutHistory(String searchDate, + Pageable pageable, + @AuthenticationPrincipal CustomMemberDetails loginMember) { return ResponseHandler.>builder() .data(workoutService.getWorkoutHistory(loginMember.getMember(), loginMember.getMemberId(), pageable, searchDate)) .message("운동기록이 조회되었습니다.") @@ -89,10 +86,7 @@ public ResponseHandler> getWorkoutHistory(@Authe @ApiResponse(responseCode = "200", description = "운동기록, 페이징을 반환한다.") }) @GetMapping("/{memberId}/workout-histories") - public ResponseHandler> getWorkoutHistory(@AuthenticationPrincipal CustomMemberDetails loginMember, - @Parameter(description = "학생 ID", example = "1") @PathVariable("memberId") Long memberId, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, - Pageable pageable) { + public ResponseHandler> getWorkoutHistory(@PathVariable Long memberId, String searchDate, Pageable pageable, @AuthenticationPrincipal CustomMemberDetails loginMember) { return ResponseHandler.>builder() .data(workoutService.getWorkoutHistory(loginMember.getMember(), memberId, pageable, searchDate)) .message("운동기록이 조회되었습니다.") @@ -111,9 +105,9 @@ public ResponseHandler> getWorkoutHistory(@Authe @ApiResponse(responseCode = "200", description = "식단기록, 페이징을 반환한다.") }) @GetMapping("/me/diets") - public ResponseHandler> getDiet(@AuthenticationPrincipal CustomMemberDetails loginMember, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, - Pageable pageable) { + public ResponseHandler> getDiet(String searchDate, + Pageable pageable, + @AuthenticationPrincipal CustomMemberDetails loginMember) { return ResponseHandler.>builder() .data(dietService.getDiet(loginMember.getMemberId(), pageable, searchDate)) .message("식단기록 조회되었습니다.") @@ -125,8 +119,8 @@ public ResponseHandler> getDiet(@AuthenticationPrincipal C @ApiResponse(responseCode = "200", description = "식단기록, 페이징을 반환한다.") }) @GetMapping("/{memberId}/diets") - public ResponseHandler> getDiet(@Parameter(description = "학생 ID", example = "1") @PathVariable("memberId") Long memberId, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, + public ResponseHandler> getDiet(@PathVariable Long memberId, + String searchDate, Pageable pageable) { return ResponseHandler.>builder() .data(dietService.getDiet(memberId, pageable, searchDate)) @@ -139,9 +133,9 @@ public ResponseHandler> getDiet(@Parameter(description = " @ApiResponse(responseCode = "200", description = "식단기록, 페이징을 반환한다.") }) @GetMapping("/my-trainer/diets") - public ResponseHandler> getDietMyTrainer(@AuthenticationPrincipal CustomMemberDetails loginMember, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, - Pageable pageable) { + public ResponseHandler> getDietMyTrainer(String searchDate, + Pageable pageable, + @AuthenticationPrincipal CustomMemberDetails loginMember) { return ResponseHandler.>builder() .data(dietService.getDietMyTrainer(loginMember.getMemberId(), pageable, searchDate)) .message("식단기록 조회되었습니다.") @@ -156,9 +150,9 @@ public ResponseHandler> getDietMyTrainer(@AuthenticationPr @ApiResponse(responseCode = "200", description = "수강권 정보를 반환한다.") }) @GetMapping("/course") - public ResponseHandler getMyCourse(@AuthenticationPrincipal CustomMemberDetails customMemberDetails, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, - Pageable pageable) { + public ResponseHandler getMyCourse(String searchDate, + Pageable pageable, + @AuthenticationPrincipal CustomMemberDetails customMemberDetails) { return ResponseHandler.builder() .data(courseService.getCourse(customMemberDetails.getMember(), pageable, customMemberDetails.getMemberId(), searchDate)) .message("수강권이 조회되었습니다.") @@ -171,10 +165,10 @@ public ResponseHandler getMyCourse(@AuthenticationPrincipal Cus }) @GetMapping("/{memberId}/course") @PreAuthorize("hasAuthority('ROLE_TRAINER')") - public ResponseHandler getCourse(@Parameter(description = "학생 ID") @PathVariable("memberId") Long memberId, - @AuthenticationPrincipal CustomMemberDetails customMemberDetails, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, - Pageable pageable) { + public ResponseHandler getCourse(@PathVariable Long memberId, + String searchDate, + Pageable pageable, + @AuthenticationPrincipal CustomMemberDetails customMemberDetails) { return ResponseHandler.builder() .data(courseService.getCourse(customMemberDetails.getMember(), pageable, memberId, searchDate)) .message("수강권이 조회되었습니다.") @@ -186,9 +180,7 @@ public ResponseHandler getCourse(@Parameter(description = "학 @ApiResponse(responseCode = "200", description = "포인트 및 히스토리를 반환한다.") }) @GetMapping("/point") - public ResponseHandler getMyPoint(@AuthenticationPrincipal CustomMemberDetails customMemberDetails, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, - Pageable pageable) { + public ResponseHandler getMyPoint(@AuthenticationPrincipal CustomMemberDetails customMemberDetails, String searchDate, Pageable pageable) { return ResponseHandler.builder() .data(pointService.getPoint(customMemberDetails.getMember().getId(), searchDate, pageable)) .message("포인트가 조회되었습니다.") @@ -201,9 +193,7 @@ public ResponseHandler getMyPoint(@AuthenticationPrincipal CustomMembe }) @GetMapping("/{memberId}/point") @PreAuthorize("hasAuthority('ROLE_TRAINER')") - public ResponseHandler getPoint(@Parameter(description = "학생 ID") @PathVariable("memberId") Long memberId, - @Parameter(description = "조회할 날짜", example = "2024-12") @Param("searchDate") String searchDate, - Pageable pageable) { + public ResponseHandler getPoint(@PathVariable Long memberId, String searchDate, Pageable pageable) { return ResponseHandler.builder() .data(pointService.getPoint(memberId, searchDate, pageable)) .message("포인트가 조회되었습니다.") @@ -228,7 +218,8 @@ public ResponseHandler getTrainerMapping(@AuthenticationPr @ApiResponse(responseCode = "200", description = "현재 비밀번호가 확인되었습니다.") }) @PostMapping("/password") - public ResponseHandler validateCurrentPassword(@RequestBody ValidateCurrentPassword request, @AuthenticationPrincipal CustomMemberDetails member) { + public ResponseHandler validateCurrentPassword(@RequestBody ValidateCurrentPassword request, + @AuthenticationPrincipal CustomMemberDetails member) { return ResponseHandler.builder() .data(memberService.validateCurrentPassword(request, member.getMemberId())) .message("비밀번호가 확인되었습니다.") diff --git a/src/main/kotlin/com/tobe/healthy/lessonhistory/presentation/LessonHistoryController.kt b/src/main/kotlin/com/tobe/healthy/lessonhistory/presentation/LessonHistoryController.kt index b0664707..039ccaca 100644 --- a/src/main/kotlin/com/tobe/healthy/lessonhistory/presentation/LessonHistoryController.kt +++ b/src/main/kotlin/com/tobe/healthy/lessonhistory/presentation/LessonHistoryController.kt @@ -50,7 +50,7 @@ class LessonHistoryController( ]) @GetMapping("/detail/{studentId}") @PreAuthorize("hasAuthority('ROLE_TRAINER')") - fun findAllLessonHistoryByMemberId(@Parameter(description = "학생 ID", example = "1") @PathVariable studentId: Long, + fun findAllLessonHistoryByMemberId(@PathVariable studentId: Long, @Parameter(content = [Content(schema = Schema(implementation = RetrieveLessonHistoryByDateCond::class))]) request: RetrieveLessonHistoryByDateCond, @ParameterObject pageable: Pageable): ApiResultResponse> { return ApiResultResponse(