[그리디] 정명준 Spring Data JPA 6단계 제출합니다.

src/main/java/roomescape/auth/controller/AuthController.java

@@ -15,7 +15,7 @@
 import roomescape.auth.service.AuthService;
 import roomescape.auth.web.Login;
 import roomescape.auth.web.TokenExtractor;
-import roomescape.util.CookieUtil;
+import roomescape.global.util.CookieUtil;
 
 @RestController
 public class AuthController {
@@ -52,7 +52,7 @@ public ResponseEntity<Void> loginByRefreshToken(HttpServletRequest request,
 
     @GetMapping("/login/check")
     public ResponseEntity<LoginCheckResponse> checkLogin(@Login LoginMember loginMember) {
-        return ResponseEntity.ok(new LoginCheckResponse(loginMember.name()));
+        return ResponseEntity.ok(LoginCheckResponse.from(loginMember));
     }
 
     @PostMapping("/logout")

src/main/java/roomescape/auth/dto/LoginCheckResponse.java

@@ -1,6 +1,12 @@
 package roomescape.auth.dto;
 
+import roomescape.auth.domain.LoginMember;
+
 public record LoginCheckResponse(
         String name
 ) {
+
+    public static LoginCheckResponse from(LoginMember loginMember) {
+        return new LoginCheckResponse(loginMember.name());
+    }
 }

src/main/java/roomescape/auth/dto/TokenResponse.java

@@ -4,4 +4,8 @@ public record TokenResponse(
         String accessToken,
         String refreshToken
 ) {
+
+    public static TokenResponse of(String accessToken, String refreshToken) {
+        return new TokenResponse(accessToken, refreshToken);
+    }
 }

src/main/java/roomescape/auth/entity/RefreshToken.java

@@ -27,11 +27,15 @@ public class RefreshToken {
     public RefreshToken() {
     }
 
-    public RefreshToken(Member member, String token) {
+    private RefreshToken(Member member, String token) {
         this.member = member;
         this.token = token;
     }
 
+    public static RefreshToken of(Member member, String token) {
+        return new RefreshToken(member, token);
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/roomescape/auth/exception/AuthErrorCode.java

@@ -1,7 +1,7 @@
 package roomescape.auth.exception;
 
 import org.springframework.http.HttpStatus;
-import roomescape.exception.ErrorCode;
+import roomescape.global.exception.ErrorCode;
 
 public enum AuthErrorCode implements ErrorCode {
     ACCESS_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."),

src/main/java/roomescape/auth/jwt/JwtTokenProvider.java

@@ -9,7 +9,7 @@
 import io.jsonwebtoken.security.SignatureException;
 import org.springframework.stereotype.Component;
 import roomescape.auth.exception.AuthErrorCode;
-import roomescape.exception.ApplicationException;
+import roomescape.global.exception.ApplicationException;
 import roomescape.member.entity.Member;
 
 import java.security.Key;

src/main/java/roomescape/auth/repository/RefreshTokenRepository.java

@@ -1,18 +1,17 @@
 package roomescape.auth.repository;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 import roomescape.auth.entity.RefreshToken;
 
 import java.util.Optional;
 
-public interface RefreshTokenRepository {
-
-    void save(RefreshToken refreshToken);
+@Repository
+public interface RefreshTokenRepository extends JpaRepository<RefreshToken, Long> {
 
     Optional<RefreshToken> findByToken(String token);
 
     Optional<RefreshToken> findByMemberId(Long memberId);
 
     void deleteByMemberId(Long memberId);
-
-    void flush();
 }

src/main/java/roomescape/auth/service/AuthService.java

@@ -9,7 +9,7 @@
 import roomescape.auth.exception.AuthErrorCode;
 import roomescape.auth.jwt.JwtTokenProvider;
 import roomescape.auth.repository.RefreshTokenRepository;
-import roomescape.exception.ApplicationException;
+import roomescape.global.exception.ApplicationException;
 import roomescape.member.entity.Member;
 import roomescape.member.exception.MemberErrorCode;
 import roomescape.member.repository.MemberRepository;
@@ -68,8 +68,8 @@ private TokenResponse createTokens(Member member) {
 
         refreshTokenRepository.deleteByMemberId(member.getId());
         refreshTokenRepository.flush();
-        refreshTokenRepository.save(new RefreshToken(member, refreshToken));
+        refreshTokenRepository.save(RefreshToken.of(member, refreshToken));
 
-        return new TokenResponse(accessToken, refreshToken);
+        return TokenResponse.of(accessToken, refreshToken);
     }
 }

src/main/java/roomescape/auth/web/CheckAdminInterceptor.java

@@ -7,7 +7,7 @@
 import roomescape.auth.domain.LoginMember;
 import roomescape.auth.exception.AuthErrorCode;
 import roomescape.auth.service.AuthService;
-import roomescape.exception.ApplicationException;
+import roomescape.global.exception.ApplicationException;
 
 @Component
 public class CheckAdminInterceptor implements HandlerInterceptor {

src/main/java/roomescape/auth/web/TokenExtractor.java

@@ -3,8 +3,8 @@
 import jakarta.servlet.http.Cookie;
 import org.springframework.stereotype.Component;
 import roomescape.auth.exception.AuthErrorCode;
-import roomescape.exception.ApplicationException;
-import roomescape.util.CookieUtil;
+import roomescape.global.exception.ApplicationException;
+import roomescape.global.util.CookieUtil;
 
 @Component
 public class TokenExtractor {

src/main/java/roomescape/config/WebConfig.java → src/main/java/roomescape/global/config/WebConfig.java

@@ -1,4 +1,4 @@
-package roomescape.config;
+package roomescape.global.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;

src/main/java/roomescape/global/entity/BaseSoftDeleteEntity.java

@@ -0,0 +1,25 @@
+package roomescape.global.entity;
+
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public class BaseSoftDeleteEntity {
+
+    private static final ZoneId KST_ZONE = ZoneId.of("Asia/Seoul");
+
+    private LocalDateTime deletedAt;
+
+    public void markDeleted() {
+        this.deletedAt = LocalDateTime.now(KST_ZONE);
+    }
+
+    public LocalDateTime getDeletedAt() {
+        return deletedAt;
+    }
+}

src/main/java/roomescape/exception/ApplicationException.java → src/main/java/roomescape/global/exception/ApplicationException.java

@@ -1,4 +1,4 @@
-package roomescape.exception;
+package roomescape.global.exception;
 
 public class ApplicationException extends RuntimeException {
 

src/main/java/roomescape/exception/ErrorCode.java → src/main/java/roomescape/global/exception/ErrorCode.java

@@ -1,4 +1,4 @@
-package roomescape.exception;
+package roomescape.global.exception;
 
 import org.springframework.http.HttpStatus;
 

src/main/java/roomescape/exception/ErrorResponse.java → src/main/java/roomescape/global/exception/ErrorResponse.java

@@ -1,4 +1,4 @@
-package roomescape.exception;
+package roomescape.global.exception;
 
 public record ErrorResponse(String message) {
 }

src/main/java/roomescape/exception/GlobalExceptionHandler.java → src/main/java/roomescape/global/exception/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package roomescape.exception;
+package roomescape.global.exception;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/roomescape/util/CookieUtil.java → src/main/java/roomescape/global/util/CookieUtil.java

@@ -1,4 +1,4 @@
-package roomescape.util;
+package roomescape.global.util;
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;

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

@@ -22,6 +22,6 @@ public MemberController(MemberService memberService) {
     @PostMapping("/members")
     public ResponseEntity createMember(@Valid @RequestBody MemberRequest memberRequest) {
         MemberResponse member = memberService.create(memberRequest);
-        return ResponseEntity.created(URI.create("/members/" + member.getId())).body(member);
+        return ResponseEntity.created(URI.create("/members/" + member.id())).body(member);
     }
 }

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

@@ -3,27 +3,13 @@
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 
-public class MemberRequest {
-
-    @NotBlank(message = "이름은 필수입니다.")
-    private String name;
-
-    @NotBlank(message = "이메일은 필수입니다.")
-    @Email(message = "이메일 형식이 올바르지 않습니다.")
-    private String email;
-
-    @NotBlank(message = "비밀번호는 필수입니다.")
-    private String password;
-
-    public String getName() {
-        return name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
+public record MemberRequest(
+        @NotBlank(message = "이름은 필수입니다.")
+        String name,
+        @NotBlank(message = "이메일은 필수입니다.")
+        @Email(message = "이메일 형식이 올바르지 않습니다.")
+        String email,
+        @NotBlank(message = "비밀번호는 필수입니다.")
+        String password
+) {
 }

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

@@ -1,25 +1,14 @@
 package roomescape.member.dto;
 
-public class MemberResponse {
-    private Long id;
-    private String name;
-    private String email;
+import roomescape.member.entity.Member;
 
-    public MemberResponse(Long id, String name, String email) {
-        this.id = id;
-        this.name = name;
-        this.email = email;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
+public record MemberResponse(
+        Long id,
+        String name,
+        String email
+) {
 
-    public String getEmail() {
-        return email;
+    public static MemberResponse from(Member member) {
+        return new MemberResponse(member.getId(), member.getName(), member.getEmail());
     }
 }

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

@@ -7,6 +7,7 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import roomescape.member.dto.MemberRequest;
 
 @Entity(name = "member")
 public class Member {
@@ -30,13 +31,17 @@ public class Member {
     public Member() {
     }
 
-    public Member(String name, String email, String password, Role role) {
+    private Member(String name, String email, String password, Role role) {
         this.name = name;
         this.email = email;
         this.password = password;
         this.role = role;
     }
 
+    public static Member of(String name, String email, String password, Role role) {
+        return new Member(name, email, password, role);
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/roomescape/member/exception/MemberErrorCode.java

@@ -1,7 +1,7 @@
 package roomescape.member.exception;
 
 import org.springframework.http.HttpStatus;
-import roomescape.exception.ErrorCode;
+import roomescape.global.exception.ErrorCode;
 
 public enum MemberErrorCode implements ErrorCode {
     MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 회원입니다."),