[Logan] Spring Data JPA 4~6단계 미션

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+.DS_Store
 
 ### STS ###
 .apt_generated

build.gradle

@@ -20,7 +20,7 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter:3.4.4'
     implementation 'org.springframework.boot:spring-boot-starter-web:3.4.4'
-    implementation 'org.springframework.boot:spring-boot-starter-jdbc:3.4.4'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.4.4'
 
     implementation 'dev.akkinoc.spring.boot:logback-access-spring-boot-starter:4.5.1'

src/main/java/com/yourssu/roomescape/PageController.java

@@ -30,7 +30,7 @@ public String reservation() {
         return "reservation";
     }
 
-    @GetMapping("/reservation-mine")
+    @GetMapping("/reservation/mine")
     public String myReservation() {
         return "reservation-mine";
     }

src/main/java/com/yourssu/roomescape/auth/AuthController.java

@@ -1,5 +1,7 @@
 package com.yourssu.roomescape.auth;
 
+import com.yourssu.roomescape.auth.dto.CheckLoginResponse;
+import com.yourssu.roomescape.auth.dto.LoginRequest;
 import com.yourssu.roomescape.jwt.TokenExtractor;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/yourssu/roomescape/auth/AuthService.java

@@ -1,28 +1,33 @@
 package com.yourssu.roomescape.auth;
 
+import com.yourssu.roomescape.auth.dto.LoginRequest;
+import com.yourssu.roomescape.exception.CustomException;
+import com.yourssu.roomescape.exception.ErrorCode;
 import com.yourssu.roomescape.jwt.TokenProvider;
 import com.yourssu.roomescape.member.Member;
-import com.yourssu.roomescape.member.MemberDao;
+import com.yourssu.roomescape.member.MemberRepository;
 import org.springframework.stereotype.Service;
 
 @Service
 public class AuthService {
 
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
     private final TokenProvider tokenProvider;
 
-    public AuthService(TokenProvider tokenProvider, MemberDao memberDao) {
+    public AuthService(TokenProvider tokenProvider, MemberRepository memberRepository) {
         this.tokenProvider = tokenProvider;
-        this.memberDao = memberDao;
+        this.memberRepository = memberRepository;
     }
 
     public String login(LoginRequest loginRequest) {
-        Member member = memberDao.findByEmailAndPassword(loginRequest.email(), loginRequest.password());
+        Member member = memberRepository.findByEmailAndPassword(loginRequest.email(), loginRequest.password())
+                .orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND));
         return tokenProvider.createToken(member.getEmail());
     }
 
     public Member checkLogin(String token) {
         String payload = tokenProvider.getPayload(token);
-        return memberDao.findByEmail(payload);
+        return memberRepository.findByEmail(payload)
+                .orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND));
     }
 }

src/main/java/com/yourssu/roomescape/auth/CheckLoginResponse.java → src/main/java/com/yourssu/roomescape/auth/dto/CheckLoginResponse.java

@@ -1,4 +1,4 @@
-package com.yourssu.roomescape.auth;
+package com.yourssu.roomescape.auth.dto;
 
 public record CheckLoginResponse(String name) {
 }

src/main/java/com/yourssu/roomescape/auth/LoginRequest.java → src/main/java/com/yourssu/roomescape/auth/dto/LoginRequest.java

@@ -1,4 +1,4 @@
-package com.yourssu.roomescape.auth;
+package com.yourssu.roomescape.auth.dto;
 
 public record LoginRequest(String email, String password) {
 }

src/main/java/com/yourssu/roomescape/exception/ErrorCode.java

@@ -8,6 +8,8 @@ public enum ErrorCode {
 	COOKIE_NOT_FOUND(HttpStatus.UNAUTHORIZED, "쿠키가 존재하지 않습니다."),
 	TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "쿠키에 토큰이 존재하지 않습니다."),
 	MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "사용자의 정보를 찾을 수 없습니다."),
+	TIME_NOT_FOUND(HttpStatus.NOT_FOUND, "시간 정보를 찾을 수 없습니다."),
+	THEME_NOT_FOUND(HttpStatus.NOT_FOUND, "테마 정보를 찾을 수 없습니다."),
 	INVALID_RESERVATION_REQUEST(HttpStatus.BAD_REQUEST, "예약 요청 값이 누락되었습니다."),
 	UNAUTHORIZED_ACCESS(HttpStatus.FORBIDDEN, "해당 접근에 대한 권한이 없습니다."),
 	DUPLICATE_MEMBER_NAME_EXISTS(HttpStatus.INTERNAL_SERVER_ERROR, "중복된 이름이 존재합니다. 관리자에게 문의하세요.");

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

@@ -1,6 +1,15 @@
 package com.yourssu.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,11 @@ public Member(String name, String email, String password, String role) {
         this.role = role;
     }
 
+    public Member() {
+
+    }
+
+
     public Long getId() {
         return id;
     }

