[chore] 운영서버로 배포 25/08/13

src/main/java/konkuk/thip/common/security/filter/JwtAuthenticationFilter.java

@@ -2,6 +2,7 @@
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import konkuk.thip.common.exception.AuthException;
@@ -68,10 +69,20 @@ protected void doFilterInternal(HttpServletRequest request,
     }
 
     private String extractToken(HttpServletRequest request) {
+        // 1. Authorization 헤더 우선 (앱)
         String authorization = request.getHeader(JWT_HEADER_KEY.getValue());
         if (authorization != null && authorization.startsWith(JWT_PREFIX.getValue())) {
             return authorization.split(" ")[1];
         }
+
+        // 2. Cookie에서 JWT 추출 (웹)
+        if (request.getCookies() != null) {
+            for (Cookie cookie : request.getCookies()) {
+                if (JWT_HEADER_KEY.getValue().equals(cookie.getName())) {
+                    return cookie.getValue();
+                }
+            }
+        }
         log.info("토큰이 없습니다.");
         return null;
     }

src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetMemberListResponse.java

@@ -15,6 +15,7 @@ public record MemberSearchResult(
                 String nickname,
                 String imageUrl,
                 String aliasName,
+                String aliasColor,
                 int followerCount
         ) {}
 }

src/main/java/konkuk/thip/room/adapter/in/web/response/RoomPlayingDetailViewResponse.java

