[Spring Data JPA] 안금서 미션 제출합니다.

build.gradle

@@ -15,7 +15,7 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

src/main/java/roomescape/authentication/MemberAuthInfo.java

@@ -1,6 +1,7 @@
 package roomescape.authentication;
 
 public record MemberAuthInfo(
+        Long id,
         String name,
         String role) {
 }

src/main/java/roomescape/authentication/jwt/JwtAuthenticationInfoExtractor.java

@@ -33,10 +33,11 @@ public MemberAuthInfo extractMemberAuthInfoFromToken(String token) {
                     .parseClaimsJws(token)
                     .getBody();
 
+            Long id = Long.valueOf(claims.getSubject());
             String name = claims.get("name", String.class);
             String role = claims.get("role", String.class);
 
-            return new MemberAuthInfo(name, role);
+            return new MemberAuthInfo(id, name, role);
         } catch (JwtException e) {
             throw new JwtValidationException("유효하지 않은 JWT 토큰입니다.", e);
         }

src/main/java/roomescape/exception/DuplicateReservationException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class DuplicateReservationException extends RuntimeException {
+    public DuplicateReservationException(String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/exception/GeneralExceptionHandler.java

@@ -1,31 +1,33 @@
 package roomescape.exception;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+@Slf4j
 @RestControllerAdvice
 public class GeneralExceptionHandler {
 
-    @ExceptionHandler(MemberNotFoundException.class)
-    public ResponseEntity<String> handleMemberNotFound(MemberNotFoundException e) {
+    @ExceptionHandler({MemberNotFoundException.class, JwtValidationException.class, JwtProviderException.class})
+    public ResponseEntity<String> handleMemberNotFound(Exception e) {
         return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e.getMessage());
     }
 
-    @ExceptionHandler(JwtValidationException.class)
-    public ResponseEntity<String> handleJwtValidationException(JwtValidationException e) {
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e.getMessage());
+    @ExceptionHandler({TimeNotFoundException.class, ThemeNotFoundException.class})
+    public ResponseEntity<String> handleTimeNotFound(Exception e) {
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage());
     }
 
-    @ExceptionHandler(JwtProviderException.class)
-    public ResponseEntity<String> handleJwtProviderException(JwtProviderException e) {
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e.getMessage());
+    @ExceptionHandler(DuplicateReservationException.class)
+    public ResponseEntity<String> handleDuplicatedReservation(DuplicateReservationException e) {
+        return ResponseEntity.status(HttpStatus.CONFLICT).body(e.getMessage());
     }
 
     @ExceptionHandler(Exception.class)
     public ResponseEntity<String> handleGeneralException(Exception e) {
-        e.printStackTrace();
+        log.error("Exception [Err_Location] : {}", e.getStackTrace()[0]);
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
     }
 }

src/main/java/roomescape/exception/MemberNotFoundException.java

@@ -1,7 +1,8 @@
 package roomescape.exception;
 
 public class MemberNotFoundException extends RuntimeException {
-    public MemberNotFoundException(String message, Throwable cause) {
-        super(message, cause);
+
+    public MemberNotFoundException(String message) {
+        super(message);
     }
 }

src/main/java/roomescape/exception/ThemeNotFoundException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class ThemeNotFoundException extends RuntimeException {
+    public ThemeNotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/exception/TimeNotFoundException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class TimeNotFoundException extends RuntimeException {
+    public TimeNotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/login/LoginService.java

@@ -1,38 +1,36 @@
 package roomescape.login;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Service;
 import roomescape.authentication.MemberAuthInfo;
 import roomescape.authentication.AuthenticationResponse;
 import roomescape.authentication.AuthenticationService;
 import roomescape.member.Member;
-import roomescape.member.MemberDao;
+
 import roomescape.exception.MemberNotFoundException;
+import roomescape.member.MemberRepository;
 
 @Service
 @RequiredArgsConstructor
 public class LoginService {
 
-    private final MemberDao memberDao;
+
+    private final MemberRepository memberRepository;
     private final AuthenticationService authenticationService;
+
     public AuthenticationResponse login(LoginRequest loginRequest) {
 
-        try {
-            Member member = memberDao.findByEmailAndPassword(loginRequest.email(), loginRequest.password());
+            Member member = memberRepository.findByEmailAndPassword(loginRequest.email(), loginRequest.password())
+                    .orElseThrow(() -> new MemberNotFoundException("입력한 이메일 혹은 비밀번호로 가입한 회원을 찾을 수 없습니다."));
+
             return authenticationService.createToken(member);
-        } catch (EmptyResultDataAccessException e) {
-            throw new MemberNotFoundException("이메일 혹은 비밀번호가 맞지 않습니다.", e);
-        }
     }
 
     public LoginCheckResponse checkLogin(MemberAuthInfo memberAuthInfo) {
 
-        try {
-            Member member = memberDao.findByName(memberAuthInfo.name());
-            return new LoginCheckResponse(member.getName());
-        } catch (EmptyResultDataAccessException e) {
-            throw new MemberNotFoundException("로그인이 되지 않은 상태입니다.", e);
-        }
+        Member member= memberRepository.findByName(memberAuthInfo.name())
+                .orElseThrow(() -> new MemberNotFoundException("로그인 된 회원이 아닙니다."));
+
+        return new LoginCheckResponse(member.getName());
     }
 }

src/main/java/roomescape/member/Member.java

@@ -1,10 +1,26 @@
 package roomescape.member;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Member {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     private String name;
+
     private String email;
+
     private String password;
+
     private String role;
 
     public Member(Long id, String name, String email, String role) {

src/main/java/roomescape/member/MemberRepository.java

@@ -0,0 +1,12 @@
+package roomescape.member;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface MemberRepository extends JpaRepository<Member, Long> {
+
+    Optional<Member> findByEmailAndPassword(String email, String password);
+
+    Optional<Member> findByName(String name);
+}

src/main/java/roomescape/member/MemberService.java

@@ -1,17 +1,16 @@
 package roomescape.member;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
+@RequiredArgsConstructor
 public class MemberService {
-    private MemberDao memberDao;
 
-    public MemberService(MemberDao memberDao) {
-        this.memberDao = memberDao;
-    }
+    private final MemberRepository memberRepository;
 
     public MemberResponse createMember(MemberRequest memberRequest) {
-        Member member = memberDao.save(new Member(memberRequest.name(), memberRequest.email(), memberRequest.password(), "USER"));
+        Member member = memberRepository.save(new Member(memberRequest.name(), memberRequest.email(), memberRequest.password(), "USER"));
         return new MemberResponse(member.getId(), member.getName(), member.getEmail());
     }
 }

src/main/java/roomescape/reservation/MyReservationResponse.java

@@ -0,0 +1,10 @@
+package roomescape.reservation;
+
+public record MyReservationResponse(
+        Long reservationId,
+        String theme,
+        String date,
+        String time,
+        String status
+) {
+}

src/main/java/roomescape/reservation/Reservation.java

@@ -1,34 +1,54 @@
 package roomescape.reservation;
 
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+import roomescape.member.Member;
 import roomescape.theme.Theme;
 import roomescape.time.Time;
 
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Reservation {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     private String name;
+
     private String date;
+
+    @ManyToOne
+    @JoinColumn(name = "time_id")
+    @OnDelete(action = OnDeleteAction.CASCADE)
     private Time time;
+
+    @ManyToOne
+    @JoinColumn(name = "theme_id")
+    @OnDelete(action = OnDeleteAction.CASCADE)
     private Theme theme;
 
-    public Reservation(Long id, String name, String date, Time time, Theme theme) {
-        this.id = id;
+    @ManyToOne
+    @JoinColumn(name = "member_id")
+    private Member member;
+
+    public Reservation(Member member, String name, String date, Time time, Theme theme) {
+        this.member = member;
         this.name = name;
         this.date = date;
         this.time = time;
         this.theme = theme;
     }
-
     public Reservation(String name, String date, Time time, Theme theme) {
         this.name = name;
         this.date = date;
         this.time = time;
         this.theme = theme;
     }
 
-    public Reservation() {
-
-    }
-
     public Long getId() {
         return id;
     }
@@ -48,4 +68,8 @@ public Time getTime() {
     public Theme getTheme() {
         return theme;
     }
+
+    public Member getMember() {
+        return member;
+    }
 }