[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/member/AuthService.java

@@ -6,16 +6,16 @@
 @Service
 public class AuthService {
 
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
     private final TokenProvider tokenProvider;
 
-    public AuthService(MemberDao memberDao, TokenProvider tokenProvider) {
-        this.memberDao = memberDao;
+    public AuthService(MemberRepository memberRepository, TokenProvider tokenProvider) {
+        this.memberRepository = memberRepository;
         this.tokenProvider = tokenProvider;
     }
 
     public String login(LoginRequest loginRequest) {
-        Member findMember = memberDao
+        Member findMember = memberRepository
                 .findByEmailAndPassword(loginRequest.getEmail(), loginRequest.getPassword())
                 .orElseThrow(() -> new IllegalArgumentException("Invalid email or password"));
 
@@ -25,7 +25,7 @@ public String login(LoginRequest loginRequest) {
     public Member loginCheck(String token) {
         Long memberId = tokenProvider.parse(token);
 
-        return memberDao.findById(memberId)
+        return memberRepository.findById(memberId)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid token"));
     }
 }

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

@@ -1,12 +1,24 @@
 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;
     private String password;
     private String role;
 
+    public Member() {
+    }
+
     public Member(Long id, String name, String email, String role) {
         this.id = id;
         this.name = name;

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

@@ -0,0 +1,10 @@
+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);
+}

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

@@ -5,14 +5,14 @@
 @Service
 public class MemberService {
 
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
 
-    public MemberService(MemberDao memberDao) {
-        this.memberDao = memberDao;
+    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 = memberRepository.save(new Member(memberRequest.getName(), memberRequest.getEmail(), memberRequest.getPassword(), "USER"));
         return new MemberResponse(member.getId(), member.getName(), member.getEmail());
     }
 

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

@@ -0,0 +1,38 @@
+package roomescape.reservation;
+
+public class MyReservationResponse {
+
+    private final Long id;
+    private final String theme;
+    private final String date;
+    private final String time;
+    private final String status;
+
+    public MyReservationResponse(Long id, String theme, String date, String time, String status) {
+        this.id = id;
+        this.theme = theme;
+        this.date = date;
+        this.time = time;
+        this.status = status;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getTheme() {
+        return theme;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+}

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

@@ -1,36 +1,41 @@
 package roomescape.reservation;
 
+import jakarta.persistence.*;
+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)
+    private Member member;
+
+    @ManyToOne(fetch = FetchType.LAZY)
     private Time time;
-    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)
+    private Theme theme;
 
-    public Reservation(String name, String date, Time time, Theme theme) {
+    private Reservation(String name, String date, Member member, Time time, Theme theme) {
         this.name = name;
         this.date = date;
+        this.member = member;
         this.time = time;
         this.theme = theme;
     }
 
     protected Reservation() {
-
     }
 
-    public static Reservation of(String name, String date, Time time, Theme theme) {
-        return new Reservation(name, date, time, theme);
+    public static Reservation of(String name, String date, Member member, Time time, Theme theme) {
+        return new Reservation(name, date, member, time, theme);
     }
 
     public Long getId() {

src/main/java/roomescape/reservation/ReservationController.java

@@ -43,4 +43,10 @@ public ResponseEntity delete(@PathVariable Long id) {
         reservationService.deleteById(id);
         return ResponseEntity.noContent().build();
     }
+
+    @GetMapping("/reservations-mine")
+    public List<MyReservationResponse> listMine(LoginMember loginMember) {
+        return reservationService.getMyReservationResponses(loginMember.getId());
+    }
+
 }