fix: "현재 비밀번호 검증하는 API 수정"

to-be-healthy · May 28, 2024 · 1684ce7 · 1684ce7
1 parent 8c0ce57
commit 1684ce7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/src/main/java/com/tobe/healthy/member/application/MemberService.java b/src/main/java/com/tobe/healthy/member/application/MemberService.java
@@ -37,10 +37,15 @@ public TrainerMappingResult getTrainerMapping(Member member) {
         return new TrainerMappingResult(mapping != null);
     }
 
-    public Long validateCurrentPassword(ValidateCurrentPassword request, Long memberId) {
-        return memberRepository.findById(memberId)
-            .filter(member -> passwordEncoder.matches(request.getPassword(), member.getPassword()))
-            .map(Member::getId)
-            .orElseThrow(() -> new CustomException(MEMBER_NOT_FOUND));
+    public Boolean validateCurrentPassword(ValidateCurrentPassword request, Long memberId) {
+        memberRepository.findById(memberId).ifPresentOrElse(
+            m -> {
+                if (!passwordEncoder.matches(request.getPassword(), m.getPassword())) {
+                    throw new IllegalArgumentException("비밀번호가 일치하지 않습니다.");
+                }
+            }, () -> {
+                throw new CustomException(MEMBER_NOT_FOUND);
+            });
+        return true;
     }
 }
diff --git a/src/main/java/com/tobe/healthy/member/presentation/MemberController.java b/src/main/java/com/tobe/healthy/member/presentation/MemberController.java
@@ -218,9 +218,9 @@ public ResponseHandler<TrainerMappingResult> getTrainerMapping(@AuthenticationPr
 			@ApiResponse(responseCode = "200", description = "현재 비밀번호가 확인되었습니다.")
 		})
 	@PostMapping("/password")
-	public ResponseHandler<Long> validateCurrentPassword(@RequestBody ValidateCurrentPassword request,
-														 @AuthenticationPrincipal CustomMemberDetails member) {
-		return ResponseHandler.<Long>builder()
+	public ResponseHandler<Boolean> validateCurrentPassword(@RequestBody ValidateCurrentPassword request,
+														 	@AuthenticationPrincipal CustomMemberDetails member) {
+		return ResponseHandler.<Boolean>builder()
 			.data(memberService.validateCurrentPassword(request, member.getMemberId()))
 			.message("비밀번호가 확인되었습니다.")
 			.build();

diff --git a/...in/com/tobe/healthy/lessonhistory/domain/dto/out/RetrieveLessonHistoryByDateCondResult.kt b/...in/com/tobe/healthy/lessonhistory/domain/dto/out/RetrieveLessonHistoryByDateCondResult.kt
@@ -72,13 +72,9 @@ data class RetrieveLessonHistoryByDateCondResult(
         }
     }
 
-    @Schema(description = "수업 일지 첨부파일")
     data class LessonHistoryFileResults(
-        @Schema(description = "첨부한 파일 URL(AWS S3)", example = "https://~~~")
         val fileUrl: String,
-        @Schema(description = "첨부한 파일 순서", example = "0")
         val fileOrder: Int,
-        @Schema(description = "파일 등록 날짜", example = "2024-04-10 13:00:12")
         val createdAt: LocalDateTime,
     ) {
         companion object {

diff --git a/...main/kotlin/com/tobe/healthy/schedule/repository/trainer/TrainerScheduleRepositoryImpl.kt b/...main/kotlin/com/tobe/healthy/schedule/repository/trainer/TrainerScheduleRepositoryImpl.kt
@@ -111,7 +111,10 @@ class TrainerScheduleRepositoryImpl(
                 reservationStatusEq(COMPLETED),
                 delYnEq(false)
             )
-            .orderBy(schedule.lessonDt.asc(), schedule.lessonStartTime.asc())
+            .orderBy(
+                schedule.lessonDt.asc(),
+                schedule.lessonStartTime.asc()
+            )
             .fetch()
 
         val scheduleCount = queryFactory
@@ -144,7 +147,6 @@ class TrainerScheduleRepositoryImpl(
                 }
             }
             return trainerTodaySchedule
-
         }
     }