merge develop to main

src/main/kotlin/com/wafflestudio/csereal/core/notice/database/NoticeRepository.kt

@@ -1,24 +1,17 @@
 package com.wafflestudio.csereal.core.notice.database
 
 import com.querydsl.core.BooleanBuilder
+import com.querydsl.core.types.Projections
 import com.querydsl.jpa.impl.JPAQueryFactory
 import com.wafflestudio.csereal.common.repository.CommonRepository
-import com.wafflestudio.csereal.common.repository.CommonRepositoryImpl
 import com.wafflestudio.csereal.common.utils.FixedPageRequest
 import com.wafflestudio.csereal.core.notice.database.QNoticeEntity.noticeEntity
 import com.wafflestudio.csereal.core.notice.database.QNoticeTagEntity.noticeTagEntity
 import com.wafflestudio.csereal.core.notice.dto.NoticeSearchDto
 import com.wafflestudio.csereal.core.notice.dto.NoticeSearchResponse
-import com.wafflestudio.csereal.core.user.database.Role
-import com.wafflestudio.csereal.core.user.database.UserEntity
-import com.wafflestudio.csereal.core.user.database.UserRepository
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository
-import org.springframework.security.core.context.SecurityContextHolder
-import org.springframework.security.oauth2.core.oidc.user.OidcUser
 import org.springframework.stereotype.Component
-import org.springframework.web.context.request.RequestAttributes
-import org.springframework.web.context.request.RequestContextHolder
 import java.time.LocalDateTime
 
 interface NoticeRepository : JpaRepository<NoticeEntity, Long>, CustomNoticeRepository {
@@ -39,9 +32,8 @@ interface CustomNoticeRepository {
 
 @Component
 class NoticeRepositoryImpl(
-        private val queryFactory: JPAQueryFactory,
-        private val userRepository: UserRepository,
-        private val commonRepository: CommonRepository,
+    private val queryFactory: JPAQueryFactory,
+    private val commonRepository: CommonRepository,
 ) : CustomNoticeRepository {
     override fun searchNotice(
         tag: List<String>?,
@@ -50,30 +42,15 @@ class NoticeRepositoryImpl(
         usePageBtn: Boolean,
         isStaff: Boolean
     ): NoticeSearchResponse {
-        var user = RequestContextHolder.getRequestAttributes()?.getAttribute(
-            "loggedInUser",
-            RequestAttributes.SCOPE_REQUEST
-        ) as UserEntity?
-
-        if (user == null) {
-            val oidcUser = SecurityContextHolder.getContext().authentication.principal as OidcUser
-            val username = oidcUser.idToken.getClaim<String>("username")
-
-            if (userRepository.findByUsername(username) == null)  {
-                user = null
-            } else {
-                user = userRepository.findByUsername(username)
-            }
-        }
         val keywordBooleanBuilder = BooleanBuilder()
         val tagsBooleanBuilder = BooleanBuilder()
         val isPrivateBooleanBuilder = BooleanBuilder()
 
         if (!keyword.isNullOrEmpty()) {
             val booleanTemplate = commonRepository.searchFullDoubleTextTemplate(
-                    keyword,
-                    noticeEntity.title,
-                    noticeEntity.plainTextDescription,
+                keyword,
+                noticeEntity.title,
+                noticeEntity.plainTextDescription,
             )
             keywordBooleanBuilder.and(booleanTemplate.gt(0.0))
         }
@@ -93,7 +70,17 @@ class NoticeRepositoryImpl(
             )
         }
 
-        val jpaQuery = queryFactory.selectFrom(noticeEntity)
+        val jpaQuery = queryFactory.select(
+            Projections.constructor(
+                NoticeSearchDto::class.java,
+                noticeEntity.id,
+                noticeEntity.title,
+                noticeEntity.createdAt,
+                noticeEntity.isPinned,
+                noticeEntity.attachments.isNotEmpty
+            )
+        )
+            .from(noticeEntity)
             .leftJoin(noticeTagEntity).on(noticeTagEntity.notice.eq(noticeEntity))
             .where(noticeEntity.isDeleted.eq(false))
             .where(keywordBooleanBuilder, tagsBooleanBuilder, isPrivateBooleanBuilder)
@@ -109,25 +96,14 @@ class NoticeRepositoryImpl(
             total = (10 * pageable.pageSize).toLong() // 10개 페이지 고정
         }
 
-        val noticeEntityList = jpaQuery
+        val noticeSearchDtoList = jpaQuery
             .orderBy(noticeEntity.isPinned.desc())
             .orderBy(noticeEntity.createdAt.desc())
             .offset(pageRequest.offset)
             .limit(pageRequest.pageSize.toLong())
             .distinct()
             .fetch()
 
-        val noticeSearchDtoList: List<NoticeSearchDto> = noticeEntityList.map {
-            val hasAttachment: Boolean = it.attachments.isNotEmpty()
-
-            NoticeSearchDto(
-                id = it.id,
-                title = it.title,
-                createdAt = it.createdAt,
-                isPinned = it.isPinned,
-                hasAttachment = hasAttachment
-            )
-        }
         return NoticeSearchResponse(total, noticeSearchDtoList)
     }
 }

src/main/kotlin/com/wafflestudio/csereal/core/notice/dto/NoticeSearchDto.kt

@@ -1,6 +1,7 @@
 package com.wafflestudio.csereal.core.notice.dto
 
 import com.querydsl.core.annotations.QueryProjection
+import com.wafflestudio.csereal.core.notice.database.NoticeEntity
 import java.time.LocalDateTime
 
 data class NoticeSearchDto @QueryProjection constructor(
@@ -10,5 +11,11 @@ data class NoticeSearchDto @QueryProjection constructor(
     val isPinned: Boolean,
     val hasAttachment: Boolean,
 ) {
-
-}
+    constructor(entity: NoticeEntity, hasAttachment: Boolean) : this(
+        entity.id,
+        entity.title,
+        entity.createdAt,
+        entity.isPinned,
+        hasAttachment
+    )
+}