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

@@ -3,26 +3,25 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Component;
-import org.springframework.web.SpringServletContainerInitializer;
 import org.springframework.web.servlet.HandlerInterceptor;
 import roomescape.member.Member;
-import roomescape.member.MemberDao;
+import roomescape.member.MemberRepository;
 import roomescape.member.MemberService;
 
 @Component
 public class AdminInterceptor implements HandlerInterceptor {
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
     private final MemberService memberService;
 
-    public AdminInterceptor(MemberDao memberDao, MemberService memberService) {
-        this.memberDao = memberDao;
+    public AdminInterceptor(MemberRepository memberRepository, MemberService memberService) {
+        this.memberRepository = memberRepository;
         this.memberService = memberService;
     }
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         Long memberId = memberService.checkLogin(request).getId();
-        Member member = memberDao.findById(memberId);
+        Member member = memberRepository.findById(memberId).get();
 
         if (member == null || !member.getRole().equals("ADMIN")) {
             response.setStatus(401);

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

@@ -1,6 +1,14 @@
 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 +29,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/MemberRepository.java

@@ -0,0 +1,15 @@
+package roomescape.member;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.Optional;
+
+public interface MemberRepository extends CrudRepository<Member, Long> {
+
+    @Override
+    public Optional<Member> findById(Long id);
+
+    public Member findByEmailAndPassword(String email, String password);
+
+}

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

@@ -12,24 +12,24 @@
 
 @Service
 public class MemberService {
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
     private final TokenProvider tokenProvider;
     private final Extractor extractor;
 
-    public MemberService(MemberDao memberDao, TokenProvider tokenProvider, Extractor extractor) {
-        this.memberDao = memberDao;
+    public MemberService(MemberRepository memberRepository, TokenProvider tokenProvider, Extractor extractor) {
+        this.memberRepository = memberRepository;
         this.tokenProvider = tokenProvider;
         this.extractor = extractor;
     }
 
     public LoginMember 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 LoginMember(member.getId(), member.getName(), member.getEmail());
     }
 
     public String loginByEmailAndPassword(LoginRequest request) {
         try {
-            Member member = memberDao.findByEmailAndPassword(request.email(), request.password());
+            Member member = memberRepository.findByEmailAndPassword(request.email(), request.password());
             return tokenProvider.createToken(member);
         } catch (DataAccessException e) {
             throw new IllegalArgumentException("로그인 정보가 불일치 합니다.");
@@ -46,7 +46,7 @@ public LoginMember checkLogin(HttpServletRequest request) {
         String token = extractToken(request);
         Long memberId = extractId(token);
 
-        Member member = memberDao.findById(memberId);
+        Member member = memberRepository.findById(memberId).get();
         return LoginMember.from(member);
     }
 

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

@@ -0,0 +1,38 @@
+package roomescape.reservation;
+
+public class MyReservationResponse {
+    private Long reservationId;
+    private String theme;
+    private String date;
+    private String time;
+    private String status;
+
+    public MyReservationResponse(Long reservationId, String theme, String date, String time, String status) {
+
+    }
+
+    public MyReservationResponse(){
+
+    }
+
+    public Long getReservationId() {
+        return reservationId;
+    }
+
+    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,13 +1,23 @@
 package roomescape.reservation;
 
+import jakarta.persistence.*;
 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
+    @JoinColumn(name = "time_id")
     private Time time;
+
+    @ManyToOne
+    @JoinColumn(name = "theme_id")
     private Theme theme;
 
     public Reservation(Long id, String name, String date, Time time, Theme theme) {

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

@@ -6,6 +6,7 @@
 import roomescape.member.LoginMember;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -23,7 +24,7 @@ public List<ReservationResponse> list() {
     }
 
     @PostMapping("/reservations")
-    public ResponseEntity create(@Authentication LoginMember loginMember ,@RequestBody ReservationRequest reservationRequest ) {
+    public ResponseEntity create(@Authentication LoginMember loginMember, @RequestBody ReservationRequest reservationRequest) {
 
         if (reservationRequest.name() == null) {
             reservationRequest = new ReservationRequest(
@@ -50,4 +51,12 @@ public ResponseEntity delete(@PathVariable Long id) {
         reservationService.deleteById(id);
         return ResponseEntity.noContent().build();
     }
+
+    @GetMapping("/reservations-mine")
+    public ResponseEntity<List<MyReservationResponse>> reservations(@Authentication LoginMember loginMember) {
+        String name = loginMember.getName();
+        List<MyReservationResponse> response = reservationService.findReservationsByName(name);
+
+        return ResponseEntity.ok(response);
+    }
 }