[Spring Data Jpa] 김예진 미션 제출합니다.

build.gradle

@@ -15,7 +15,11 @@ 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'
+
+    // jakarta.persistence-api 의존성 명시적 추가 (필요한 경우)
+    implementation 'jakarta.persistence:jakarta.persistence-api'
+
 
     implementation 'dev.akkinoc.spring.boot:logback-access-spring-boot-starter:4.0.0'
 

src/main/java/roomescape/auth/TokenInterceptor.java

@@ -21,19 +21,18 @@ public TokenInterceptor(AuthService authService) {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         Cookie[] cookies = request.getCookies();
 
-        if (cookies == null) {
-            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-            return false;
+        if (cookies != null) {
+            String token = Arrays.stream(cookies)
+                    .filter(cookie -> "token".equals(cookie.getName()))
+                    .map(Cookie::getValue)
+                    .findFirst()
+                    .orElse(null);
+
+            if (token != null && !token.isBlank()) {
+                LoginMember loginMember = authService.parseMemberInfo(token);
+                request.setAttribute("loginMember", loginMember);
+            }
         }
-
-        String token = Arrays.stream(cookies)
-                .filter(cookie -> "token".equals(cookie.getName()))
-                .map(Cookie::getValue)
-                .findFirst()
-                .orElse(null);
-
-        LoginMember loginMember = authService.parseMemberInfo(token);
-        request.setAttribute("loginMember", loginMember);
         return HandlerInterceptor.super.preHandle(request, response, handler);
     }
 }

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

@@ -1,10 +1,27 @@
 package roomescape.member;
 
+
+import jakarta.persistence.*;
+
+@Entity
 public class Member {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "member_id", nullable = false)
     private Long id;
+
+    @Column(nullable = false)
     private String name;
+
+    @Column(nullable = false)
     private String email;
+
+    @Column(nullable = false)
     private String password;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
     private Role role;
 
     public Member(Long id, String name, String email, Role role) {
@@ -21,6 +38,10 @@ public Member(String name, String email, String password, Role role) {
         this.role = role;
     }
 
+    public Member() {
+
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/roomescape/member/MemberDao.java

@@ -39,17 +39,4 @@ public Member findByEmailAndPassword(String email, String password) {
                 email, password
         );
     }
-
-    public Member findByName(String name) {
-        return jdbcTemplate.queryForObject(
-                "SELECT id, name, email, role FROM member WHERE name = ?",
-                (rs, rowNum) -> new Member(
-                        rs.getLong("id"),
-                        rs.getString("name"),
-                        rs.getString("email"),
-                        Role.valueOf(rs.getString("role"))
-                ),
-                name
-        );
-    }
 }

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

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

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

@@ -4,14 +4,16 @@
 
 @Service
 public class MemberService {
-    private final MemberDao memberDao;
 
-    public MemberService(final MemberDao memberDao) {
-        this.memberDao = memberDao;
+    private final MemberRepository memberRepository;
+
+    public MemberService(MemberRepository memberRepository) {
+        this.memberRepository = memberRepository;
     }
 
     public MemberResponse createMember(MemberRequest memberRequest) {
-        Member member = memberDao.save(new Member(memberRequest.name(), memberRequest.email(), memberRequest.password(), Role.USER));
+        Member member = memberRepository.save(new Member(memberRequest.name(), memberRequest.email(), memberRequest.password(), Role.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 Long id;
+    private String theme;
+    private String date;
+    private String time;
+    private 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,28 +1,66 @@
 package roomescape.reservation;
 
+import jakarta.persistence.*;
+import roomescape.member.Member;
 import roomescape.theme.Theme;
-import roomescape.time.Time;
+import roomescape.time.ParticipationTime;
 
+@Entity
 public class Reservation {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "reservation_id", nullable = false)
     private Long id;
+
+    @Column(nullable = false)
     private String name;
+
+    @Column(nullable = false)
     private String date;
-    private Time time;
+
+    @ManyToOne
+    @JoinColumn(name = "member_id")
+    private Member member;
+
+    @ManyToOne
+    @JoinColumn(name = "time_id")
+    private ParticipationTime participationTime;
+
+    @ManyToOne
+    @JoinColumn(name = "theme_id")
     private Theme theme;
 
-    public Reservation(Long id, String name, String date, Time time, Theme theme) {
+    public Reservation(Long id, String name, String date, ParticipationTime participationTime, Theme theme, Member member) {
         this.id = id;
         this.name = name;
         this.date = date;
-        this.time = time;
+        this.participationTime = participationTime;
+        this.theme = theme;
+        this.member = member;
+    }
+
+    public Reservation(Long id, String name, String date, ParticipationTime participationTime, Theme theme) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.participationTime = participationTime;
+        this.theme = theme;
+    }
+
+    public Reservation(String name, String date, ParticipationTime participationTime, Theme theme) {
+        this.name = name;
+        this.date = date;
+        this.participationTime = participationTime;
         this.theme = theme;
     }
 
-    public Reservation(String name, String date, Time time, Theme theme) {
+    public Reservation(String name, String date, ParticipationTime participationTime, Theme theme, Member member) {
         this.name = name;
         this.date = date;
-        this.time = time;
+        this.participationTime = participationTime;
         this.theme = theme;
+        this.member = member;
     }
 
     public Reservation() {
@@ -41,8 +79,8 @@ public String getDate() {
         return date;
     }
 
-    public Time getTime() {
-        return time;
+    public ParticipationTime getTime() {
+        return participationTime;
     }
 
     public Theme getTheme() {

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

@@ -26,12 +26,17 @@ public List<ReservationResponse> list() {
         return reservationService.findAll();
     }
 
+    @GetMapping("/reservations/mine")
+    public List<MyReservationResponse> myReservations(LoginMember loginMember) {
+        return reservationService.findMyReservation(loginMember);
+    }
+
     @PostMapping("/reservations")
     public ResponseEntity create(@RequestBody ReservationRequest reservationRequest, LoginMember loginMember) {
 
         if (reservationRequest.getDate() == null
-                || reservationRequest.getTheme() == null
-                || reservationRequest.getTime() == null) {
+                || reservationRequest.getThemeId() == null
+                || reservationRequest.getTimeId() == null) {
             return ResponseEntity.badRequest().build();
         }
 
@@ -44,4 +49,6 @@ public ResponseEntity delete(@PathVariable Long id) {
         reservationService.deleteById(id);
         return ResponseEntity.noContent().build();
     }
+
+
 }