Merge remote-tracking branch 'origin/dev' into feat/#126

src/docs/asciidoc/index.adoc

@@ -9,6 +9,30 @@
 
 == 0. 인증
 
+=== 보호소 로그인
+
+==== Request
+operation::auth-controller-test/shelter-login[snippets='http-request,request-fields']
+
+==== Response
+operation::auth-controller-test/shelter-login[snippets='http-response,response-fields,response-cookies']
+
+=== 봉사자 로그인
+
+==== Request
+operation::auth-controller-test/volunteer-login[snippets='http-request,request-fields']
+
+==== Response
+operation::auth-controller-test/volunteer-login[snippets='http-response,response-fields,response-cookies']
+
+=== 액세스 토큰 갱신
+
+==== Request
+operation::auth-controller-test/refresh-access-token[snippets='http-request,request-cookies']
+
+==== Response
+operation::auth-controller-test/refresh-access-token[snippets='http-response,response-fields,response-cookies']
+
 == 1. 봉사자
 
 === 봉사자가 완료한 봉사 모집글 리스트 조회
@@ -75,6 +99,14 @@ operation::recruitment-controller-test/register-recruitment[snippets='http-respo
 
 == 5. 봉사 후기
 
+=== 보호소의 후기 리스트 조회
+
+==== Request
+operation::review-controller-test/find-shelter-reviews-by-shelter[snippets='http-request,request-headers,path-parameters,query-parameters']
+
+==== Response
+operation::review-controller-test/find-shelter-reviews-by-shelter[snippets='http-response,response-fields']
+
 == 6. 보호 동물
 
 = 봉사자

src/main/java/com/clova/anifriends/domain/animal/controller/AnimalController.java

@@ -8,7 +8,7 @@
 import com.clova.anifriends.domain.animal.dto.response.FindAnimalsByVolunteerResponse;
 import com.clova.anifriends.domain.animal.dto.response.RegisterAnimalResponse;
 import com.clova.anifriends.domain.animal.service.AnimalService;
-import com.clova.anifriends.domain.auth.resolver.LoginUser;
+import com.clova.anifriends.domain.auth.LoginUser;
 import jakarta.validation.Valid;
 import java.net.URI;
 import lombok.RequiredArgsConstructor;

src/main/java/com/clova/anifriends/domain/applicant/controller/ApplicantController.java

@@ -3,7 +3,7 @@
 import com.clova.anifriends.domain.applicant.dto.FindApplicantsApprovedResponse;
 import com.clova.anifriends.domain.applicant.dto.FindApplyingVolunteersResponse;
 import com.clova.anifriends.domain.applicant.service.ApplicantService;
-import com.clova.anifriends.domain.auth.resolver.LoginUser;
+import com.clova.anifriends.domain.auth.LoginUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/clova/anifriends/domain/auth/resolver/LoginUser.java → src/main/java/com/clova/anifriends/domain/auth/LoginUser.java

@@ -1,4 +1,4 @@
-package com.clova.anifriends.domain.auth.resolver;
+package com.clova.anifriends.domain.auth;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/clova/anifriends/domain/auth/authentication/JwtAuthenticationProvider.java

@@ -1,7 +1,7 @@
 package com.clova.anifriends.domain.auth.authentication;
 
 import com.clova.anifriends.domain.auth.jwt.JwtProvider;
-import com.clova.anifriends.domain.auth.jwt.response.CustomClaims;
+import com.clova.anifriends.domain.auth.dto.response.CustomClaims;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

src/main/java/com/clova/anifriends/domain/auth/controller/AuthController.java

@@ -1,8 +1,8 @@
 package com.clova.anifriends.domain.auth.controller;
 
-import com.clova.anifriends.domain.auth.controller.request.LoginRequest;
-import com.clova.anifriends.domain.auth.controller.response.LoginResponse;
-import com.clova.anifriends.domain.auth.jwt.response.TokenResponse;
+import com.clova.anifriends.domain.auth.dto.request.LoginRequest;
+import com.clova.anifriends.domain.auth.dto.response.LoginResponse;
+import com.clova.anifriends.domain.auth.dto.response.TokenResponse;
 import com.clova.anifriends.domain.auth.service.AuthService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;

src/main/java/com/clova/anifriends/domain/auth/controller/request/LoginRequest.java → src/main/java/com/clova/anifriends/domain/auth/dto/request/LoginRequest.java

@@ -1,4 +1,4 @@
-package com.clova.anifriends.domain.auth.controller.request;
+package com.clova.anifriends.domain.auth.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 

src/main/java/com/clova/anifriends/domain/auth/jwt/response/CustomClaims.java → src/main/java/com/clova/anifriends/domain/auth/dto/response/CustomClaims.java

@@ -1,4 +1,4 @@
-package com.clova.anifriends.domain.auth.jwt.response;
+package com.clova.anifriends.domain.auth.dto.response;
 
 import java.util.List;
 

src/main/java/com/clova/anifriends/domain/auth/controller/response/LoginResponse.java → src/main/java/com/clova/anifriends/domain/auth/dto/response/LoginResponse.java

@@ -1,7 +1,6 @@
-package com.clova.anifriends.domain.auth.controller.response;
+package com.clova.anifriends.domain.auth.dto.response;
 
 import com.clova.anifriends.domain.auth.jwt.UserRole;
-import com.clova.anifriends.domain.auth.jwt.response.TokenResponse;
 
 public record LoginResponse(Long userId, UserRole role, String accessToken) {
 

src/main/java/com/clova/anifriends/domain/auth/jwt/response/TokenResponse.java → src/main/java/com/clova/anifriends/domain/auth/dto/response/TokenResponse.java

@@ -1,4 +1,4 @@
-package com.clova.anifriends.domain.auth.jwt.response;
+package com.clova.anifriends.domain.auth.dto.response;
 
 import com.clova.anifriends.domain.auth.jwt.UserRole;
 

src/main/java/com/clova/anifriends/domain/auth/exception/InvalidJwtException.java

@@ -5,6 +5,10 @@
 
 public class InvalidJwtException extends AuthenticationException {
 
+    public InvalidJwtException(String message) {
+        super(ErrorCode.UN_AUTHENTICATION, message);
+    }
+
     public InvalidJwtException(ErrorCode errorCode, String message) {
         super(errorCode, message);
     }

src/main/java/com/clova/anifriends/domain/auth/jwt/JwtProvider.java

@@ -1,8 +1,8 @@
 package com.clova.anifriends.domain.auth.jwt;
 
 
-import com.clova.anifriends.domain.auth.jwt.response.CustomClaims;
-import com.clova.anifriends.domain.auth.jwt.response.TokenResponse;
+import com.clova.anifriends.domain.auth.dto.response.CustomClaims;
+import com.clova.anifriends.domain.auth.dto.response.TokenResponse;
 
 public interface JwtProvider {
 

src/main/java/com/clova/anifriends/domain/auth/service/AuthService.java

@@ -7,7 +7,7 @@
 import com.clova.anifriends.domain.auth.exception.AuthNotFoundException;
 import com.clova.anifriends.domain.auth.jwt.JwtProvider;
 import com.clova.anifriends.domain.auth.jwt.UserRole;
-import com.clova.anifriends.domain.auth.jwt.response.TokenResponse;
+import com.clova.anifriends.domain.auth.dto.response.TokenResponse;
 import com.clova.anifriends.domain.auth.repository.RefreshTokenRepository;
 import com.clova.anifriends.domain.shelter.Shelter;
 import com.clova.anifriends.domain.shelter.repository.ShelterRepository;

src/main/java/com/clova/anifriends/domain/recruitment/controller/RecruitmentController.java

@@ -1,6 +1,6 @@
 package com.clova.anifriends.domain.recruitment.controller;
 
-import com.clova.anifriends.domain.auth.resolver.LoginUser;
+import com.clova.anifriends.domain.auth.LoginUser;
 import com.clova.anifriends.domain.recruitment.dto.request.FindRecruitmentsByShelterRequest;
 import com.clova.anifriends.domain.recruitment.dto.request.FindRecruitmentsByVolunteerRequest;
 import com.clova.anifriends.domain.recruitment.dto.request.RegisterRecruitmentRequest;

src/main/java/com/clova/anifriends/domain/review/controller/ReviewController.java

@@ -1,10 +1,10 @@
 package com.clova.anifriends.domain.review.controller;
 
-import com.clova.anifriends.domain.auth.resolver.LoginUser;
+import com.clova.anifriends.domain.auth.LoginUser;
 import com.clova.anifriends.domain.review.dto.request.RegisterReviewRequest;
 import com.clova.anifriends.domain.review.dto.response.FindReviewResponse;
 import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsByVolunteerResponse;
-import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsResponse;
+import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsByShelterResponse;
 import com.clova.anifriends.domain.review.dto.response.FindVolunteerReviewsResponse;
 import com.clova.anifriends.domain.review.service.ReviewService;
 import java.net.URI;
@@ -44,10 +44,11 @@ public ResponseEntity<Void> registerReview(
     }
 
     @GetMapping("/shelters/{shelterId}/reviews")
-    public ResponseEntity<FindShelterReviewsResponse> findShelterReviews(
+    public ResponseEntity<FindShelterReviewsByShelterResponse> findShelterReviewsByShelter(
         @PathVariable("shelterId") Long shelterId,
         Pageable pageable) {
-        FindShelterReviewsResponse response = reviewService.findShelterReviews(shelterId, pageable);
+        FindShelterReviewsByShelterResponse response
+            = reviewService.findShelterReviewsByShelter(shelterId, pageable);
         return ResponseEntity.ok(response);
     }
 

src/main/java/com/clova/anifriends/domain/review/dto/response/FindShelterReviewsResponse.java → src/main/java/com/clova/anifriends/domain/review/dto/response/FindShelterReviewsByShelterResponse.java

@@ -7,17 +7,18 @@
 import java.util.List;
 import org.springframework.data.domain.Page;
 
-public record FindShelterReviewsResponse(List<FindShelterReviewResponse> reviews,
-                                         PageInfo pageInfo) {
+public record FindShelterReviewsByShelterResponse(
+    List<FindShelterReviewResponse> reviews,
+    PageInfo pageInfo) {
 
     public record FindShelterReviewResponse(
         Long reviewId,
-        LocalDateTime createdAt,
-        String content,
+        LocalDateTime reviewCreatedAt,
+        String reviewContent,
         List<String> reviewImageUrls,
 
         String volunteerName,
-        int temperature,
+        int volunteerTemperature,
         String volunteerImageUrl,
         long VolunteerReviewCount) {
 
@@ -36,11 +37,11 @@ public static FindShelterReviewResponse from(Review review) {
         }
     }
 
-    public static FindShelterReviewsResponse from(Page<Review> reviewPage) {
+    public static FindShelterReviewsByShelterResponse from(Page<Review> reviewPage) {
         PageInfo pageInfo = PageInfo.of(reviewPage.getTotalElements(), reviewPage.hasNext());
         List<FindShelterReviewResponse> reviews = reviewPage
             .map(FindShelterReviewResponse::from)
             .stream().toList();
-        return new FindShelterReviewsResponse(reviews, pageInfo);
+        return new FindShelterReviewsByShelterResponse(reviews, pageInfo);
     }
 }

src/main/java/com/clova/anifriends/domain/review/service/ReviewService.java

@@ -6,7 +6,7 @@
 import com.clova.anifriends.domain.review.Review;
 import com.clova.anifriends.domain.review.dto.response.FindReviewResponse;
 import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsByVolunteerResponse;
-import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsResponse;
+import com.clova.anifriends.domain.review.dto.response.FindShelterReviewsByShelterResponse;
 import com.clova.anifriends.domain.review.dto.response.FindVolunteerReviewsResponse;
 import com.clova.anifriends.domain.review.exception.ApplicantNotFoundException;
 import com.clova.anifriends.domain.review.exception.ReviewBadRequestException;
@@ -37,10 +37,11 @@ private Review getReview(Long userId, Long reviewId) {
     }
 
     @Transactional(readOnly = true)
-    public FindShelterReviewsResponse findShelterReviews(Long shelterId, Pageable pageable) {
-        Page<Review> reviewPage
-            = reviewRepository.findAllByShelterId(shelterId, pageable);
-        return FindShelterReviewsResponse.from(reviewPage);
+    public FindShelterReviewsByShelterResponse findShelterReviewsByShelter(
+        Long shelterId,
+        Pageable pageable) {
+        Page<Review> reviewPage = reviewRepository.findAllByShelterId(shelterId, pageable);
+        return FindShelterReviewsByShelterResponse.from(reviewPage);
     }
 
     @Transactional

src/main/java/com/clova/anifriends/domain/shelter/controller/ShelterController.java

@@ -1,6 +1,6 @@
 package com.clova.anifriends.domain.shelter.controller;
 
-import com.clova.anifriends.domain.auth.resolver.LoginUser;
+import com.clova.anifriends.domain.auth.LoginUser;
 import com.clova.anifriends.domain.shelter.dto.CheckDuplicateShelterEmailRequest;
 import com.clova.anifriends.domain.shelter.dto.CheckDuplicateShelterResponse;
 import com.clova.anifriends.domain.shelter.dto.FindShelterDetailResponse;

src/main/java/com/clova/anifriends/domain/volunteer/controller/VolunteerController.java

@@ -1,6 +1,6 @@
 package com.clova.anifriends.domain.volunteer.controller;
 
-import com.clova.anifriends.domain.auth.resolver.LoginUser;
+import com.clova.anifriends.domain.auth.LoginUser;
 import com.clova.anifriends.domain.volunteer.dto.request.CheckDuplicateVolunteerEmailRequest;
 import com.clova.anifriends.domain.volunteer.dto.request.RegisterVolunteerRequest;
 import com.clova.anifriends.domain.volunteer.dto.response.CheckDuplicateVolunteerEmailResponse;

src/main/java/com/clova/anifriends/global/config/SecurityConfig.java

@@ -1,7 +1,7 @@
 package com.clova.anifriends.global.config;
 
 import com.clova.anifriends.domain.auth.authentication.JwtAuthenticationProvider;
-import com.clova.anifriends.domain.auth.filter.JwtAuthenticationFilter;
+import com.clova.anifriends.global.web.filter.JwtAuthenticationFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;

src/main/java/com/clova/anifriends/global/config/WebMvcConfig.java

@@ -1,6 +1,6 @@
 package com.clova.anifriends.global.config;
 
-import com.clova.anifriends.domain.auth.resolver.LoginUserArgumentResolver;
+import com.clova.anifriends.global.web.argumentresolver.LoginUserArgumentResolver;
 import java.util.List;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;

src/main/java/com/clova/anifriends/domain/auth/jwt/JJwtProvider.java → src/main/java/com/clova/anifriends/global/jwt/JJwtProvider.java

@@ -1,11 +1,12 @@
-package com.clova.anifriends.domain.auth.jwt;
+package com.clova.anifriends.global.jwt;
 
+import com.clova.anifriends.domain.auth.dto.response.CustomClaims;
+import com.clova.anifriends.domain.auth.dto.response.TokenResponse;
 import com.clova.anifriends.domain.auth.exception.ExpiredAccessTokenException;
-import com.clova.anifriends.domain.auth.exception.InvalidJwtException;
 import com.clova.anifriends.domain.auth.exception.ExpiredRefreshTokenException;
-import com.clova.anifriends.domain.auth.jwt.response.CustomClaims;
-import com.clova.anifriends.domain.auth.jwt.response.TokenResponse;
-import com.clova.anifriends.global.exception.ErrorCode;
+import com.clova.anifriends.domain.auth.exception.InvalidJwtException;
+import com.clova.anifriends.domain.auth.jwt.JwtProvider;
+import com.clova.anifriends.domain.auth.jwt.UserRole;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.JwtException;
@@ -101,7 +102,7 @@ public CustomClaims parseAccessToken(String token) {
         } catch (JwtException ex) {
             log.info("[EX] {}: 잘못된 JWT입니다.", ex.getClass().getSimpleName());
         }
-        throw new InvalidJwtException(ErrorCode.UN_AUTHENTICATION, "유효하지 않은 JWT입니다.");
+        throw new InvalidJwtException("유효하지 않은 JWT입니다.");
     }
 
     @Override
@@ -117,6 +118,6 @@ public TokenResponse refreshAccessToken(String refreshToken) {
         } catch (JwtException ex) {
             log.info("[EX] {}: 잘못된 리프레시 토큰입니다.", ex.getClass().getSimpleName());
         }
-        throw new InvalidJwtException(ErrorCode.UN_AUTHENTICATION, "유효하지 않은 리프레시 토큰입니다.");
+        throw new InvalidJwtException("유효하지 않은 리프레시 토큰입니다.");
     }
 }

src/main/java/com/clova/anifriends/domain/auth/resolver/LoginUserArgumentResolver.java → src/main/java/com/clova/anifriends/global/web/argumentresolver/LoginUserArgumentResolver.java

@@ -1,9 +1,10 @@
-package com.clova.anifriends.domain.auth.resolver;
+package com.clova.anifriends.global.web.argumentresolver;
 
 import static com.clova.anifriends.global.exception.ErrorCode.UN_AUTHENTICATION;
 
 import com.clova.anifriends.domain.auth.authentication.JwtAuthentication;
 import com.clova.anifriends.domain.auth.exception.AuthAuthenticationException;
+import com.clova.anifriends.domain.auth.LoginUser;
 import java.util.Objects;
 import org.springframework.core.MethodParameter;
 import org.springframework.security.core.Authentication;

src/main/java/com/clova/anifriends/domain/auth/filter/JwtAuthenticationFilter.java → src/main/java/com/clova/anifriends/global/web/filter/JwtAuthenticationFilter.java

@@ -1,6 +1,7 @@
-package com.clova.anifriends.domain.auth.filter;
+package com.clova.anifriends.global.web.filter;
 
 import com.clova.anifriends.domain.auth.authentication.JwtAuthenticationProvider;
+import com.clova.anifriends.domain.auth.exception.InvalidJwtException;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.GenericFilter;
 import jakarta.servlet.ServletException;
@@ -17,17 +18,30 @@
 public class JwtAuthenticationFilter extends GenericFilter {
 
     private static final String HEADER = "Authorization";
+    private static final String BEARER = "Bearer ";
     private final JwtAuthenticationProvider authenticationProvider;
 
     @Override
     public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
         throws IOException, ServletException {
         HttpServletRequest request = (HttpServletRequest) req;
-        String accessToken = request.getHeader(HEADER);
-        if (Objects.nonNull(accessToken)) {
+        String bearerAccessToken = request.getHeader(HEADER);
+        if (Objects.nonNull(bearerAccessToken)) {
+            String accessToken = removeBearer(bearerAccessToken);
             Authentication authentication = authenticationProvider.authenticate(accessToken);
             SecurityContextHolder.getContext().setAuthentication(authentication);
         }
         chain.doFilter(req, res);
     }
+
+    private String removeBearer(String bearerAccessToken) {
+        checkTokenContainsBearer(bearerAccessToken);
+        return bearerAccessToken.replace(BEARER, "");
+    }
+
+    private static void checkTokenContainsBearer(String bearerAccessToken) {
+        if(!bearerAccessToken.contains(BEARER)) {
+            throw new InvalidJwtException("올바르지 않는 액세스 토큰 형식입니다.");
+        }
+    }
 }