Feature/63 봉사자 조회, 상세 조회, 검증

build.gradle

@@ -116,6 +116,8 @@ def jacocoExcludePatterns = [
         '**/domain/*',
         '**/domains/*',
         '**/fixture/*',
+        '**/controller/**',
+        '**/fixture/*',
         '**/*Factory*'
 ]
 
@@ -132,6 +134,8 @@ def jacocoExcludePatternsForVerify = [
         '*.domain.*',
         '*.domains.*',
         '*.fixture.*',
+        '*.controller.*',
+        '*.fixture.*',
         '*.*Factory*'
 ]
 

src/main/java/com/somemore/auth/cookie/CookieService.java

@@ -16,12 +16,14 @@ public class CookieService implements CookieUseCase {
     public void setAccessToken(HttpServletResponse response, String value) {
         ResponseCookie cookie = generateCookie(TokenType.ACCESS, value);
         response.addHeader("Set-Cookie", cookie.toString());
+        log.info("SET_COOKIE_ACCESS_TOKEN = {}", value);
     }
 
     @Override
     public void deleteAccessToken(HttpServletResponse response) {
         ResponseCookie cookie = generateCookie(TokenType.SIGNOUT, TokenType.SIGNOUT.name());
         response.addHeader("Set-Cookie", cookie.toString());
+        log.info("DELETE_COOKIE_ACCESS_TOKEN");
     }
 
     private static ResponseCookie generateCookie(TokenType tokenType, String value) {

src/main/java/com/somemore/auth/jwt/domain/UserRole.java

@@ -1,7 +1,30 @@
 package com.somemore.auth.jwt.domain;
 
-public enum UserRole {
-    VOLUNTEER,
-    CENTER,
-    ADMIN
+import com.somemore.auth.jwt.exception.JwtException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.GrantedAuthority;
+
+import static com.somemore.auth.jwt.exception.JwtErrorType.UNKNOWN_ERROR;
+
+@RequiredArgsConstructor
+public enum UserRole implements GrantedAuthority {
+    VOLUNTEER("ROLE_VOLUNTEER"),
+    CENTER("ROLE_CENTER"),
+    ADMIN("ROLE_ADMIN");
+
+    private final String authority;
+
+    @Override
+    public String getAuthority() {
+        return this.authority;
+    }
+
+    public static UserRole from(String role) {
+        for (UserRole userRole : values()) {
+            if (userRole.name().equals(role)) {
+                return userRole;
+            }
+        }
+        throw new JwtException(UNKNOWN_ERROR);
+    }
 }

src/main/java/com/somemore/auth/jwt/filter/JwtAuthFilter.java

@@ -9,8 +9,6 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
@@ -19,6 +17,9 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
+import java.io.IOException;
+import java.util.List;
+
 @RequiredArgsConstructor
 @Slf4j
 @Component
@@ -34,7 +35,7 @@ protected boolean shouldNotFilter(HttpServletRequest request) {
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
-            FilterChain filterChain) throws ServletException, IOException {
+                                    FilterChain filterChain) throws ServletException, IOException {
         EncodedToken accessToken = getAccessToken(request);
         jwtUseCase.processAccessToken(accessToken, response);
 
@@ -47,24 +48,24 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
     private EncodedToken getAccessToken(HttpServletRequest request) {
         String accessToken = request.getHeader("Authorization");
-        if (!accessToken.startsWith("Bearer ")) {
-            throw new JwtException(JwtErrorType.MISSING_TOKEN);
-        }
 
-        accessToken = accessToken.substring(7);
+        String tokenPrefix = "Bearer ";
+        if (accessToken.startsWith(tokenPrefix)) {
+            return new EncodedToken(accessToken.substring(tokenPrefix.length()));
+        }
 
-        return new EncodedToken(accessToken);
+        throw new JwtException(JwtErrorType.MISSING_TOKEN);
     }
 
     private JwtAuthenticationToken createAuthenticationToken(Claims claims,
-            EncodedToken accessToken) {
+                                                             EncodedToken accessToken) {
         String userId = claims.get("id", String.class);
-        UserRole role = UserRole.valueOf(claims.get("role", String.class));
+        String role = claims.get("role", String.class);
 
         return new JwtAuthenticationToken(
                 userId,
                 accessToken,
-                List.of(new SimpleGrantedAuthority(role.name()))
+                List.of(new SimpleGrantedAuthority(role))
         );
     }
 }

src/main/java/com/somemore/auth/jwt/generator/HmacJwtGenerator.java

@@ -36,12 +36,10 @@ public EncodedToken generateToken(String userId, String role, TokenType tokenTyp
     }
 
     private static Claims buildClaims(String userId, String role) {
-        final String ID = "id";
-        final String ROLE = "role";
 
         return Jwts.claims()
-                .add(ID, userId)
-                .add(ROLE, role)
+                .add("id", userId)
+                .add("role", role)
                 .build();
     }
 }

src/main/java/com/somemore/auth/jwt/service/GenerateTokensOnLoginService.java

@@ -35,7 +35,7 @@ public EncodedToken saveRefreshTokenAndReturnAccessToken(UUID volunteerId) {
     private EncodedToken generateToken(UUID volunteerId, TokenType tokenType) {
         return jwtGenerator.generateToken(
                 volunteerId.toString(),
-                UserRole.VOLUNTEER.name(),
+                UserRole.VOLUNTEER.getAuthority(),
                 tokenType);
     }
 

src/main/java/com/somemore/auth/oauth/handler/success/CustomOAuthSuccessHandler.java

@@ -6,7 +6,7 @@
 import com.somemore.auth.oauth.OAuthProvider;
 import com.somemore.auth.oauth.naver.service.query.ProcessNaverOAuthUserService;
 import com.somemore.auth.redirect.RedirectUseCase;
-import com.somemore.volunteer.usecase.FindVolunteerIdUseCase;
+import com.somemore.volunteer.usecase.VolunteerQueryUseCase;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -26,7 +26,7 @@
 public class CustomOAuthSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
 
     private final ProcessNaverOAuthUserService processNaverOAuthService;
-    private final FindVolunteerIdUseCase findVolunteerIdUseCase;
+    private final VolunteerQueryUseCase volunteerQueryUseCase;
     private final GenerateTokensOnLoginUseCase generateTokensOnLoginUseCase;
     private final CookieUseCase cookieUseCase;
     private final RedirectUseCase redirectUseCase;
@@ -45,7 +45,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
             }
         }
 
-        UUID volunteerId = findVolunteerIdUseCase.findVolunteerIdByOAuthId(oAuthId);
+        UUID volunteerId = volunteerQueryUseCase.getVolunteerIdByOAuthId(oAuthId);
         EncodedToken accessToken = generateTokensOnLoginUseCase.saveRefreshTokenAndReturnAccessToken(volunteerId);
 
         cookieUseCase.setAccessToken(response, accessToken.value());

src/main/java/com/somemore/auth/util/DevAccountSetUpConfig.java

@@ -11,7 +11,7 @@
 import com.somemore.center.domain.Center;
 import com.somemore.center.repository.CenterJpaRepository;
 import com.somemore.volunteer.domain.Volunteer;
-import com.somemore.volunteer.repository.VolunteerJpaRepository;
+import com.somemore.volunteer.repository.VolunteerRepository;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import java.util.UUID;
@@ -25,7 +25,7 @@
 @Component
 public class DevAccountSetUpConfig {
 
-    private final VolunteerJpaRepository volunteerRepository;
+    private final VolunteerRepository volunteerRepository;
     private final CenterJpaRepository centerRepository;
     private final JwtGenerator jwtGenerator;
     private final RefreshTokenManager refreshTokenManager;
@@ -88,7 +88,7 @@ private EncodedToken saveRefreshTokenAndReturnAccessToken(UUID id, UserRole role
     }
 
     private EncodedToken generateToken(UUID id, UserRole role, TokenType tokenType) {
-        return jwtGenerator.generateToken(id.toString(), role.name(), tokenType);
+        return jwtGenerator.generateToken(id.toString(), role.getAuthority(), tokenType);
     }
 
     private RefreshToken generateRefreshToken(UUID id, UserRole role, EncodedToken accessToken) {

src/main/java/com/somemore/facade/validator/VolunteerDetailAccessValidator.java

@@ -0,0 +1,8 @@
+package com.somemore.facade.validator;
+
+import java.util.UUID;
+
+public interface VolunteerDetailAccessValidator {
+
+    void validateByCenterId(UUID centerId, UUID targetVolunteerId);
+}

src/main/java/com/somemore/facade/validator/VolunteerDetailAccessValidatorImpl.java

@@ -0,0 +1,37 @@
+package com.somemore.facade.validator;
+
+import com.somemore.global.exception.BadRequestException;
+import com.somemore.recruitboard.usecase.query.RecruitBoardQueryUseCase;
+import com.somemore.volunteerapply.usecase.VolunteerApplyQueryUseCase;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.UUID;
+
+import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_VOLUNTEER_DETAIL;
+
+@Component
+@RequiredArgsConstructor
+public class VolunteerDetailAccessValidatorImpl implements VolunteerDetailAccessValidator {
+
+    private final RecruitBoardQueryUseCase recruitBoardQueryUseCase;
+    private final VolunteerApplyQueryUseCase volunteerApplyQueryUseCase;
+
+    /**
+     * 기관 ID를 기반으로 완료되지 않은 모집글들의 ID를 조회하고,
+     * 해당 모집글들에 연관된 봉사자들의 ID 목록에 타겟 봉사자 ID가 포함되어 있는지 검증.
+     */
+    public void validateByCenterId(UUID centerId, UUID targetVolunteerId) {
+        List<Long> notCompletedIdsByCenterIds = recruitBoardQueryUseCase.getNotCompletedIdsByCenterIds(centerId);
+
+        List<UUID> volunteerIdsByRecruitIds = volunteerApplyQueryUseCase.getVolunteerIdsByRecruitIds(notCompletedIdsByCenterIds);
+
+        if (volunteerIdsByRecruitIds.stream()
+                .anyMatch(volunteerId -> volunteerId.equals(targetVolunteerId))) {
+            return;
+        }
+
+        throw new BadRequestException(UNAUTHORIZED_VOLUNTEER_DETAIL);
+    }
+}

src/main/java/com/somemore/global/configure/SecurityConfig.java

@@ -6,7 +6,6 @@
 import com.somemore.auth.oauth.handler.success.CustomOAuthSuccessHandler;
 import com.somemore.auth.oauth.service.CustomOAuth2UserService;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
@@ -20,8 +19,7 @@
 @RequiredArgsConstructor
 @Configuration
 @EnableWebSecurity
-@EnableMethodSecurity
-@Slf4j
+@EnableMethodSecurity(securedEnabled = true)
 public class SecurityConfig {
 
     private final CustomOAuth2UserService customOAuth2UserService;

src/main/java/com/somemore/global/exception/BadRequestException.java

@@ -7,4 +7,8 @@ public class BadRequestException extends RuntimeException{
     public BadRequestException(final String message) {
         super(message);
     }
+
+    public BadRequestException(final ExceptionMessage message) {
+        super(message.getMessage());
+    }
 }

src/main/java/com/somemore/global/exception/ExceptionMessage.java

@@ -8,19 +8,21 @@
 @Getter
 public enum ExceptionMessage {
 
-    NOT_EXISTS_CENTER("존재하지 않는 기관 입니다."),
-    NOT_EXISTS_COMMUNITY_BOARD("존재하지 않는 게시글 입니다."),
+    NOT_EXISTS_CENTER("존재하지 않는 기관입니다."),
+    NOT_EXISTS_COMMUNITY_BOARD("존재하지 않는 게시글입니다."),
     UNAUTHORIZED_COMMUNITY_BOARD("해당 게시글에 권한이 없습니다."),
     NOT_EXISTS_COMMUNITY_COMMENT("존재하지 않는 댓글 입니다."),
     UNAUTHORIZED_COMMUNITY_COMMENT("해당 댓글에 권한이 없습니다."),
     NOT_EXISTS_LOCATION("존재하지 않는 위치 ID 입니다."),
-    NOT_EXISTS_RECRUIT_BOARD("존재하지 않는 봉사 모집글 ID 입니다."),
+    NOT_EXISTS_RECRUIT_BOARD("존재하지 않는 봉사 모집글입니다."),
     UNAUTHORIZED_RECRUIT_BOARD("해당 봉사 모집글에 권한이 없습니다."),
     UPLOAD_FAILED("파일 업로드에 실패했습니다."),
     INVALID_FILE_TYPE("지원하지 않는 파일 형식입니다."),
     FILE_SIZE_EXCEEDED("파일 크기가 허용된 한도를 초과했습니다."),
     EMPTY_FILE("파일이 존재하지 않습니다."),
     INSTANTIATION_NOT_ALLOWED("인스턴스화 할 수 없는 클래스 입니다."),
+    NOT_EXISTS_VOLUNTEER("존재하지 않는 봉사자입니다."),
+    UNAUTHORIZED_VOLUNTEER_DETAIL("해당 봉사자의 상세 정보 조회 권한이 없습니다."),
     CANNOT_CANCEL_DELETED_INTEREST_CENTER("이미 삭제된 관심 기관은 취소할 수 없습니다."),
     DUPLICATE_INTEREST_CENTER("이미 관심 표시한 기관입니다.")
     ;

src/main/java/com/somemore/recruitboard/repository/RecruitBoardRepository.java

@@ -6,9 +6,12 @@
 import com.somemore.recruitboard.repository.mapper.RecruitBoardWithLocation;
 import com.somemore.recruitboard.dto.condition.RecruitBoardNearByCondition;
 import com.somemore.recruitboard.dto.condition.RecruitBoardSearchCondition;
+
 import java.util.List;
+
 import java.util.Optional;
 import java.util.UUID;
+
 import org.springframework.data.domain.Page;
 
 public interface RecruitBoardRepository {
@@ -26,4 +29,6 @@ public interface RecruitBoardRepository {
     Page<RecruitBoardDetail> findAllNearby(RecruitBoardNearByCondition condition);
 
     Page<RecruitBoard> findAllByCenterId(UUID centerId, RecruitBoardSearchCondition condition);
+
+    List<Long> findNotCompletedIdsByCenterId(UUID centerId);
 }