[그리디] 이채현 JPA4-5단계 미션 제출합니다

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/README.md

@@ -4,26 +4,18 @@
 
 
 ---
-##  Spring MVC 미션 3단계 - 관리자 기능
+##  Spring JPA 4-5단계
+
+entity매니저를 사용해서 repository 수정
+jpa 전환 및 내 예약 구성코드를 생성함.
 
-어드민 페이지 진입은 admin 권한이 있는 사람만 할 수 있도록 제한한다.
-만약 진입 권한이 없다면 401 코드를 응답하도록 한다.
 
 ---
 ### 고민한 내용 🤔
 
-- HandlerInterceptor에서 기본적으로 preHandle/postHandle/afterCompletion으로 나뉘어져있던데,
-이번의 경우에는 admin페이지 접속만을 확인하면 되는거라서 preHandle만을 사용했습니다.
-이경우에는 postHandle과 afterCompletion을 어떻게 구성하면 좋을지..? 알고 싶네요.
-
-
-- WebConfig 같은 경우에는, admin 페이지를 접속할때의 role만을 확인해주면 되므로 /admin/***을 사용해주었습니다.
-
-- token 만료시간도 있어야할 것 같아서 expire_time을 이용해서,만료시간을 구현해보았습니다. 만료시간을 구현할 더 좋은
-방법이 있을지?? 궁금합니다.
-
-- token을 accessToken과 refreshToken으로 나눠서 구현해주었는데, 구현하다보니 너무 어려워서 제대로 구현된건지 잘 
-모르겠습니다.
-
+- jpa를 구성하는 과정에서 @entity를 사용하는 과정에서 많은 부분을
+  entity 객체가 대신해주니까 그 부분이 이해가 살짝 안되고 어려웠습니다.
+- 그리고 entity 매니저를 사용하게 된다면, jpa와 달리 어떠한 부분이 더 좋다고
+  느낀지 그 부분이 궁금해요!
 
 

src/main/java/roomescape/CookieManager.java

@@ -1,13 +1,13 @@
 package roomescape;
 
 import jakarta.servlet.http.Cookie;
+import org.springframework.stereotype.Component;
 import roomescape.exception.TokenNotFoundException;
 
 import java.util.Arrays;
 
+@Component
 public class CookieManager {
-
-
     public String extractToken(Cookie[] cookies, String cookieName) {
         return Arrays.stream(cookies)
                 .filter(cookie -> cookieName.equals(cookie.getName()))

src/main/java/roomescape/login/LoginInterceptor.java

@@ -8,32 +8,41 @@
 import roomescape.CookieManager;
 import roomescape.JwtProvider;
 import roomescape.member.Member;
-import roomescape.member.MemberDao;
+import roomescape.member.MemberRepository;
 
 @Component
 public class LoginInterceptor implements HandlerInterceptor {
 
     private final JwtProvider jwtProvider;
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
     private final CookieManager cookieManager;
 
-    public LoginInterceptor(JwtProvider jwtProvider, MemberDao memberDao, CookieManager cookieManager) {
+    public LoginInterceptor(JwtProvider jwtProvider, MemberRepository memberRepository, CookieManager cookieManager) {
         this.jwtProvider = jwtProvider;
-        this.memberDao = memberDao;
+        this.memberRepository = memberRepository;
         this.cookieManager = cookieManager;
     }
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        Cookie[] cookies = request.getCookies();
+        Cookie[] cookies = getCookies(request);
 
-        String token = cookieManager.extractToken(cookies, "accessToken");
+        String token = cookieManager.extractToken(cookies,"accessToken");
         Long memberId = jwtProvider.getMemberId(token);
-        Member member = memberDao.findById(memberId);
-        if (member == null || !member.getRole().equals("ADMIN")) {
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow();
+        if (!member.getRole().equals("ADMIN")) {
             response.setStatus(401);
             return false;
         }
         return true;
     }
+
+    private Cookie[] getCookies(HttpServletRequest httpServletRequest) {
+        Cookie[] cookies = httpServletRequest.getCookies();
+        if (cookies == null) {
+            throw new IllegalStateException("cookie is not exist");
+        }
+        return cookies;
+    }
 }

src/main/java/roomescape/login/LoginMemberArgumentResolver.java

@@ -11,15 +11,15 @@
 import roomescape.CookieManager;
 import roomescape.JwtProvider;
 import roomescape.member.Member;
-import roomescape.member.MemberDao;
+import roomescape.member.MemberRepository;
 
 @Component
 public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver {
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
     private final JwtProvider jwtProvider;
     private final CookieManager cookieManager;
-    public LoginMemberArgumentResolver(JwtProvider jwtProvider, MemberDao memberDao,CookieManager cookieManager) {
-        this.memberDao = memberDao;
+    public LoginMemberArgumentResolver(JwtProvider jwtProvider, MemberRepository memberRepository,CookieManager cookieManager) {
+        this.memberRepository = memberRepository;
         this.jwtProvider = jwtProvider;
         this.cookieManager=cookieManager;
     }
@@ -38,7 +38,8 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
 
         Long memberId = jwtProvider.getMemberId(token);
 
-        Member member = memberDao.findById(memberId);
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow();
 
         return new LoginMember(member.getId(), member.getName(), member.getEmail(), member.getRole());
     }
@@ -58,5 +59,4 @@ private Cookie[] getCookies(HttpServletRequest httpServletRequest) {
         }
         return cookies;
     }
-
 }

src/main/java/roomescape/login/LoginService.java

@@ -2,36 +2,34 @@
 
 import org.springframework.stereotype.Service;
 import roomescape.member.Member;
-import roomescape.member.MemberDao;
+import roomescape.member.MemberRepository;
 import roomescape.member.MemberResponse;
 
 @Service
 public class LoginService {
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
 
-    public LoginService(MemberDao memberDao) {
-        this.memberDao = memberDao;
+    public LoginService(MemberRepository memberDao) {
+        this.memberRepository = memberDao;
     }
 
     public Member login(String email, String password) {
-        Member member = memberDao.findByEmailAndPassword(email, password);
-        if (member == null) {
-            throw new RuntimeException("Invalid email or password");
-        }
+        Member member = memberRepository.findByEmailAndPassword(email, password)
+                .orElseThrow();
+
         return member;
     }
 
     public MemberResponse checkLogin(Long memberId) {
 
-        Member member = memberDao.findById(memberId);
-        if (member == null) {
-            throw new RuntimeException("Invalid email or password");
-        }
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow();
         return new MemberResponse(member.getId(), member.getName(), member.getEmail());
     }
 
     public Member findById(Long id) {
-        Member member = memberDao.findById(id);
+        Member member = memberRepository.findById(id)
+                .orElseThrow();
 
         return member;
     }

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

@@ -1,19 +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(Long id, String name, String email, String role) {
-        this.id = id;
-        this.name = name;
-        this.email = email;
-        this.role = role;
-    }
+    protected Member(){
 
+    }
     public Member(String name, String email, String password, String role) {
         this.name = name;
         this.email = email;

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

@@ -0,0 +1,44 @@
+package roomescape.member;
+
+import jakarta.persistence.EntityManager;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public class MemberRepository {
+    private final EntityManager entityManager;
+
+    public MemberRepository(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+
+    public Optional<Member> findById(Long id) {
+        return Optional.ofNullable(entityManager.find(Member.class, id));
+    }
+
+    public void save(Member member) {
+        entityManager.persist(member);
+    }
+
+    public List<Member> findAll() {
+        return entityManager.createQuery(
+                "SELECT m FROM Member m",
+                Member.class
+        ).getResultList();
+    }
+
+    public Optional<Member> findByEmailAndPassword(String email, String password) {
+        List<Member> members = entityManager.createQuery(
+                        "SELECT m FROM Member m WHERE m.email= :email AND m.password =:password",
+                        Member.class
+                ).setParameter("email", email)
+                .setParameter("password", password)
+                .getResultList();
+
+        return members.stream().findFirst();
+    }
+
+
+}

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

@@ -4,14 +4,21 @@
 
 @Service
 public class MemberService {
-    private MemberDao memberDao;
+    private final MemberRepository memberRepository;
 
-    public MemberService(MemberDao memberDao) {
-        this.memberDao = memberDao;
+    public MemberService(MemberRepository memberDao) {
+        this.memberRepository = memberDao;
     }
 
     public MemberResponse createMember(MemberRequest memberRequest) {
-        Member member = memberDao.save(new Member(memberRequest.getName(), memberRequest.getEmail(), memberRequest.getPassword(), "USER"));
+        Member member =
+                new Member(
+                        memberRequest.getName(),
+                        memberRequest.getEmail(),
+                        memberRequest.getPassword(),
+                        "USER");
+
+        memberRepository.save(member);
         return new MemberResponse(member.getId(), member.getName(), member.getEmail());
     }
 }

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

@@ -1,13 +1,26 @@
 package roomescape.reservation;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 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) {