예약 관련 API 구현

.github/workflows/deploy-prod.yml

@@ -136,7 +136,7 @@ jobs:
             set -e
 
             echo "🩺 Checking Application Health..."
-            RESPONSE=\$(curl -s "https://${{ secrets.PROD_SERVER_URL }}/")
+            RESPONSE=\$(curl -s "https://${{ secrets.PROD_SERVER_URL }}/health")
 
             if [ "\$RESPONSE" = "OK" ]; then
               echo "DEPLOYMENT_STATUS=successful"

build.gradle.kts

@@ -30,6 +30,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-mail")
 	implementation("org.springframework.boot:spring-boot-starter-validation")
 	implementation("org.springframework.boot:spring-boot-starter-actuator")
+	implementation("org.springframework.boot:spring-boot-starter-cache")
 
 	/** AOP */
 	implementation("org.aspectj:aspectjweaver:1.9.19")
@@ -49,6 +50,9 @@ dependencies {
 	runtimeOnly("org.mariadb.jdbc:mariadb-java-client:3.5.1")
 	runtimeOnly("com.h2database:h2:2.3.232")
 
+	/** Cache */
+	implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")
+
 	/** QueryDSL */
 	implementation("com.querydsl:querydsl-jpa:5.1.0:jakarta")
 	annotationProcessor("com.querydsl:querydsl-apt:5.1.0:jakarta")

src/main/java/com/ampersand/groom/domain/auth/application/service/AuthService.java

@@ -1,16 +1,19 @@
 package com.ampersand.groom.domain.auth.application.service;
 
 import com.ampersand.groom.domain.auth.application.port.AuthPort;
-import com.ampersand.groom.domain.auth.expection.*;
 import com.ampersand.groom.domain.auth.domain.JwtToken;
+import com.ampersand.groom.domain.auth.exception.*;
 import com.ampersand.groom.domain.auth.presentation.data.request.SignupRequest;
+import com.ampersand.groom.domain.member.domain.constant.MemberRole;
 import com.ampersand.groom.domain.member.persistence.entity.MemberJpaEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Service
 @RequiredArgsConstructor
@@ -27,74 +30,95 @@ public class AuthService {
     private long refreshTokenExpiration;
 
     public JwtToken signIn(String email, String password) {
+        MemberJpaEntity user = findUserByEmail(email);
+        validateUserStatus(user);
+        validatePassword(password, user.getPassword());
+        return generateJwtToken(email, user.getRole());
+    }
 
-        MemberJpaEntity user = authPort.findMembersByCriteria(email)
-                .orElseThrow(()->new UserNotFoundException());
+    public JwtToken refreshToken(String refreshToken) {
+        validateRefreshToken(refreshToken);
+        String email = jwtService.getEmailFromToken(refreshToken);
+        validateToken(email, refreshToken);
+        MemberJpaEntity user = findUserByEmail(email);
+        return generateJwtToken(email, user.getRole());
+    }
 
-        if(!user.getIsAvailable()) {
+    public void signup(SignupRequest request) {
+        checkUserExists(request.getEmail());
+        MemberJpaEntity newUser = createNewUser(request, calculateGenerationFromEmail(request.getEmail()));
+        authPort.save(newUser);
+    }
+
+    private MemberJpaEntity findUserByEmail(String email) {
+        return authPort.findMembersByCriteria(email)
+                .orElseThrow(UserNotFoundException::new);
+    }
+
+    private void validateUserStatus(MemberJpaEntity user) {
+        if (!user.getIsAvailable()) {
             throw new UserForbiddenException();
         }
+    }
 
-        if (!passwordEncoder.matches(password, user.getPassword())) {
+    private void validatePassword(String rawPassword, String encodedPassword) {
+        if (!passwordEncoder.matches(rawPassword, encodedPassword)) {
             throw new PasswordInvalidException();
         }
+    }
 
-        String accessToken = jwtService.createAccessToken(email);
-        String refreshToken = jwtService.createRefreshToken(email);
-
+    private JwtToken generateJwtToken(String email, MemberRole role) {
+        String accessToken = jwtService.createAccessToken(email, role);
+        String refreshToken = jwtService.createRefreshToken(email, role);
         return JwtToken.builder()
                 .accessToken(accessToken)
                 .refreshToken(refreshToken)
                 .accessTokenExpiration(Instant.now().plusMillis(accessTokenExpiration))
                 .refreshTokenExpiration(Instant.now().plusMillis(refreshTokenExpiration))
-                .role(user.getRole())
+                .role(role)
                 .build();
     }
 
-    public JwtToken refreshToken(String refreshToken) {
+    private void validateRefreshToken(String refreshToken) {
         if (refreshToken == null || refreshToken.isEmpty()) {
             throw new RefreshTokenRequestFormatInvalidException();
         }
+    }
 
-        String email = jwtService.getEmailFromToken(refreshToken);
-        boolean isTokenValid = jwtService.refreshToken(email, refreshToken);
-        if (!isTokenValid) {
-            throw new RefreshTokenExpiredOrInvalidException();
-        }
-
-        if (!jwtService.validateToken(refreshToken)) {
+    private void validateToken(String email, String refreshToken) {
+        if (!jwtService.refreshToken(email, refreshToken) || !jwtService.validateToken(refreshToken)) {
             throw new RefreshTokenExpiredOrInvalidException();
         }
-
-        MemberJpaEntity user = authPort.findMembersByCriteria(email)
-                .orElseThrow(()->new UserNotFoundException());
-
-        String newAccessToken = jwtService.createAccessToken(email);
-        String newRefreshToken = jwtService.createRefreshToken(email);
-
-        return JwtToken.builder()
-                .accessToken(newAccessToken)
-                .refreshToken(newRefreshToken)
-                .accessTokenExpiration(Instant.now().plusMillis(accessTokenExpiration))
-                .refreshTokenExpiration(Instant.now().plusMillis(refreshTokenExpiration))
-                .role(user.getRole())
-                .build();
     }
 
-    public void signup(SignupRequest request) {
-        authPort.findMembersByCriteria(request.getEmail())
-                .ifPresent(emailVerification -> {
+    private void checkUserExists(String email) {
+        authPort.findMembersByCriteria(email)
+                .ifPresent(user -> {
                     throw new UserExistException();
                 });
+    }
+
+    private int calculateGenerationFromEmail(String email) {
+        try {
+            Matcher matcher = Pattern.compile("\\d{2}").matcher(email);
+            if (!matcher.find()) {
+                throw new EmailFormatInvalidException();
+            }
+            int admissionYear = Integer.parseInt(matcher.group()) + 2000;
+            return (admissionYear - 2017) + 1;
+        } catch (NumberFormatException e) {
+            throw new EmailFormatInvalidException();
+        }
+    }
 
-        MemberJpaEntity newUser = MemberJpaEntity.builder()
+    private MemberJpaEntity createNewUser(SignupRequest request, int generation) {
+        return MemberJpaEntity.builder()
                 .name(request.getName())
                 .email(request.getEmail())
                 .password(passwordEncoder.encode(request.getPassword()))
-                .generation(1)
+                .generation(generation)
                 .isAvailable(true)
+                .role(MemberRole.ROLE_STUDENT)
                 .build();
-
-        authPort.save(newUser);
     }
-}
+}

src/main/java/com/ampersand/groom/domain/auth/application/service/CustomUserDetailsService.java

@@ -1,7 +1,7 @@
 package com.ampersand.groom.domain.auth.application.service;
 
 import com.ampersand.groom.domain.auth.application.port.AuthPort;
-import com.ampersand.groom.domain.auth.expection.UserNotFoundException;
+import com.ampersand.groom.domain.auth.exception.UserNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;

src/main/java/com/ampersand/groom/domain/auth/application/service/EmailVerificationService.java

@@ -1,9 +1,9 @@
 package com.ampersand.groom.domain.auth.application.service;
 
 import com.ampersand.groom.domain.auth.application.port.EmailVerificationPort;
-import com.ampersand.groom.domain.auth.expection.EmailFormatInvalidException;
-import com.ampersand.groom.domain.auth.expection.VerificationCodeFormatInvalidException;
-import com.ampersand.groom.domain.auth.expection.VerificationCodeExpiredOrInvalidException;
+import com.ampersand.groom.domain.auth.exception.EmailFormatInvalidException;
+import com.ampersand.groom.domain.auth.exception.VerificationCodeFormatInvalidException;
+import com.ampersand.groom.domain.auth.exception.VerificationCodeExpiredOrInvalidException;
 import com.ampersand.groom.domain.auth.persistence.EmailVerification;
 import lombok.RequiredArgsConstructor;
 import org.springframework.mail.SimpleMailMessage;

src/main/java/com/ampersand/groom/domain/auth/application/service/JwtService.java

@@ -1,9 +1,11 @@
 package com.ampersand.groom.domain.auth.application.service;
 
+import com.ampersand.groom.domain.member.domain.constant.MemberRole;
 import io.jsonwebtoken.*;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -21,33 +23,29 @@ public class JwtService {
     private final long accessTokenExpiration;
     private final long refreshTokenExpiration;
 
-    public String createAccessToken(String email) {
-        return generateToken(email, accessTokenExpiration);
+    public String createAccessToken(String email, MemberRole roles) {
+        return generateToken(email, accessTokenExpiration, roles);
     }
 
-    public String createRefreshToken(String email) {
-        String refreshToken = generateToken(email, refreshTokenExpiration);
-
+    public String createRefreshToken(String email, MemberRole roles) {
+        String refreshToken = generateToken(email, refreshTokenExpiration, roles);
         redisTemplate.opsForValue().set("refresh_token:" + email, refreshToken, refreshTokenExpiration, TimeUnit.SECONDS);
-
         return refreshToken;
     }
 
     public boolean refreshToken(String email, String refreshToken) {
         String storedToken = redisTemplate.opsForValue().get("refresh_token:" + email);
 
-        if (storedToken == null || !storedToken.equals(refreshToken)) {
-            return false;
-        }
-        return true;
+        return storedToken != null && storedToken.equals(refreshToken);
     }
 
-    private String generateToken(String subject, long expirationMs) {
+    private String generateToken(String subject, long expirationMs, MemberRole roles) {
         Date now = new Date();
         return Jwts.builder()
-                .setSubject(subject)
-                .setIssuedAt(now)
-                .setExpiration(new Date(now.getTime() + expirationMs))
+                .claim("sub", subject)
+                .claim("iat", now.getTime())
+                .claim("exp", now.getTime() + expirationMs)
+                .claim("role", roles)
                 .signWith(secretKey)
                 .compact();
     }
@@ -56,6 +54,12 @@ public String getEmailFromToken(String token) {
         return parseClaims(token).getSubject();
     }
 
+    public MemberRole getRoleFromToken(String token) {
+        Claims claims = parseClaims(token);
+        String role = claims.get("role", String.class);
+        return role != null ? MemberRole.valueOf(role) : null;
+    }
+
     public boolean validateToken(String token) {
         try {
             parseClaims(token);
@@ -67,10 +71,10 @@ public boolean validateToken(String token) {
 
     private Claims parseClaims(String token) {
         return Jwts.parser()
-                .setSigningKey(secretKey)
+                .verifyWith(secretKey)
                 .build()
-                .parseClaimsJws(token)
-                .getBody();
+                .parseSignedClaims(token)
+                .getPayload();
     }
 
     public String resolveToken(HttpServletRequest request) {

src/main/java/com/ampersand/groom/domain/auth/expection/EmailFormatInvalidException.java → src/main/java/com/ampersand/groom/domain/auth/exception/EmailFormatInvalidException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/EmailOrPasswordEmptyException.java → src/main/java/com/ampersand/groom/domain/auth/exception/EmailOrPasswordEmptyException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/PasswordInvalidException.java → src/main/java/com/ampersand/groom/domain/auth/exception/PasswordInvalidException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/RefreshTokenExpiredOrInvalidException.java → src/main/java/com/ampersand/groom/domain/auth/exception/RefreshTokenExpiredOrInvalidException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/RefreshTokenRequestFormatInvalidException.java → src/main/java/com/ampersand/groom/domain/auth/exception/RefreshTokenRequestFormatInvalidException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/UserExistException.java → src/main/java/com/ampersand/groom/domain/auth/exception/UserExistException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/UserForbiddenException.java → src/main/java/com/ampersand/groom/domain/auth/exception/UserForbiddenException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/UserNotFoundException.java → src/main/java/com/ampersand/groom/domain/auth/exception/UserNotFoundException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/VerificationCodeExpiredOrInvalidException.java → src/main/java/com/ampersand/groom/domain/auth/exception/VerificationCodeExpiredOrInvalidException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/expection/VerificationCodeFormatInvalidException.java → src/main/java/com/ampersand/groom/domain/auth/exception/VerificationCodeFormatInvalidException.java

@@ -1,4 +1,4 @@
-package com.ampersand.groom.domain.auth.expection;
+package com.ampersand.groom.domain.auth.exception;
 
 import com.ampersand.groom.global.error.ErrorCode;
 import com.ampersand.groom.global.error.exception.GroomException;

src/main/java/com/ampersand/groom/domain/auth/persistence/adapter/auth/AuthPortAdapter.java

@@ -16,8 +16,7 @@ public class AuthPortAdapter implements AuthPort {
 
     @Override
     public Optional<MemberJpaEntity> findMembersByCriteria(String email) {
-        return memberJpaRepository.findMembersByCriteria(null, null, null, email, null, null)
-                .stream().findFirst();
+        return memberJpaRepository.findMemberByEmail(email);
     }