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

@@ -1,12 +1,23 @@
 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,13 @@
+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

@@ -5,27 +5,32 @@
 
 @Service
 public class MemberService {
-    private MemberDao memberDao;
+    private 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(), member.getRole());
     }
 
     public MemberResponse findById(Long id) {
-        Optional<Member> optionalMember = memberDao.findById(id);
+        Optional<Member> optionalMember = memberRepository.findById(id);
         Member member = optionalMember.orElseThrow(() -> new IllegalArgumentException("해당 id를 가진 Member 객체를 찾을 수 없습니다."));
         return new MemberResponse(member.getId(), member.getName(), member.getEmail(), member.getRole());
     }
 
     public MemberResponse findByEmailAndPassword(String email, String password) {
-        Optional<Member> optionalMember = memberDao.findByEmailAndPassword(email, password);
+        Optional<Member> optionalMember = memberRepository.findByEmailAndPassword(email, password);
         Member member = optionalMember.orElseThrow(() -> new IllegalArgumentException("해당 email와 password를 가진 Member 객체를 찾을 수 없습니다."));
         return new MemberResponse(member.getId(), member.getName(), member.getEmail(), member.getRole());
     }
 
+    public Member findByName(String name) {
+        return  memberRepository.findByName(name)
+            .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 회원"));
+    }
+
 }

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

@@ -0,0 +1,64 @@
+package roomescape.reservation;
+
+
+import roomescape.waiting.WaitingResponse;
+
+public class MyReservationResponse {
+
+    private Long id;
+    private String theme;
+    private String date;
+    private String time;
+    private String status;
+
+    private MyReservationResponse() {
+    }
+
+    private 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 static MyReservationResponse from(Reservation reservation) {
+        return new MyReservationResponse(
+            reservation.getId(),
+            reservation.getTheme().getName(),
+            reservation.getDate(),
+            reservation.getTime().getValue(),
+            "예약"
+        );
+    }
+
+    public static MyReservationResponse from(WaitingResponse waitingResponse) {
+        return new MyReservationResponse(
+            waitingResponse.getId(),
+            waitingResponse.getTheme(),
+            waitingResponse.getDate(),
+            waitingResponse.getTime(),
+            waitingResponse.getWaitingNumber() + "번째 예약대기"
+        );
+    }
+
+    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,40 +1,64 @@
 package roomescape.reservation;
 
+import jakarta.persistence.Entity;
+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;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "member_id")
+    private Member member;
     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) {
+    protected Reservation() {
+
+    }
+
+    public Reservation(Long id, Member member, String date, Time time, Theme theme) {
         this.id = id;
-        this.name = name;
+        this.member= member;
         this.date = date;
         this.time = time;
         this.theme = theme;
     }
 
-    public Reservation(String name, String date, Time time, Theme theme) {
-        this.name = name;
+    public Reservation(Member member, String date, Time time, Theme theme) {
+        this.member = member;
         this.date = date;
         this.time = time;
         this.theme = theme;
     }
 
-    public Reservation() {
-
-    }
 
     public Long getId() {
         return id;
     }
 
-    public String getName() {
-        return name;
+    public String getMemberName() {
+        return member.getName();
+    }
+
+    public String geeeet() {
+        return member.getId().toString();
     }
 
     public String getDate() {
@@ -48,4 +72,5 @@ public Time getTime() {
     public Theme getTheme() {
         return theme;
     }
+
 }

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

@@ -12,7 +12,6 @@
 import java.util.List;
 import roomescape.login.LoginMember;
 import roomescape.member.Member;
-import roomescape.member.MemberResponse;
 
 @RestController
 public class ReservationController {
@@ -39,7 +38,7 @@ public ResponseEntity create(@RequestBody ReservationRequest reservationRequest,
             || reservationRequest.getTime() == null) {
             return ResponseEntity.badRequest().build();
         }
-        ReservationResponse reservation = reservationService.save(reservationRequest);
+        ReservationResponse reservation = reservationService.save(reservationRequest, member);
 
         return ResponseEntity.created(URI.create("/reservations/" + reservation.getId())).body(reservation);
     }
@@ -49,4 +48,9 @@ public ResponseEntity delete(@PathVariable Long id) {
         reservationService.deleteById(id);
         return ResponseEntity.noContent().build();
     }
+
+    @GetMapping("/reservations-mine")
+    public List<MyReservationResponse> getReservationList(@LoginMember Member member) {
+        return reservationService.findAllMine(member.getId());
+    }
 }