[우아한명지코스] 고건 Spring Data JPA 4, 5, 6단계 미션 제출합니다.

build.gradle

@@ -16,7 +16,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     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/AuthService.java

@@ -3,6 +3,7 @@
 import org.springframework.stereotype.Service;
 import roomescape.auth.dto.LoginResponse;
 import roomescape.member.domain.Member;
+import roomescape.member.dto.MemberAuthInfo;
 
 @Service
 public class AuthService {
@@ -13,11 +14,11 @@ public AuthService(JwtTokenProvider jwtTokenProvider) {
         this.jwtTokenProvider = jwtTokenProvider;
     }
 
-    public LoginResponse createToken(Member member) {
+    public LoginResponse createToken(MemberAuthInfo memberAuthInfo) {
         String accessToken = jwtTokenProvider.createToken(
-                member.getId(),
-                member.getName(),
-                member.getRole().name());
+                memberAuthInfo.memberId(),
+                memberAuthInfo.name(),
+                memberAuthInfo.stringRole());
 
         return new LoginResponse(accessToken);
     }

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

@@ -15,6 +15,7 @@
 import roomescape.auth.dto.LoginRequest;
 import roomescape.auth.dto.LoginResponse;
 import roomescape.member.domain.Member;
+import roomescape.member.dto.MemberAuthInfo;
 import roomescape.member.dto.MemberRequest;
 import roomescape.member.dto.MemberResponse;
 
@@ -44,8 +45,9 @@ public ResponseEntity createMember(@RequestBody MemberRequest memberRequest) {
     @PostMapping("/login")
     public ResponseEntity login(@RequestBody LoginRequest loginRequest,
             HttpServletResponse httpServletResponse) {
-        Member member = memberService.getMemberWithLoginRequest(loginRequest);
-        LoginResponse loginResponse = authService.createToken(member);
+        MemberAuthInfo memberAuthInfo = memberService.getMemberWithLoginRequest(
+                loginRequest);
+        LoginResponse loginResponse = authService.createToken(memberAuthInfo);
 
         Cookie cookie = new Cookie("token", loginResponse.accessToken());
         cookie.setHttpOnly(true);

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

@@ -1,74 +1,74 @@
-package roomescape.member;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-import roomescape.member.domain.Member;
-import roomescape.member.domain.Role;
-
-@Repository
-public class MemberDao {
-
-    private JdbcTemplate jdbcTemplate;
-
-    public MemberDao(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
-    }
-
-    public Member save(Member member) {
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-        jdbcTemplate.update(connection -> {
-            var ps = connection.prepareStatement(
-                    "INSERT INTO member(name, email, password, role) VALUES (?, ?, ?, ?)",
-                    new String[]{"id"});
-            ps.setString(1, member.getName());
-            ps.setString(2, member.getEmail());
-            ps.setString(3, member.getPassword());
-            ps.setString(4, member.getRole().name());
-            return ps;
-        }, keyHolder);
-
-        return new Member(keyHolder.getKey().longValue(), member.getName(), member.getEmail(),
-                Role.USER);
-    }
-
-    public Member findByEmailAndPassword(String email, String password) {
-        return jdbcTemplate.queryForObject(
-                "SELECT id, name, email, role FROM member WHERE email = ? AND password = ?",
-                (rs, rowNum) -> new Member(
-                        rs.getLong("id"),
-                        rs.getString("name"),
-                        rs.getString("email"),
-                        Role.valueOf(rs.getString("role"))
-                ),
-                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
-        );
-    }
-
-    public Member findById(Long id) {
-        return jdbcTemplate.queryForObject(
-                "SELECT id, name, email, role FROM member WHERE id = ?",
-                (rs, rowNum) -> new Member(
-                        rs.getLong("id"),
-                        rs.getString("name"),
-                        rs.getString("email"),
-                        Role.valueOf(rs.getString("role"))
-                ),
-                id
-        );
-    }
-}
+//package roomescape.member;
+//
+//import org.springframework.jdbc.core.JdbcTemplate;
+//import org.springframework.jdbc.support.GeneratedKeyHolder;
+//import org.springframework.jdbc.support.KeyHolder;
+//import org.springframework.stereotype.Repository;
+//import roomescape.member.domain.Member;
+//import roomescape.member.domain.Role;
+//
+//@Repository
+//public class MemberDao {
+//
+//    private JdbcTemplate jdbcTemplate;
+//
+//    public MemberDao(JdbcTemplate jdbcTemplate) {
+//        this.jdbcTemplate = jdbcTemplate;
+//    }
+//
+//    public Member save(Member member) {
+//        KeyHolder keyHolder = new GeneratedKeyHolder();
+//        jdbcTemplate.update(connection -> {
+//            var ps = connection.prepareStatement(
+//                    "INSERT INTO member(name, email, password, role) VALUES (?, ?, ?, ?)",
+//                    new String[]{"id"});
+//            ps.setString(1, member.getName());
+//            ps.setString(2, member.getEmail());
+//            ps.setString(3, member.getPassword());
+//            ps.setString(4, member.getRole().name());
+//            return ps;
+//        }, keyHolder);
+//
+//        return new Member(keyHolder.getKey().longValue(), member.getName(), member.getEmail(),
+//                Role.USER);
+//    }
+//
+//    public Member findByEmailAndPassword(String email, String password) {
+//        return jdbcTemplate.queryForObject(
+//                "SELECT id, name, email, role FROM member WHERE email = ? AND password = ?",
+//                (rs, rowNum) -> new Member(
+//                        rs.getLong("id"),
+//                        rs.getString("name"),
+//                        rs.getString("email"),
+//                        Role.valueOf(rs.getString("role"))
+//                ),
+//                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
+//        );
+//    }
+//
+//    public Member findById(Long id) {
+//        return jdbcTemplate.queryForObject(
+//                "SELECT id, name, email, role FROM member WHERE id = ?",
+//                (rs, rowNum) -> new Member(
+//                        rs.getLong("id"),
+//                        rs.getString("name"),
+//                        rs.getString("email"),
+//                        Role.valueOf(rs.getString("role"))
+//                ),
+//                id
+//        );
+//    }
+//}

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

@@ -1,38 +1,46 @@
 package roomescape.member;
 
+import java.util.Optional;
 import org.springframework.stereotype.Service;
 import roomescape.auth.dto.LoginRequest;
 import roomescape.member.domain.Member;
 import roomescape.member.domain.Role;
+import roomescape.member.dto.MemberAuthInfo;
 import roomescape.member.dto.MemberRequest;
 import roomescape.member.dto.MemberResponse;
+import roomescape.member.repository.MemberRepository;
 
 @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.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());
     }
 
-    public Member getMemberWithLoginRequest(LoginRequest loginRequest) {
-        return memberDao.findByEmailAndPassword(
+    public MemberAuthInfo getMemberWithLoginRequest(LoginRequest loginRequest) {
+        Optional<Member> memberOptional = memberRepository.findByEmailAndPassword(
                 loginRequest.email(),
                 loginRequest.password());
-    }
+        Member member = memberOptional.orElseThrow();
+
+        return new MemberAuthInfo(
+                member.getId(),
+                member.getName(),
+                member.getRole().name()
+        );
 
-    public Member findById(Long id) {
-        return memberDao.findById(id);
     }
 
-    public Member findByName(String name) {
-        return memberDao.findByName(name);
+    public Optional<Member> findByName(String name) {
+        return memberRepository.findByName(name);
     }
 }

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

@@ -1,13 +1,35 @@
 package roomescape.member.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import java.util.HashSet;
+import java.util.Set;
+import roomescape.reservation.domain.Reservation;
+
+@Entity
 public class Member {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     private String name;
+
     private String email;
+
     private String password;
+
+    @Enumerated(EnumType.STRING)
     private Role role;
 
+    @OneToMany(mappedBy = "member")
+    private Set<Reservation> reservations = new HashSet<>();
+
     public Member(Long id, String name, String email, Role role) {
         this.id = id;
         this.name = name;
@@ -22,6 +44,10 @@ public Member(String name, String email, String password, Role role) {
         this.role = role;
     }
 
+    public Member() {
+
+    }
+
     public Long getId() {
         return id;
     }
@@ -41,4 +67,8 @@ public String getPassword() {
     public Role getRole() {
         return role;
     }
+
+    public Set<Reservation> getReservations() {
+        return reservations;
+    }
 }

src/main/java/roomescape/member/dto/MemberAuthInfo.java

@@ -0,0 +1,5 @@
+package roomescape.member.dto;
+
+public record MemberAuthInfo(Long memberId, String name, String stringRole) {
+
+}

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

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

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

@@ -15,8 +15,11 @@
 import roomescape.member.domain.Member;
 import roomescape.member.domain.Role;
 import roomescape.member.MemberService;
+import roomescape.reservation.dto.MyReservationResponse;
 import roomescape.reservation.dto.ReservationRequest;
 import roomescape.reservation.dto.ReservationResponse;
+import roomescape.reservation.dto.WaitingRequest;
+import roomescape.reservation.dto.WaitingResponse;
 
 @RestController
 public class ReservationController {
@@ -35,6 +38,11 @@ public List<ReservationResponse> list() {
         return reservationService.findAll();
     }
 
+    @GetMapping("/reservations-mine")
+    public List<MyReservationResponse> getMyReservations(@LoginMember Member member) {
+        return reservationService.findByMember(member);
+    }
+
     @PostMapping("/reservations")
     public ResponseEntity create(@RequestBody @Valid ReservationRequest reservationRequest,
             @LoginMember Member loginMember) {
@@ -45,10 +53,24 @@ public ResponseEntity create(@RequestBody @Valid ReservationRequest reservationR
                 .body(reservation);
     }
 
-
     @DeleteMapping("/reservations/{id}")
-    public ResponseEntity delete(@PathVariable Long id) {
-        reservationService.deleteById(id);
+    public ResponseEntity delete(@PathVariable Long id,  @LoginMember Member member) {
+        reservationService.deleteById(id, member);
+        return ResponseEntity.noContent().build();
+    }
+
+    @PostMapping("/waitings")
+    public ResponseEntity createWaiting(@RequestBody @Valid WaitingRequest waitingRequest,
+            @LoginMember Member loginMember) {
+        WaitingResponse waiting = reservationService.saveWaiting(waitingRequest, loginMember);
+
+        return ResponseEntity.created(URI.create("/reservations/" + waiting.id()))
+                .body(waiting);
+    }
+
+    @DeleteMapping("/waitings/cancel/{id}")
+    public ResponseEntity cancelWaiting(@PathVariable Long id, @LoginMember Member member) {
+        reservationService.deleteWaitingById(id, member);
         return ResponseEntity.noContent().build();
     }
 
@@ -57,7 +79,7 @@ private Member resolveReservationMember(ReservationRequest reservationRequest,
         Member member;
 
         if (loginMember.getRole() == Role.ADMIN && reservationRequest.name() != null) {
-            member = memberService.findByName(reservationRequest.name());
+            member = memberService.findByName(reservationRequest.name()).orElseThrow();
             return member;
         }
         return loginMember;