src/main/java/com/yourssu/roomescape/member/MemberController.java

@@ -1,5 +1,7 @@
 package com.yourssu.roomescape.member;
 
+import com.yourssu.roomescape.member.dto.MemberRequest;
+import com.yourssu.roomescape.member.dto.MemberResponse;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.http.ResponseEntity;

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

@@ -0,0 +1,12 @@
+package com.yourssu.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);
+    Optional<Member> findByEmail(String email);
+    Optional<Member> findByName(String name);
+}

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

@@ -1,17 +1,19 @@
 package com.yourssu.roomescape.member;
 
+import com.yourssu.roomescape.member.dto.MemberRequest;
+import com.yourssu.roomescape.member.dto.MemberResponse;
 import org.springframework.stereotype.Service;
 
 @Service
 public class MemberService {
-    private 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/com/yourssu/roomescape/member/MemberRequest.java → src/main/java/com/yourssu/roomescape/member/dto/MemberRequest.java

@@ -1,4 +1,4 @@
-package com.yourssu.roomescape.member;
+package com.yourssu.roomescape.member.dto;
 
 public class MemberRequest {
     private String name;

src/main/java/com/yourssu/roomescape/member/MemberResponse.java → src/main/java/com/yourssu/roomescape/member/dto/MemberResponse.java

@@ -1,4 +1,4 @@
-package com.yourssu.roomescape.member;
+package com.yourssu.roomescape.member.dto;
 
 public class MemberResponse {
     private Long id;

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

@@ -1,28 +1,48 @@
 package com.yourssu.roomescape.reservation;
 
+import com.yourssu.roomescape.member.Member;
 import com.yourssu.roomescape.theme.Theme;
 import com.yourssu.roomescape.time.Time;
+import jakarta.persistence.*;
 
+@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) {
+    @Enumerated(EnumType.STRING)
+    private ReservationStatus status;
+
+    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, ReservationStatus status) {
+        this.member = member;
         this.date = date;
         this.time = time;
         this.theme = theme;
+        this.status = status;
     }
 
     public Reservation() {
@@ -33,8 +53,8 @@ public Long getId() {
         return id;
     }
 
-    public String getName() {
-        return name;
+    public Member getMember() {
+        return member;
     }
 
     public String getDate() {
@@ -48,4 +68,8 @@ public Time getTime() {
     public Theme getTheme() {
         return theme;
     }
+
+    public ReservationStatus getStatus() {
+        return status;
+    }
 }

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

@@ -4,14 +4,17 @@
 import com.yourssu.roomescape.exception.CustomException;
 import com.yourssu.roomescape.exception.ErrorCode;
 import com.yourssu.roomescape.member.Member;
-import com.yourssu.roomescape.theme.ThemeDao;
+import com.yourssu.roomescape.reservation.dto.ReservationFindAllResponse;
+import com.yourssu.roomescape.reservation.dto.ReservationSaveRequest;
+import com.yourssu.roomescape.reservation.dto.ReservationSaveResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URI;
 import java.util.List;
 
 @RestController
+@RequestMapping("/reservations")
 public class ReservationController {
 
     private final ReservationService reservationService;
@@ -20,23 +23,23 @@ public ReservationController(ReservationService reservationService) {
         this.reservationService = reservationService;
     }
 
-    @GetMapping("/reservations")
-    public List<ReservationResponse> list() {
-        return reservationService.findAll();
+    @GetMapping("/mine")
+    public List<ReservationFindAllResponse> getMyReservations(@LoginMember Member member) {
+        return reservationService.getMyReservations(member);
     }
 
-    @PostMapping("/reservations")
-    public ResponseEntity<ReservationResponse> create(@RequestBody ReservationRequest reservationRequest, @LoginMember Member member) {
-        if (reservationRequest.getDate() == null || reservationRequest.getTheme() == null || reservationRequest.getTime() == null) {
+    @PostMapping
+    public ResponseEntity<ReservationSaveResponse> create(@RequestBody ReservationSaveRequest reservationSaveRequest, @LoginMember Member member) {
+        if (reservationSaveRequest.date() == null || reservationSaveRequest.theme() == null || reservationSaveRequest.time() == null || reservationSaveRequest.status() == null) {
             throw new CustomException(ErrorCode.INVALID_RESERVATION_REQUEST);
         }
 
-        ReservationResponse reservation = reservationService.save(reservationRequest, member);
+        ReservationSaveResponse reservation = reservationService.save(reservationSaveRequest, member);
 
-        return ResponseEntity.created(URI.create("/reservations/" + reservation.getId())).body(reservation);
+        return ResponseEntity.created(URI.create("/reservations/" + reservation.id())).body(reservation);
     }
 
-    @DeleteMapping("/reservations/{id}")
+    @DeleteMapping("/{id}")
     public ResponseEntity delete(@PathVariable Long id) {
         reservationService.deleteById(id);
         return ResponseEntity.noContent().build();