Merge branch 'main' into feature/79-add-review-create

Author: leebs0521

.github/workflows/CD.yml

@@ -23,15 +23,17 @@ jobs:
       NAVER_CLIENT_ID: ${{ secrets.NAVER_CLIENT_ID }}
       NAVER_CLIENT_SECRET: ${{ secrets.NAVER_CLIENT_SECRET }}
       NAVER_SCOPE: ${{ secrets.NAVER_SCOPE }}
-      NAVER_REDIRECT_URL: ${{secrets.NAVER_REDIRECT_URL}}
+      NAVER_REDIRECT_URL: ${{ secrets.NAVER_REDIRECT_URL }}
       JWT_SECRET: ${{ secrets.JWT_SECRET }}
-      FRONT_URL: ${{secrets.FRONT_URL}}
-      BACK_URL: ${{secrets.BACK_URL}}
-      BUCKET_NAME: ${{secrets.BUCKET_NAME}}
-      BUCKET_REGION: ${{secrets.BUCKET_REGION}}
-      IMG_BASE_URL: ${{secrets.BASE_URL}}
-      S3_ACCESS_KEY: ${{secrets.S3_ACCESS_KEY}}
-      S3_SECRET_KEY: ${{secrets.S3_SECRET_KEY}}
+      FRONT_URL: ${{ secrets.FRONT_URL }}
+      BACK_URL: ${{ secrets.BACK_URL }}
+      BUCKET_NAME: ${{ secrets.BUCKET_NAME }}
+      BUCKET_REGION: ${{ secrets.BUCKET_REGION }}
+      IMG_BASE_URL: ${{ secrets.BASE_URL }}
+      S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+      S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+      DEFAULT_IMG_URL: ${{ secrets.DEFAULT_IMG_URL }}
+      APP_DEVELOP_MODE: ${{ secrets.APP_DEVELOP_MODE }}
 
     steps:
       - name: Github Repository 파일 불러오기

.github/workflows/CI.yml

@@ -31,15 +31,17 @@ jobs:
       NAVER_CLIENT_ID: ${{ secrets.NAVER_CLIENT_ID }}
       NAVER_CLIENT_SECRET: ${{ secrets.NAVER_CLIENT_SECRET }}
       NAVER_SCOPE: ${{ secrets.NAVER_SCOPE }}
-      NAVER_REDIRECT_URL: ${{secrets.NAVER_REDIRECT_URL}}
+      NAVER_REDIRECT_URL: ${{ secrets.NAVER_REDIRECT_URL }}
       JWT_SECRET: ${{ secrets.JWT_SECRET }}
-      FRONT_URL: ${{secrets.FRONT_URL}}
-      BACK_URL: ${{secrets.BACK_URL}}
-      BUCKET_NAME: ${{secrets.BUCKET_NAME}}
-      BUCKET_REGION: ${{secrets.BUCKET_REGION}}
-      IMG_BASE_URL: ${{secrets.BASE_URL}}
-      S3_ACCESS_KEY: ${{secrets.S3_ACCESS_KEY}}
-      S3_SECRET_KEY: ${{secrets.S3_SECRET_KEY}}
+      FRONT_URL: ${{ secrets.FRONT_URL }}
+      BACK_URL: ${{ secrets.BACK_URL }}
+      BUCKET_NAME: ${{ secrets.BUCKET_NAME }}
+      BUCKET_REGION: ${{ secrets.BUCKET_REGION }}
+      IMG_BASE_URL: ${{ secrets.BASE_URL }}
+      S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+      S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+      DEFAULT_IMG_URL: ${{ secrets.DEFAULT_IMG_URL }}
+      APP_DEVELOP_MODE: ${{ secrets.APP_DEVELOP_MODE }}
 
 
     steps:

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

@@ -9,6 +9,8 @@
 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;
@@ -17,9 +19,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import java.io.IOException;
-import java.util.List;
-
 @RequiredArgsConstructor
 @Slf4j
 @Component
