[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 'dev.akkinoc.spring.boot:logback-access-spring-boot-starter:4.0.0'
 

src/main/java/roomescape/auth/configuration/LoginMemberArgumentResolver.java

@@ -24,7 +24,7 @@ public LoginMemberArgumentResolver(JwtUtil jwtUtil) {
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
         return parameter.hasParameterAnnotation(LoginMember.class)
-            && parameter.getParameterType().equals(Member.class);
+            && parameter.getParameterType().equals(MemberInfo.class);
     }
 
     @Override
@@ -47,6 +47,7 @@ public Object resolveArgument(
 
                 JwtPayload jwtPayload = jwtUtil.parseToken(token);
                 return new MemberInfo(
+                    jwtPayload.id(),
                     jwtPayload.name(),
                     jwtPayload.role()
                 );

src/main/java/roomescape/auth/controller/LoginController.java

@@ -1,5 +1,6 @@
 package roomescape.auth.controller;
 
+import org.springframework.data.crossstore.ChangeSetPersister.NotFoundException;
 import org.springframework.http.ResponseCookie;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;
@@ -26,7 +27,7 @@ public LoginController(LoginService loginService) {
     @PostMapping
     public ResponseEntity<Void> login(
         @RequestBody LoginRequest loginRequest
-    ) {
+    ) throws NotFoundException {
         String token = loginService.login(loginRequest.email(), loginRequest.password());
 
         ResponseCookie cookie = ResponseCookie.from("token", token)
@@ -42,7 +43,7 @@ public ResponseEntity<Void> login(
     @GetMapping("/check")
     public ResponseEntity<LoginResponse> loginCheck(
         @CookieValue(value = "token", required = false) String token
-    ) {
+    ) throws NotFoundException {
         if (token == null || token.isBlank()) {
             return ResponseEntity.status(401).build();
         }

src/main/java/roomescape/auth/service/LoginService.java

@@ -1,34 +1,39 @@
 package roomescape.auth.service;
 
 import org.springframework.stereotype.Service;
-import roomescape.member.Member;
-import roomescape.member.MemberDao;
-import roomescape.member.MemberInfo;
 import roomescape.auth.util.JwtPayload;
 import roomescape.auth.util.JwtUtil;
+import roomescape.member.Member;
+import roomescape.member.MemberInfo;
+import roomescape.member.MemberRepository;
 
 
 @Service
 public class LoginService {
 
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
     private final JwtUtil jwtUtil;
 
-    public LoginService(MemberDao memberDao, JwtUtil jwtUtil) {
-        this.memberDao = memberDao;
+    public LoginService(MemberRepository memberRepository, JwtUtil jwtUtil) {
+        this.memberRepository = memberRepository;
         this.jwtUtil = jwtUtil;
     }
 
     public String login(String email, String password) {
-        Member member = memberDao.findByEmailAndPassword(email, password);
+        Member member = memberRepository.findByEmailAndPassword(email, password)
+            .orElseThrow(
+                () -> new IllegalArgumentException("not found Member with email: " + email));
         return jwtUtil.createToken(member);
     }
 
     public MemberInfo check(String token) {
         JwtPayload payload = jwtUtil.parseToken(token);
-        Member member = memberDao.findByName(payload.name());
+        Member member = memberRepository.findByName(payload.name())
+            .orElseThrow(() -> new IllegalArgumentException(
+                "not found Member with name: " + payload.name()));
 
         return new MemberInfo(
+            member.getId(),
             member.getName(),
             member.getRole()
         );

src/main/java/roomescape/auth/util/JwtPayload.java

@@ -1,5 +1,5 @@
 package roomescape.auth.util;
 
-public record JwtPayload(String name, String role) {
+public record JwtPayload(Long id, String name, String role) {
 
 }

src/main/java/roomescape/auth/util/JwtUtil.java

@@ -36,6 +36,7 @@ public String createToken(Member member) {
     public JwtPayload parseToken(String token) {
         Claims claims = jwtParser.parseClaimsJws(token).getBody();
         return new JwtPayload(
+            Long.valueOf(claims.getSubject()),
             String.valueOf(claims.get("name")),
             String.valueOf(claims.get("role"))
         );

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

@@ -1,6 +1,15 @@
 package roomescape.member;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+@Entity
 public class Member {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
     private String email;
@@ -21,6 +30,10 @@ public Member(String name, String email, String password, String role) {
         this.role = role;
     }
 
+    public Member() {
+
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/roomescape/member/MemberInfo.java

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

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

@@ -0,0 +1,11 @@
+package roomescape.member;
+
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+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

@@ -4,14 +4,22 @@
 
 @Service
 public class MemberService {
-    private MemberDao memberDao;
 
-    public MemberService(MemberDao memberDao) {
-        this.memberDao = memberDao;
+    private MemberRepository memberRepository;
+
+    public MemberService(MemberRepository memberRepository) {
+        this.memberRepository = memberRepository;
     }
 
     public MemberResponse createMember(MemberRequest memberRequest) {
-        Member member = memberDao.save(new Member(memberRequest.getName(), memberRequest.getEmail(), memberRequest.getPassword(), "USER"));
+        Member member = new Member(
+            memberRequest.getName(),
+            memberRequest.getEmail(),
+            memberRequest.getPassword(),
+            "USER"
+        );
+
+        memberRepository.save(member);
         return new MemberResponse(member.getId(), member.getName(), member.getEmail());
     }
 }

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

@@ -0,0 +1,27 @@
+package roomescape.reservation;
+
+public record MyReservationResponse(
+    Long reservationId,
+    String theme,
+    String date,
+    String time,
+    String status
+) {
+
+    public static MyReservationResponse from(Reservation reservation, Integer rank) {
+        return new MyReservationResponse(
+            reservation.getId(),
+            reservation.getTheme().getName(),
+            reservation.getDate(),
+            reservation.getTime().getValue(),
+            getStatus(reservation, rank)
+        );
+    }
+
+    public static String getStatus(Reservation reservation, Integer rank) {
+        if (reservation.isWaiting()) {
+            return rank + "번째 예약대기";
+        }
+        return "예약";
+    }
+}

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

@@ -1,34 +1,72 @@
 package roomescape.reservation;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import roomescape.member.Member;
 import roomescape.theme.Theme;
 import roomescape.time.Time;
 
+@Entity
 public class Reservation {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
     private String date;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "time_id")
     private Time time;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "theme_id")
     private Theme theme;
 
-    public Reservation(Long id, String name, String date, Time time, Theme theme) {
-        this.id = id;
-        this.name = name;
-        this.date = date;
-        this.time = time;
-        this.theme = theme;
-    }
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "member_id")
+    private Member member;
+
+    @Enumerated(EnumType.STRING)
+    private ReservationStatus status;
 
-    public Reservation(String name, String date, Time time, Theme theme) {
+    public Reservation(String name, String date, Time time, Theme theme, Member member,
+        ReservationStatus status) {
         this.name = name;
         this.date = date;
         this.time = time;
         this.theme = theme;
+        this.member = member;
+        this.status = status;
     }
 
     public Reservation() {
 
     }
 
+    public boolean isOwnedBy(Long memberId) {
+        return this.member.getId().equals(memberId);
+    }
+
+    public boolean isReserved() {
+        return this.status == ReservationStatus.RESERVED;
+    }
+
+    public boolean isWaiting() {
+        return this.status == ReservationStatus.WAITING;
+    }
+
+    public void promoteToReserved() {
+        this.status = ReservationStatus.RESERVED;
+    }
+
     public Long getId() {
         return id;
     }
@@ -48,4 +86,12 @@ public Time getTime() {
     public Theme getTheme() {
         return theme;
     }
+
+    public Member getMember() {
+        return member;
+    }
+
+    public ReservationStatus getStatus() {
+        return status;
+    }
 }