diff --git a/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/application/dto/res/CommunityListRes.kt b/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/application/dto/res/CommunityListRes.kt index 4806412..a69654b 100644 --- a/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/application/dto/res/CommunityListRes.kt +++ b/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/application/dto/res/CommunityListRes.kt @@ -8,5 +8,6 @@ data class CommunityListRes @QueryProjection constructor( val content: String, val createdAt: LocalDateTime, val like: Long, - val writer: String + val writerName: String, + val writerId: Long ) \ No newline at end of file diff --git a/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/application/service/CommunityService.kt b/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/application/service/CommunityService.kt index bc25660..aaebf4c 100644 --- a/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/application/service/CommunityService.kt +++ b/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/application/service/CommunityService.kt @@ -41,15 +41,16 @@ class CommunityService( fun getList(page: PageRequest): List { if (page.page < 1) throw CustomException(GlobalExceptionCode.INVALID_PARAMETER) return queryCommunityRepository.findWithPagination(page) - .stream().map { - community-> CommunityListRes( - community.communityId, - community.content, - community.createdAt, - queryLikeRepository.getCntByCommunityId(community.communityId), - community.writer - ) - }.toList() + .map { + CommunityListRes( + it.communityId, + it.content, + it.createdAt, + queryLikeRepository.getCntByCommunityId(it.communityId), + it.writerName, + it.writerId + ) + } } fun getById(id: Long): CommunityListRes? { diff --git a/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/repository/QueryDslCommunityRepository.kt b/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/repository/QueryDslCommunityRepository.kt index 2e99e8a..f3a656b 100644 --- a/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/repository/QueryDslCommunityRepository.kt +++ b/infinity-core/src/main/kotlin/com/molohala/infinitycore/community/repository/QueryDslCommunityRepository.kt @@ -4,7 +4,6 @@ import com.molohala.infinitycore.common.PageRequest import com.molohala.infinitycore.community.application.dto.res.CommunityListRes import com.molohala.infinitycore.community.domain.entity.Community import com.molohala.infinitycore.community.domain.entity.QCommunity.community -import com.molohala.infinitycore.like.domain.entity.QLike.like import com.molohala.infinitycore.member.domain.entity.QMember.member import com.querydsl.core.types.ConstructorExpression import com.querydsl.core.types.Projections @@ -12,7 +11,6 @@ import com.querydsl.core.types.dsl.Expressions import com.querydsl.jpa.impl.JPAQuery import com.querydsl.jpa.impl.JPAQueryFactory import org.springframework.stereotype.Repository -import java.time.LocalDateTime @Repository class QueryDslCommunityRepository( @@ -49,7 +47,8 @@ class QueryDslCommunityRepository( community.content, community.createdAt, Expressions.constant(likeCount), // 집계 함수로 얻은 좋아요 개수를 상수 표현식으로 추가 - member.name + member.name, + member.id ) } } \ No newline at end of file diff --git a/infinity-infra/src/main/kotlin/com/molohala/infinityinfra/token/TokenFilter.kt b/infinity-infra/src/main/kotlin/com/molohala/infinityinfra/token/TokenFilter.kt index e4a0da9..2bd2928 100644 --- a/infinity-infra/src/main/kotlin/com/molohala/infinityinfra/token/TokenFilter.kt +++ b/infinity-infra/src/main/kotlin/com/molohala/infinityinfra/token/TokenFilter.kt @@ -1,5 +1,6 @@ package com.molohala.infinityinfra.token +import com.molohala.infinitycommon.exception.custom.CustomException import jakarta.servlet.FilterChain import jakarta.servlet.ServletException import jakarta.servlet.http.HttpServletRequest @@ -19,7 +20,7 @@ class TokenFilter( private const val TOKEN_TYPE = "Bearer" } - @Throws(ServletException::class, IOException::class) + @Throws(ServletException::class, IOException::class, CustomException::class) override fun doFilterInternal( request: HttpServletRequest, response: HttpServletResponse,