[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,10 +20,9 @@ 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'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
     implementation 'io.jsonwebtoken:jjwt-impl:0.12.6'

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

@@ -1,7 +1,5 @@
 package com.yourssu.roomescape.auth;
 
-import com.yourssu.roomescape.exception.CustomException;
-import com.yourssu.roomescape.exception.ErrorCode;
 import com.yourssu.roomescape.jwt.TokenExtractor;
 import com.yourssu.roomescape.member.Member;
 import jakarta.servlet.http.Cookie;
@@ -25,9 +23,10 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
         String token = TokenExtractor.extractTokenFromCookies(cookies);
         Member member = authService.checkLogin(token);
 
-        if(!"ADMIN".equals(member.getRole())) {
+        if(!member.isAdmin()) {
             response.setStatus(401);
-            response.getWriter().write("해당 접근에 대한 권한이 없습니다.");
+            response.setContentType("application/json; charset=UTF-8");
+            response.getWriter().write("{\"code\":\"NOT_ADMIN\",\"message\":\"관리자 권한이 필요합니다.\"}");
             return false;
         }
 

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;
@@ -10,8 +12,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-
 @RestController
 public class AuthController {
 
@@ -36,7 +36,6 @@ public ResponseEntity<Void> login(@RequestBody LoginRequest loginRequest, HttpSe
     public ResponseEntity<CheckLoginResponse> loginCheck(HttpServletRequest request) {
 
         Cookie[] cookies = request.getCookies();
-        System.out.println(Arrays.toString(cookies));
         String token = TokenExtractor.extractTokenFromCookies(cookies);
 
         String name = authService.checkLogin(token).getName();

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

@@ -5,12 +5,31 @@
 public enum ErrorCode {
 
 	INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버에 문제가 생겼습니다."),
+
+	// Auth
 	COOKIE_NOT_FOUND(HttpStatus.UNAUTHORIZED, "쿠키가 존재하지 않습니다."),
 	TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "쿠키에 토큰이 존재하지 않습니다."),
+
+	// Member
 	MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "사용자의 정보를 찾을 수 없습니다."),
-	INVALID_RESERVATION_REQUEST(HttpStatus.BAD_REQUEST, "예약 요청 값이 누락되었습니다."),
-	UNAUTHORIZED_ACCESS(HttpStatus.FORBIDDEN, "해당 접근에 대한 권한이 없습니다."),
-	DUPLICATE_MEMBER_NAME_EXISTS(HttpStatus.INTERNAL_SERVER_ERROR, "중복된 이름이 존재합니다. 관리자에게 문의하세요.");
+	NOT_ADMIN(HttpStatus.FORBIDDEN, "관리자 권한이 필요합니다."),
+	EMAIL_ALREADY_EXISTS(HttpStatus.CONFLICT, "이메일 정보가 이미 존재합니다."),
+
+	// Reservation
+	RESERVATION_NOT_FOUND(HttpStatus.NOT_FOUND, "예약 정보를 찾을 수 없습니다."),
+	NO_PERMISSION_FOR_RESERVATION(HttpStatus.FORBIDDEN, "해당 예약에 대한 권한이 없습니다."),
+	RESERVATION_ALREADY_EXISTS(HttpStatus.CONFLICT, "예약 정보가 이미 존재합니다."),
+	CANNOT_WAIT_WITHOUT_RESERVED(HttpStatus.BAD_REQUEST, "예약이 없는 상태에서는 대기를 신청할 수 없습니다."),
+
+	// Time
+	TIME_NOT_FOUND(HttpStatus.NOT_FOUND, "시간 정보를 찾을 수 없습니다."),
+	TIME_IN_USE(HttpStatus.BAD_REQUEST, "해당 시간은 예약이 존재하여 삭제할 수 없습니다."),
+	TIME_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 존재하는 시간입니다."),
+
+	// Theme
+	THEME_NOT_FOUND(HttpStatus.NOT_FOUND, "테마 정보를 찾을 수 없습니다."),
+	THEME_IN_USE(HttpStatus.BAD_REQUEST, "해당 테마는 예약이 존재하여 삭제할 수 없습니다."),
+	THEME_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 존재하는 테마입니다.");
 
 	private final HttpStatus status;
 	private final String message;

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

@@ -1,26 +1,40 @@
 package com.yourssu.roomescape.member;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+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;
+
+    @Column(unique = true)
     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;
-    }
+    @Enumerated(EnumType.STRING)
+    private MemberRole role;
 
-    public Member(String name, String email, String password, String role) {
+    public Member(String name, String email, String password, MemberRole role) {
         this.name = name;
         this.email = email;
         this.password = password;
         this.role = role;
     }
 
+    protected Member() {
+
+    }
+
     public Long getId() {
         return id;
     }
@@ -37,7 +51,11 @@ public String getPassword() {
         return password;
     }
 
-    public String getRole() {
+    public MemberRole getRole() {
         return role;
     }
+
+    public boolean isAdmin() {
+        return this.role == MemberRole.ADMIN;
+    }
 }

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

@@ -1,7 +1,10 @@
 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 jakarta.validation.Valid;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,9 +21,9 @@ public MemberController(MemberService memberService) {
     }
 
     @PostMapping("/members")
-    public ResponseEntity createMember(@RequestBody MemberRequest memberRequest) {
+    public ResponseEntity createMember(@RequestBody @Valid MemberRequest memberRequest) {
         MemberResponse member = memberService.createMember(memberRequest);
-        return ResponseEntity.created(URI.create("/members/" + member.getId())).body(member);
+        return ResponseEntity.created(URI.create("/members/" + member.id())).body(member);
     }
 
     @PostMapping("/logout")

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

@@ -0,0 +1,13 @@
+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);
+    boolean existsByEmail(String email);
+}

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

@@ -0,0 +1,5 @@
+package com.yourssu.roomescape.member;
+
+public enum MemberRole {
+    ADMIN, USER
+}