JaS-JavaStudy · p990805 · Dec 28, 2024
diff --git a/jascoffee/src/main/java/com/jascoffee/jascoffee/dto/user/PasswordUpdateDTO.java b/jascoffee/src/main/java/com/jascoffee/jascoffee/dto/user/PasswordUpdateDTO.java
@@ -6,4 +6,5 @@
 public class PasswordUpdateDTO {
     private String currentPassword;
     private String newPassword;
+    private String confirmPassword;
 }
diff --git a/jascoffee/src/main/java/com/jascoffee/jascoffee/service/user/UserService.java b/jascoffee/src/main/java/com/jascoffee/jascoffee/service/user/UserService.java
@@ -106,6 +106,15 @@ public void updatePassword(PasswordUpdateDTO request) {
             throw new IllegalArgumentException("기존 비밀번호가 일치하지 않습니다.");
         }
 
+        if(!request.getNewPassword().equals(request.getConfirmPassword())) {
+            System.out.println(request.getNewPassword() + " " + request.getConfirmPassword());
+            throw new IllegalArgumentException("새 비밀번호와 확인용 비밀번호가 일치하지 않습니다.");
+        }
+
+        if(request.getNewPassword().length() <8){
+            throw new IllegalArgumentException("8자리 이상의 비밀번호를 설정해주세요.");
+        }
+
         user.setPassword(passwordEncoder.encode(request.getNewPassword()));
         userRepository.save(user);
     }