@@ -29,12 +28,13 @@ public class JwtAuthFilter extends OncePerRequestFilter {
 
     @Override
     protected boolean shouldNotFilter(HttpServletRequest request) {
-        return true; // 개발 중 모든 요청 허용
-//        return httpServletRequest.getRequestURI().contains("token");
+        String token = request.getHeader("Authorization");
+        return token == null || token.isEmpty();
     }
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
+            FilterChain filterChain) throws ServletException, IOException {
         EncodedToken accessToken = getAccessToken(request);
         jwtUseCase.processAccessToken(accessToken, response);
 
@@ -47,15 +47,19 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
     private EncodedToken getAccessToken(HttpServletRequest request) {
         String accessToken = request.getHeader("Authorization");
-        if (accessToken == null || accessToken.isEmpty()) {
+        if (!accessToken.startsWith("Bearer ")) {
             throw new JwtException(JwtErrorType.MISSING_TOKEN);
         }
+
+        accessToken = accessToken.substring(7);
+
         return new EncodedToken(accessToken);
     }
 
-    private JwtAuthenticationToken createAuthenticationToken(Claims claims, EncodedToken accessToken) {
+    private JwtAuthenticationToken createAuthenticationToken(Claims claims,
+            EncodedToken accessToken) {
         String userId = claims.get("id", String.class);
-        UserRole role = claims.get("role", UserRole.class);
+        UserRole role = UserRole.valueOf(claims.get("role", String.class));
 
         return new JwtAuthenticationToken(
                 userId,

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

@@ -0,0 +1,99 @@
+package com.somemore.auth.util;
+
+import static com.somemore.auth.oauth.OAuthProvider.NAVER;
+
+import com.somemore.auth.jwt.domain.EncodedToken;
+import com.somemore.auth.jwt.domain.TokenType;
+import com.somemore.auth.jwt.domain.UserRole;
+import com.somemore.auth.jwt.generator.JwtGenerator;
+import com.somemore.auth.jwt.refresh.domain.RefreshToken;
+import com.somemore.auth.jwt.refresh.manager.RefreshTokenManager;
+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 jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class DevAccountSetUpConfig {
+
+    private final VolunteerJpaRepository volunteerRepository;
+    private final CenterJpaRepository centerRepository;
+    private final JwtGenerator jwtGenerator;
+    private final RefreshTokenManager refreshTokenManager;
+
+    private Volunteer volunteer;
+    private Center center;
+
+    @Value("${app.develop.mode}")
+    private boolean developMode;
+
+    @PostConstruct
+    public void generateAccessTokenForDev() {
+        if (!developMode) {
+            return; // 개발 모드에서만 실행
+        }
+
+        volunteer = Volunteer.createDefault(NAVER, "bongdari");
+        center = Center.create(
+                "봉다리 자원봉사센터",
+                "02-1234-5678",
+                "",
+                "봉다리 기관 테스트 계정입니다.",
+                "https://somemore.bongdari.com",
+                "bongdari",
+                "1234"
+        );
+
+        volunteer = volunteerRepository.findByOauthId(volunteer.getOauthId())
+                .orElseGet(() -> volunteerRepository.save(volunteer));
+
+        center = centerRepository.findByName(center.getName())
+                .orElseGet(() -> centerRepository.save(center));
+
+        EncodedToken volunteerToken = saveRefreshTokenAndReturnAccessToken(volunteer.getId(),
+                UserRole.VOLUNTEER);
+        EncodedToken centerToken = saveRefreshTokenAndReturnAccessToken(center.getId(),
+                UserRole.CENTER);
+
+        log.info("테스트용 봉사자 AccessToken: {}", volunteerToken.value());
+        log.info("테스트용 기관 AccessToken: {}", centerToken.value());
+    }
+
+    @PreDestroy
+    public void cleanup() {
+        if (volunteer != null) {
+            refreshTokenManager.removeRefreshToken(volunteer.getId().toString());
+            log.info("테스트용 AccessToken 제거, 봉사자 ID: {}", volunteer.getId());
+        }
+        if (center != null) {
+            refreshTokenManager.removeRefreshToken(center.getId().toString());
+            log.info("테스트용 AccessToken 제거, 기관 ID: {}", center.getId());
+        }
+    }
+
+    private EncodedToken saveRefreshTokenAndReturnAccessToken(UUID id, UserRole role) {
+        EncodedToken accessToken = generateToken(id, role, TokenType.ACCESS);
+        RefreshToken refreshToken = generateRefreshToken(id, role, accessToken);
+        refreshTokenManager.save(refreshToken);
+        return accessToken;
+    }
+
+    private EncodedToken generateToken(UUID id, UserRole role, TokenType tokenType) {
+        return jwtGenerator.generateToken(id.toString(), role.name(), tokenType);
+    }
+
+    private RefreshToken generateRefreshToken(UUID id, UserRole role, EncodedToken accessToken) {
+        return new RefreshToken(id.toString(), accessToken,
+                generateToken(id, role, TokenType.REFRESH));
+    }
+}
+

src/main/java/com/somemore/center/repository/CenterJpaRepository.java

@@ -9,4 +9,5 @@
 public interface CenterJpaRepository extends JpaRepository<Center, Long> {
     boolean existsById(UUID id);
     Optional<Center> findCenterById(UUID id);
+    Optional<Center> findByName(String name);
 }

src/main/java/com/somemore/community/domain/CommunityComment.java

@@ -22,6 +22,9 @@ public class CommunityComment extends BaseEntity {
     @Column(name = "id", nullable = false)
     private Long id;
 
+    @Column(name = "community_board_id", nullable = false)
+    private Long communityBoardId;
+
     @Column(name = "writer_id", nullable = false, length = 16)
     private UUID writerId;
 
@@ -33,7 +36,8 @@ public class CommunityComment extends BaseEntity {
     private Long parentCommentId;
 
     @Builder
-    public CommunityComment(UUID writerId, String content, Long parentCommentId) {
+    public CommunityComment(Long communityBoardId, UUID writerId, String content, Long parentCommentId) {
+        this.communityBoardId = communityBoardId;
         this.writerId = writerId;
         this.content = content;
         this.parentCommentId = parentCommentId;

src/main/java/com/somemore/community/dto/request/CommunityCommentCreateRequestDto.java

@@ -6,22 +6,27 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 
 import java.util.UUID;
 
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Builder
 public record CommunityCommentCreateRequestDto(
+        @Schema(description = "커뮤니티 게시글 ID", example = "33")
+        @NotNull(message = "게시글 ID는 필수 값입니다.")
+        Long communityBoardId,
         @Schema(description = "커뮤니티 댓글 내용", example = "저도 함께 하고 싶습니다.")
         @NotBlank(message = "댓글 내용은 필수 값입니다.")
         String content,
-        @Schema(description = "부모 댓글의 ID", example = "1234", nullable = true)
+        @Schema(description = "부모 댓글 ID", example = "1234", nullable = true)
         @Nullable
         Long parentCommentId
 ) {
     public CommunityComment toEntity(UUID writerId) {
         return CommunityComment.builder()
+                .communityBoardId(communityBoardId)
                 .writerId(writerId)
                 .content(content)
                 .parentCommentId(parentCommentId)

src/main/java/com/somemore/community/repository/board/CommunityBoardJpaRepository.java

@@ -4,4 +4,5 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CommunityBoardJpaRepository extends JpaRepository<CommunityBoard, Long> {
+    boolean existsByIdAndDeletedFalse(Long id);
 }

src/main/java/com/somemore/community/repository/board/CommunityBoardRepository.java

@@ -12,5 +12,9 @@ public interface CommunityBoardRepository {
     Optional<CommunityBoard> findById(Long id);
     List<CommunityBoardView> getCommunityBoards();
     List<CommunityBoardView> findByWriterId(UUID writerId);
+    boolean existsById(Long id);
+    default boolean doesNotExistById(Long id) {
+        return !existsById(id);
+    }
     void deleteAllInBatch();
 }

src/main/java/com/somemore/community/repository/board/CommunityBoardRepositoryImpl.java

@@ -52,6 +52,11 @@ public List<CommunityBoardView> findByWriterId(UUID writerId) {
                 .fetch();
     }
 
+    @Override
+    public boolean existsById(Long id) {
+        return communityBoardJpaRepository.existsByIdAndDeletedFalse(id);
+    }
+
     private JPAQuery<CommunityBoardView> getCommunityBoardsQuery() {
         QCommunityBoard communityBoard = QCommunityBoard.communityBoard;
         QVolunteer volunteer = QVolunteer.volunteer;