@@ -14,6 +14,7 @@ public record RoomPlayingDetailViewResponse(
         String progressStartDate,
         String progressEndDate,
         String category,
+        String categoryColor,
         String roomDescription,
         int memberCount,
         int recruitCount,

src/main/java/konkuk/thip/room/adapter/in/web/response/RoomRecruitingDetailViewResponse.java

@@ -4,6 +4,7 @@
 
 import java.util.List;
 
+@Builder
 public record RoomRecruitingDetailViewResponse(
         boolean isHost,
         boolean isJoining,
@@ -15,6 +16,7 @@ public record RoomRecruitingDetailViewResponse(
         String progressEndDate,
         String recruitEndDate,
         String category,
+        String categoryColor,
         String roomDescription,
         int memberCount,
         int recruitCount,

src/main/java/konkuk/thip/room/adapter/out/persistence/RoomQueryPersistenceAdapter.java

@@ -1,12 +1,15 @@
 package konkuk.thip.room.adapter.out.persistence;
 
+import konkuk.thip.common.exception.EntityNotFoundException;
+import konkuk.thip.common.exception.code.ErrorCode;
 import konkuk.thip.common.util.Cursor;
 import konkuk.thip.common.util.CursorBasedList;
 import konkuk.thip.room.adapter.in.web.response.RoomGetHomeJoinedListResponse;
 import konkuk.thip.room.adapter.in.web.response.RoomRecruitingDetailViewResponse;
 import konkuk.thip.room.adapter.in.web.response.RoomSearchResponse;
 import konkuk.thip.room.adapter.out.persistence.function.RoomQueryFunction;
 import konkuk.thip.room.adapter.out.persistence.repository.RoomJpaRepository;
+import konkuk.thip.room.adapter.out.persistence.repository.category.CategoryJpaRepository;
 import konkuk.thip.room.application.port.out.RoomQueryPort;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
 import konkuk.thip.room.domain.Category;
@@ -24,6 +27,7 @@
 public class RoomQueryPersistenceAdapter implements RoomQueryPort {
 
     private final RoomJpaRepository roomJpaRepository;
+    private final CategoryJpaRepository categoryJpaRepository;
 
     @Override
     public int countRecruitingRoomsByBookAndStartDateAfter(String isbn, LocalDate currentDate) {
@@ -101,4 +105,12 @@ public List<RoomQueryDto> findRoomsByCategoryOrderByDeadline(Category category,
     public List<RoomQueryDto> findRoomsByCategoryOrderByPopular(Category category, int limit, Long userId) {
         return roomJpaRepository.findRoomsByCategoryOrderByMemberCount(category.getValue(), limit, userId);
     }
+
+    // TODO : 리펙토링 대상
+    @Override
+    public String findAliasColorOfCategory(Category category) {
+        return categoryJpaRepository.findAliasColorByValue(category.getValue()).orElseThrow(
+                () -> new EntityNotFoundException(ErrorCode.CATEGORY_NOT_FOUND)
+        );
+    }
 }

src/main/java/konkuk/thip/room/adapter/out/persistence/repository/category/CategoryJpaRepository.java

@@ -2,10 +2,18 @@
 
 import konkuk.thip.room.adapter.out.jpa.CategoryJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
 public interface CategoryJpaRepository extends JpaRepository<CategoryJpaEntity, Long> {
 
     Optional<CategoryJpaEntity> findByValue(String value);
+
+    // TODO : 리펙토링 대상
+    @Query("select a.color " +
+            "from CategoryJpaEntity c join c.aliasForCategoryJpaEntity a " +
+            "where c.value = :categoryValue")
+    Optional<String> findAliasColorByValue(@Param("categoryValue") String categoryValue);
 }

src/main/java/konkuk/thip/room/application/port/out/RoomQueryPort.java

@@ -38,5 +38,9 @@ public interface RoomQueryPort {
 
     List<RoomQueryDto> findRoomsByCategoryOrderByPopular(Category category, int limit, Long userId);
 
-
+    /**
+     * 임시 메서드
+     * TODO 리펙토링 대상
+     */
+    String findAliasColorOfCategory(Category category);
 }

src/main/java/konkuk/thip/room/application/service/RoomGetMemberListService.java

@@ -52,6 +52,7 @@ public RoomGetMemberListResponse getRoomMemberList(Long roomId) {
                             .nickname(user.getNickname())
                             .imageUrl(user.getAlias().getImageUrl())
                             .aliasName(user.getAlias().getValue())
+                            .aliasColor(user.getAlias().getColor())
                             .followerCount(user.getFollowerCount())
                             .build();
                 })

src/main/java/konkuk/thip/room/application/service/RoomShowPlayingDetailViewService.java

@@ -6,6 +6,7 @@
 import konkuk.thip.room.adapter.in.web.response.RoomPlayingDetailViewResponse;
 import konkuk.thip.room.application.port.in.RoomShowPlayingDetailViewUseCase;
 import konkuk.thip.room.application.port.out.RoomCommandPort;
+import konkuk.thip.room.application.port.out.RoomQueryPort;
 import konkuk.thip.room.domain.Room;
 import konkuk.thip.room.application.port.out.RoomParticipantCommandPort;
 import konkuk.thip.room.domain.RoomParticipants;
@@ -24,14 +25,15 @@ public class RoomShowPlayingDetailViewService implements RoomShowPlayingDetailVi
     private static final int TOP_PARTICIPATION_VOTES_COUNT = 3;
 
     private final RoomCommandPort roomCommandPort;
+    private final RoomQueryPort roomQueryPort;
     private final BookCommandPort bookCommandPort;
     private final RoomParticipantCommandPort roomParticipantCommandPort;
     private final VoteQueryPort voteQueryPort;
 
     @Override
     @Transactional(readOnly = true)
     public RoomPlayingDetailViewResponse getPlayingRoomDetailView(Long userId, Long roomId) {
-        // 1. Room 조회, Book 조회
+        // 1. Room 조회, Book 조회, Category와 연관된 Alias 조회
         Room room = roomCommandPort.getByIdOrThrow(roomId);
         Book book = bookCommandPort.findById(room.getBookId());
 
@@ -66,6 +68,7 @@ private RoomPlayingDetailViewResponse buildResponse(Long userId, Room room, Book
                 .currentPage(roomParticipants.getCurrentPageOfUser(userId))
                 .userPercentage(roomParticipants.getUserPercentageOfUser(userId))
                 .currentVotes(topParticipationVotes)
+                .categoryColor(roomQueryPort.findAliasColorOfCategory(room.getCategory()))      // TODO : 리펙토링 대상
                 .build();
     }
 }

src/main/java/konkuk/thip/room/application/service/RoomShowRecruitingDetailViewService.java

@@ -53,27 +53,28 @@ private RoomRecruitingDetailViewResponse buildResponse(
             RoomParticipants participants,
             List<RoomRecruitingDetailViewResponse.RecommendRoom> recommendRooms
     ) {
-        return new RoomRecruitingDetailViewResponse(
-                participants.isHostOfRoom(userId),
-                participants.isJoiningToRoom(userId),
-                room.getId(),
-                room.getTitle(),
-                room.getCategory().getImageUrl(),
-                room.isPublic(),
-                DateUtil.formatDate(room.getStartDate()),
-                DateUtil.formatDate(room.getEndDate()),
-                DateUtil.formatAfterTime(room.getStartDate()),
-                room.getCategory().getValue(),
-                room.getDescription(),
-                participants.calculateMemberCount(),
-                room.getRecruitCount(),
-                book.getIsbn(),
-                book.getImageUrl(),
-                book.getTitle(),
-                book.getAuthorName(),
-                book.getDescription(),
-                book.getPublisher(),
-                recommendRooms
-        );
+        return RoomRecruitingDetailViewResponse.builder()
+                .isHost(participants.isHostOfRoom(userId))
+                .isJoining(participants.isJoiningToRoom(userId))
+                .roomId(room.getId())
+                .roomName(room.getTitle())
+                .roomImageUrl(room.getCategory().getImageUrl())
+                .isPublic(room.isPublic())
+                .progressStartDate(DateUtil.formatDate(room.getStartDate()))
+                .progressEndDate(DateUtil.formatDate(room.getEndDate()))
+                .recruitEndDate(DateUtil.formatAfterTime(room.getStartDate()))
+                .category(room.getCategory().getValue())
+                .categoryColor(roomQueryPort.findAliasColorOfCategory(room.getCategory()))      // TODO : 리펙토링 대상
+                .roomDescription(room.getDescription())
+                .memberCount(participants.calculateMemberCount())
+                .recruitCount(room.getRecruitCount())
+                .isbn(book.getIsbn())
+                .bookImageUrl(book.getImageUrl())
+                .bookTitle(book.getTitle())
+                .authorName(book.getAuthorName())
+                .bookDescription(book.getDescription())
+                .publisher(book.getPublisher())
+                .recommendRooms(recommendRooms)
+                .build();
     }
 }