diff --git a/jascoffee/uploads/images/HOT 고구마라떼.jpg b/jascoffee/uploads/images/HOT 고구마라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 곡물라떼.jpg b/jascoffee/uploads/images/HOT 곡물라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 그린티라떼.jpg b/jascoffee/uploads/images/HOT 그린티라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 더블초코라떼.jpg b/jascoffee/uploads/images/HOT 더블초코라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 더치라떼.jpg b/jascoffee/uploads/images/HOT 더치라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 더치커피.jpg b/jascoffee/uploads/images/HOT 더치커피.jpg
diff --git a/jascoffee/uploads/images/HOT 돌체라떼.jpg b/jascoffee/uploads/images/HOT 돌체라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 디카페인 더치라떼.jpg b/jascoffee/uploads/images/HOT 디카페인 더치라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 디카페인 더치커피.jpg b/jascoffee/uploads/images/HOT 디카페인 더치커피.jpg
diff --git a/jascoffee/uploads/images/HOT 디카페인 아메리카노.jpg b/jascoffee/uploads/images/HOT 디카페인 아메리카노.jpg
diff --git a/jascoffee/uploads/images/HOT 레몬티.jpg b/jascoffee/uploads/images/HOT 레몬티.jpg
diff --git a/jascoffee/uploads/images/HOT 로즈마리.jpg b/jascoffee/uploads/images/HOT 로즈마리.jpg
diff --git a/jascoffee/uploads/images/HOT 민트초코오레오라떼.jpg b/jascoffee/uploads/images/HOT 민트초코오레오라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 밀크티.jpg b/jascoffee/uploads/images/HOT 밀크티.jpg
diff --git a/jascoffee/uploads/images/HOT 바닐라라떼.jpg b/jascoffee/uploads/images/HOT 바닐라라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 블랙퍼스트.jpg b/jascoffee/uploads/images/HOT 블랙퍼스트.jpg
diff --git a/jascoffee/uploads/images/HOT 생딸기 레몬글라스티.jpg b/jascoffee/uploads/images/HOT 생딸기 레몬글라스티.jpg
diff --git a/jascoffee/uploads/images/HOT 아메리카노.jpg b/jascoffee/uploads/images/HOT 아메리카노.jpg
diff --git a/jascoffee/uploads/images/HOT 아이스티.jpg b/jascoffee/uploads/images/HOT 아이스티.jpg
diff --git a/jascoffee/uploads/images/HOT 얼그레이.jpg b/jascoffee/uploads/images/HOT 얼그레이.jpg
diff --git a/jascoffee/uploads/images/HOT 유자티.jpg b/jascoffee/uploads/images/HOT 유자티.jpg
diff --git a/jascoffee/uploads/images/HOT 자몽티.jpg b/jascoffee/uploads/images/HOT 자몽티.jpg
diff --git a/jascoffee/uploads/images/HOT 자몽허니블랙티.jpg b/jascoffee/uploads/images/HOT 자몽허니블랙티.jpg
diff --git a/jascoffee/uploads/images/HOT 카라멜마끼아또.jpg b/jascoffee/uploads/images/HOT 카라멜마끼아또.jpg
diff --git a/jascoffee/uploads/images/HOT 카페라떼.jpg b/jascoffee/uploads/images/HOT 카페라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 카페모카.jpg b/jascoffee/uploads/images/HOT 카페모카.jpg
diff --git a/jascoffee/uploads/images/HOT 캐모마일.jpg b/jascoffee/uploads/images/HOT 캐모마일.jpg
diff --git a/jascoffee/uploads/images/HOT 쿠키초코라떼.jpg b/jascoffee/uploads/images/HOT 쿠키초코라떼.jpg
diff --git a/jascoffee/uploads/images/HOT 페퍼민트.jpg b/jascoffee/uploads/images/HOT 페퍼민트.jpg
diff --git a/jascoffee/uploads/images/HOT 헤이즐넛라떼.jpg b/jascoffee/uploads/images/HOT 헤이즐넛라떼.jpg
diff --git a/jascoffee/uploads/images/고구마라떼.jpg b/jascoffee/uploads/images/고구마라떼.jpg
diff --git a/jascoffee/uploads/images/곡물라떼.jpg b/jascoffee/uploads/images/곡물라떼.jpg
diff --git a/jascoffee/uploads/images/국산 감자빵.jpg b/jascoffee/uploads/images/국산 감자빵.jpg
diff --git a/jascoffee/uploads/images/국산 고구마빵.jpg b/jascoffee/uploads/images/국산 고구마빵.jpg
diff --git a/jascoffee/uploads/images/그린티라떼.jpg b/jascoffee/uploads/images/그린티라떼.jpg
diff --git a/jascoffee/uploads/images/그린티프라페.jpg b/jascoffee/uploads/images/그린티프라페.jpg
diff --git a/jascoffee/uploads/images/까망베르치즈 단백질쿠키.jpg b/jascoffee/uploads/images/까망베르치즈 단백질쿠키.jpg
diff --git a/jascoffee/uploads/images/달고나 녹차초콜릿.jpg b/jascoffee/uploads/images/달고나 녹차초콜릿.jpg
diff --git a/jascoffee/uploads/images/달고나 다크초콜릿.jpg b/jascoffee/uploads/images/달고나 다크초콜릿.jpg
diff --git a/jascoffee/uploads/images/달고나라떼.jpg b/jascoffee/uploads/images/달고나라떼.jpg
diff --git a/jascoffee/uploads/images/더블샷카라멜팝콘.jpg b/jascoffee/uploads/images/더블샷카라멜팝콘.jpg
diff --git a/jascoffee/uploads/images/더블초코라떼.jpg b/jascoffee/uploads/images/더블초코라떼.jpg
diff --git a/jascoffee/uploads/images/더치라떼.jpg b/jascoffee/uploads/images/더치라떼.jpg
diff --git a/jascoffee/uploads/images/더치커피.jpg b/jascoffee/uploads/images/더치커피.jpg
diff --git a/jascoffee/uploads/images/돌체라떼.jpg b/jascoffee/uploads/images/돌체라떼.jpg
diff --git a/jascoffee/uploads/images/디카페인 더치라떼.jpg b/jascoffee/uploads/images/디카페인 더치라떼.jpg
diff --git a/jascoffee/uploads/images/디카페인 더치커피.jpg b/jascoffee/uploads/images/디카페인 더치커피.jpg
diff --git a/jascoffee/uploads/images/디카페인 아메리카노.jpg b/jascoffee/uploads/images/디카페인 아메리카노.jpg
diff --git a/jascoffee/uploads/images/딸기라떼.jpg b/jascoffee/uploads/images/딸기라떼.jpg
diff --git a/jascoffee/uploads/images/딸기스무디.jpg b/jascoffee/uploads/images/딸기스무디.jpg
diff --git a/jascoffee/uploads/images/딸기요거트스무디.jpg b/jascoffee/uploads/images/딸기요거트스무디.jpg
diff --git a/jascoffee/uploads/images/레몬에이드.jpg b/jascoffee/uploads/images/레몬에이드.jpg
diff --git a/jascoffee/uploads/images/레몬티.jpg b/jascoffee/uploads/images/레몬티.jpg
diff --git a/jascoffee/uploads/images/로즈마리.jpg b/jascoffee/uploads/images/로즈마리.jpg
diff --git a/jascoffee/uploads/images/리얼초코자바칩프라페.jpg b/jascoffee/uploads/images/리얼초코자바칩프라페.jpg
diff --git a/jascoffee/uploads/images/망고라떼.jpg b/jascoffee/uploads/images/망고라떼.jpg
diff --git a/jascoffee/uploads/images/망고스무디.jpg b/jascoffee/uploads/images/망고스무디.jpg
diff --git a/jascoffee/uploads/images/망고에이드.jpg b/jascoffee/uploads/images/망고에이드.jpg
diff --git a/jascoffee/uploads/images/망고요거트스무디.jpg b/jascoffee/uploads/images/망고요거트스무디.jpg
diff --git a/jascoffee/uploads/images/메이플 크룽지.jpg b/jascoffee/uploads/images/메이플 크룽지.jpg
diff --git a/jascoffee/uploads/images/모카마카롱.jpg b/jascoffee/uploads/images/모카마카롱.jpg
diff --git a/jascoffee/uploads/images/모카자바칩프라페.jpg b/jascoffee/uploads/images/모카자바칩프라페.jpg
diff --git a/jascoffee/uploads/images/민트초코오레오라떼.jpg b/jascoffee/uploads/images/민트초코오레오라떼.jpg
diff --git a/jascoffee/uploads/images/민트초코오레오프라페.jpg b/jascoffee/uploads/images/민트초코오레오프라페.jpg
diff --git a/jascoffee/uploads/images/밀크티.jpg b/jascoffee/uploads/images/밀크티.jpg
diff --git a/jascoffee/uploads/images/바닐라라떼.jpg b/jascoffee/uploads/images/바닐라라떼.jpg
diff --git a/jascoffee/uploads/images/바닐라마카롱.jpg b/jascoffee/uploads/images/바닐라마카롱.jpg
diff --git a/jascoffee/uploads/images/복숭아주스.jpg b/jascoffee/uploads/images/복숭아주스.jpg
diff --git a/jascoffee/uploads/images/붕어딕만스쿠키.jpg b/jascoffee/uploads/images/붕어딕만스쿠키.jpg
diff --git a/jascoffee/uploads/images/브리틀 밀크초콜릿.jpg b/jascoffee/uploads/images/브리틀 밀크초콜릿.jpg
diff --git a/jascoffee/uploads/images/블랙퍼스트.jpg b/jascoffee/uploads/images/블랙퍼스트.jpg
diff --git a/jascoffee/uploads/images/블루레몬스페셜에이드.jpg b/jascoffee/uploads/images/블루레몬스페셜에이드.jpg
diff --git a/jascoffee/uploads/images/블루베리 마카롱.jpg b/jascoffee/uploads/images/블루베리 마카롱.jpg
diff --git a/jascoffee/uploads/images/블루베리라떼.jpg b/jascoffee/uploads/images/블루베리라떼.jpg
diff --git a/jascoffee/uploads/images/블루베리스무디.jpg b/jascoffee/uploads/images/블루베리스무디.jpg
diff --git a/jascoffee/uploads/images/블루베리요거트스무디.jpg b/jascoffee/uploads/images/블루베리요거트스무디.jpg
diff --git a/jascoffee/uploads/images/빅포즈 아망추.jpg b/jascoffee/uploads/images/빅포즈 아망추.jpg
diff --git a/jascoffee/uploads/images/빅포즈 아메리카노.jpg b/jascoffee/uploads/images/빅포즈 아메리카노.jpg
diff --git a/jascoffee/uploads/images/빅포즈 아샷추.jpg b/jascoffee/uploads/images/빅포즈 아샷추.jpg
diff --git a/jascoffee/uploads/images/빅포즈 아이스티.jpg b/jascoffee/uploads/images/빅포즈 아이스티.jpg
diff --git a/jascoffee/uploads/images/사과생크림와플.jpg b/jascoffee/uploads/images/사과생크림와플.jpg
diff --git a/jascoffee/uploads/images/산딸기마카롱.jpg b/jascoffee/uploads/images/산딸기마카롱.jpg
diff --git a/jascoffee/uploads/images/생딸기 가나슈 라떼.jpg b/jascoffee/uploads/images/생딸기 가나슈 라떼.jpg
diff --git a/jascoffee/uploads/images/생딸기 레몬글라스티.jpg b/jascoffee/uploads/images/생딸기 레몬글라스티.jpg
diff --git a/jascoffee/uploads/images/생딸기 망고 아이스티.jpg b/jascoffee/uploads/images/생딸기 망고 아이스티.jpg
diff --git a/jascoffee/uploads/images/생딸기모찌밀크쉐이크.jpg b/jascoffee/uploads/images/생딸기모찌밀크쉐이크.jpg
diff --git a/jascoffee/uploads/images/생딸기주스.jpg b/jascoffee/uploads/images/생딸기주스.jpg
diff --git a/jascoffee/uploads/images/샤인머스캣케일주스.jpg b/jascoffee/uploads/images/샤인머스캣케일주스.jpg
diff --git a/jascoffee/uploads/images/시나몬 크룽지.jpg b/jascoffee/uploads/images/시나몬 크룽지.jpg
diff --git a/jascoffee/uploads/images/시나몬카라멜와플.jpg b/jascoffee/uploads/images/시나몬카라멜와플.jpg
diff --git a/jascoffee/uploads/images/아망추.jpg b/jascoffee/uploads/images/아망추.jpg
diff --git a/jascoffee/uploads/images/아메리카노.jpg b/jascoffee/uploads/images/아메리카노.jpg
diff --git a/jascoffee/uploads/images/아샷추.jpg b/jascoffee/uploads/images/아샷추.jpg
diff --git a/jascoffee/uploads/images/아이스티.jpg b/jascoffee/uploads/images/아이스티.jpg
diff --git a/jascoffee/uploads/images/아인슈페너.jpg b/jascoffee/uploads/images/아인슈페너.jpg
diff --git a/jascoffee/uploads/images/아인슈페너라떼.jpg b/jascoffee/uploads/images/아인슈페너라떼.jpg
diff --git a/jascoffee/uploads/images/얼그레이.jpg b/jascoffee/uploads/images/얼그레이.jpg
diff --git a/jascoffee/uploads/images/에스프레소.jpg b/jascoffee/uploads/images/에스프레소.jpg
diff --git a/jascoffee/uploads/images/오레오생크림와플.jpg b/jascoffee/uploads/images/오레오생크림와플.jpg
diff --git a/jascoffee/uploads/images/오렌지당근주스.jpg b/jascoffee/uploads/images/오렌지당근주스.jpg
diff --git a/jascoffee/uploads/images/오트밀 생크림 롤케이크.jpg b/jascoffee/uploads/images/오트밀 생크림 롤케이크.jpg
diff --git a/jascoffee/uploads/images/유자스무디.jpg b/jascoffee/uploads/images/유자스무디.jpg
diff --git a/jascoffee/uploads/images/유자에이드.jpg b/jascoffee/uploads/images/유자에이드.jpg
diff --git a/jascoffee/uploads/images/유자티.jpg b/jascoffee/uploads/images/유자티.jpg
diff --git a/jascoffee/uploads/images/자몽에이드.jpg b/jascoffee/uploads/images/자몽에이드.jpg
diff --git a/jascoffee/uploads/images/자몽티.jpg b/jascoffee/uploads/images/자몽티.jpg
diff --git a/jascoffee/uploads/images/자몽허니블랙티.jpg b/jascoffee/uploads/images/자몽허니블랙티.jpg
diff --git a/jascoffee/uploads/images/청포도스페셜에이드.jpg b/jascoffee/uploads/images/청포도스페셜에이드.jpg
diff --git a/jascoffee/uploads/images/체다치즈 단백질쿠키.jpg b/jascoffee/uploads/images/체다치즈 단백질쿠키.jpg
diff --git a/jascoffee/uploads/images/초코 생크림 롤케이크.jpg b/jascoffee/uploads/images/초코 생크림 롤케이크.jpg
diff --git a/jascoffee/uploads/images/초코마카롱.jpg b/jascoffee/uploads/images/초코마카롱.jpg
diff --git a/jascoffee/uploads/images/카라멜마끼아또.jpg b/jascoffee/uploads/images/카라멜마끼아또.jpg
diff --git a/jascoffee/uploads/images/카라멜마카롱.jpg b/jascoffee/uploads/images/카라멜마카롱.jpg
diff --git a/jascoffee/uploads/images/카라멜쿠키 크루아상와플.jpg b/jascoffee/uploads/images/카라멜쿠키 크루아상와플.jpg
diff --git a/jascoffee/uploads/images/카페라떼.jpg b/jascoffee/uploads/images/카페라떼.jpg
diff --git a/jascoffee/uploads/images/카페모카.jpg b/jascoffee/uploads/images/카페모카.jpg
diff --git a/jascoffee/uploads/images/카푸치노.jpg b/jascoffee/uploads/images/카푸치노.jpg
diff --git a/jascoffee/uploads/images/캐모마일.jpg b/jascoffee/uploads/images/캐모마일.jpg
diff --git a/jascoffee/uploads/images/캔디소다밀크쉐이크.jpg b/jascoffee/uploads/images/캔디소다밀크쉐이크.jpg
diff --git a/jascoffee/uploads/images/커피밀크쉐이크.jpg b/jascoffee/uploads/images/커피밀크쉐이크.jpg
diff --git a/jascoffee/uploads/images/콘소메수프맛팝콘.jpg b/jascoffee/uploads/images/콘소메수프맛팝콘.jpg
diff --git a/jascoffee/uploads/images/쿠키밀크쉐이크.jpg b/jascoffee/uploads/images/쿠키밀크쉐이크.jpg
diff --git a/jascoffee/uploads/images/쿠키초코라떼.jpg b/jascoffee/uploads/images/쿠키초코라떼.jpg
diff --git a/jascoffee/uploads/images/쿠키초코프라페.jpg b/jascoffee/uploads/images/쿠키초코프라페.jpg
diff --git a/jascoffee/uploads/images/크루아상 와플.jpg b/jascoffee/uploads/images/크루아상 와플.jpg
diff --git a/jascoffee/uploads/images/키위주스.jpg b/jascoffee/uploads/images/키위주스.jpg
diff --git a/jascoffee/uploads/images/트러플체다치즈팝콘.jpg b/jascoffee/uploads/images/트러플체다치즈팝콘.jpg
diff --git a/jascoffee/uploads/images/티라미수 크루아상와플.jpg b/jascoffee/uploads/images/티라미수 크루아상와플.jpg
diff --git a/jascoffee/uploads/images/팥절미 크루아상와플.jpg b/jascoffee/uploads/images/팥절미 크루아상와플.jpg
diff --git a/jascoffee/uploads/images/팥절미밀크쉐이크.jpg b/jascoffee/uploads/images/팥절미밀크쉐이크.jpg
diff --git a/jascoffee/uploads/images/패션후르츠스페셜에이드.jpg b/jascoffee/uploads/images/패션후르츠스페셜에이드.jpg
diff --git a/jascoffee/uploads/images/페퍼민트.jpg b/jascoffee/uploads/images/페퍼민트.jpg
diff --git a/jascoffee/uploads/images/폼미쳤도넛 커스터드.jpg b/jascoffee/uploads/images/폼미쳤도넛 커스터드.jpg
diff --git a/jascoffee/uploads/images/폼미쳤도넛 크림치즈.jpg b/jascoffee/uploads/images/폼미쳤도넛 크림치즈.jpg
diff --git a/jascoffee/uploads/images/플레인밀크쉐이크.jpg b/jascoffee/uploads/images/플레인밀크쉐이크.jpg
diff --git a/jascoffee/uploads/images/플레인요거트스무디.jpg b/jascoffee/uploads/images/플레인요거트스무디.jpg
diff --git a/jascoffee/uploads/images/헤이즐넛라떼.jpg b/jascoffee/uploads/images/헤이즐넛라떼.jpg
diff --git a/jascoffee/uploads/images/화이트 생크림 롤케이크.jpg b/jascoffee/uploads/images/화이트 생크림 롤케이크.jpg
diff --git a/jascoffee/uploads/images/흑당밀크우유.jpg b/jascoffee/uploads/images/흑당밀크우유.jpg
diff --git a/jascoffee/uploads/images/흑당카페라떼.jpg b/jascoffee/uploads/images/흑당카페라떼.jpg