merge develop to main

.github/workflows/build_and_test.yaml

@@ -0,0 +1,36 @@
+on:
+  pull_request:
+    branches:
+      - main
+      - develop
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      issues: read
+      checks: write
+      pull-requests: write
+
+    steps:
+      - uses: 'actions/checkout@v3'
+
+      - name: Setup Java JDK
+        uses: actions/setup-java@v3.12.0
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Build with Gradle
+        run: ./gradlew clean build -x test
+
+      - name: Run Tests with Gradle
+        run: ./gradlew test
+
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2.9.0
+        if: always()
+        with:
+          files: build/test-results/**/*.xml

build.gradle.kts

@@ -33,6 +33,20 @@ dependencies {
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.security:spring-security-test")
 
+    // kotest
+    testImplementation("io.kotest:kotest-runner-junit5-jvm:5.7.1")
+    testImplementation("io.kotest:kotest-assertions-core-jvm:5.7.1")
+    testImplementation("io.kotest:kotest-property-jvm:5.7.1")
+    implementation("io.kotest.extensions:kotest-extensions-spring:1.1.3")
+
+    // mockk
+    testImplementation("io.mockk:mockk:1.13.7")
+    testImplementation("com.ninja-squad:springmockk:4.0.2")
+
+    // h2 database
+    implementation("org.springframework.boot:spring-boot-starter-jdbc")
+    testImplementation("com.h2database:h2")
+
     //queryDsl
     implementation("com.querydsl:querydsl-jpa:5.0.0:jakarta")
     kapt("com.querydsl:querydsl-apt:5.0.0:jakarta")
@@ -51,12 +65,6 @@ dependencies {
     // Custom Metadata
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
-	// 이미지 업로드
-	implementation("commons-io:commons-io:2.11.0")
-
-	// 썸네일 보여주기
-	implementation("net.coobird:thumbnailator:0.4.19")
-
 }
 noArg {
     annotation("jakarta.persistence.Entity")
@@ -79,4 +87,5 @@ tasks.withType<KotlinCompile> {
 
 tasks.withType<Test> {
     useJUnitPlatform()
+    systemProperty("spring.profiles.active", "test")
 }

src/main/kotlin/com/wafflestudio/csereal/common/config/CustomAuthenticationSuccessHandler.kt

@@ -13,7 +13,7 @@ class CustomAuthenticationSuccessHandler(
         response: HttpServletResponse,
         authentication: Authentication
     ) {
-        val redirectUrl = "${frontendEndpoint}/login/success"
+        val redirectUrl = "http://localhost:3000/login/success"
         response.sendRedirect(redirectUrl)
     }
 

src/main/kotlin/com/wafflestudio/csereal/common/config/SecurityConfig.kt

@@ -57,7 +57,7 @@ class SecurityConfig(
                 response: HttpServletResponse?,
                 authentication: Authentication?
             ) {
-                val redirectUrl = "${endpointProperties.frontend}/logout/success"
+                val redirectUrl = "http://localhost:3000/logout/success"
                 super.setDefaultTargetUrl(redirectUrl)
                 super.onLogoutSuccess(request, response, authentication)
             }

src/main/kotlin/com/wafflestudio/csereal/common/utils/FixedPageRequest.kt

@@ -0,0 +1,24 @@
+package com.wafflestudio.csereal.common.utils
+
+import org.springframework.data.domain.PageRequest
+import org.springframework.data.domain.Pageable
+import kotlin.math.floor
+
+class FixedPageRequest(pageable: Pageable, total: Long) :
+    PageRequest(getPageNum(pageable, total), pageable.pageSize, pageable.sort) {
+
+    companion object {
+        private fun getPageNum(pageable: Pageable, total: Long): Int {
+            val pageNum = pageable.pageNumber
+            val pageSize = pageable.pageSize
+            val requestCount = pageNum * pageSize
+
+            if (total > requestCount) {
+                return pageNum
+            }
+
+            return floor(total.toDouble() / pageSize).toInt()
+        }
+    }
+
+}

src/main/kotlin/com/wafflestudio/csereal/common/utils/Utils.kt

@@ -0,0 +1,10 @@
+package com.wafflestudio.csereal.common.utils
+
+import org.jsoup.Jsoup
+import org.jsoup.parser.Parser
+import org.jsoup.safety.Safelist
+
+fun cleanTextFromHtml(description: String): String {
+    val cleanDescription = Jsoup.clean(description, Safelist.none())
+    return Parser.unescapeEntities(cleanDescription, false)
+}

src/main/kotlin/com/wafflestudio/csereal/core/admin/database/AdminRepository.kt

@@ -25,7 +25,7 @@ class AdminRepositoryImpl(
                 newsEntity.createdAt
             )
         ).from(newsEntity)
-            .where(newsEntity.isDeleted.eq(false), newsEntity.isPublic.eq(true), newsEntity.isSlide.eq(true))
+            .where(newsEntity.isDeleted.eq(false), newsEntity.isPrivate.eq(false), newsEntity.isSlide.eq(true))
             .orderBy(newsEntity.createdAt.desc())
             .offset(40*pageNum)
             .limit(40)

src/main/kotlin/com/wafflestudio/csereal/core/admissions/api/AdmissionsController.kt

@@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RestController
 class AdmissionsController(
     private val admissionsService: AdmissionsService
 ) {
-    @PostMapping("/undergraduate")
+    @PostMapping("/undergraduate/{postType}")
     fun createUndergraduateAdmissions(
-        @RequestParam postType: String,
+        @PathVariable postType: String,
         @Valid @RequestBody request: AdmissionsDto
     ) : AdmissionsDto {
         return admissionsService.createUndergraduateAdmissions(postType, request)
@@ -32,9 +32,9 @@ class AdmissionsController(
         return admissionsService.createGraduateAdmissions(request)
     }
 
-    @GetMapping("/undergraduate")
+    @GetMapping("/undergraduate/{postType}")
     fun readUndergraduateAdmissions(
-        @RequestParam postType: String
+        @PathVariable postType: String
     ) : ResponseEntity<AdmissionsDto> {
         return ResponseEntity.ok(admissionsService.readUndergraduateAdmissions(postType))
     }

src/main/kotlin/com/wafflestudio/csereal/core/admissions/database/AdmissionsEntity.kt

@@ -10,14 +10,14 @@ import jakarta.persistence.Enumerated
 class AdmissionsEntity(
     @Enumerated(EnumType.STRING)
     val postType: AdmissionsPostType,
-    val title: String,
+    val pageName: String,
     val description: String,
 ): BaseTimeEntity() {
     companion object {
-        fun of(postType: AdmissionsPostType, admissionsDto: AdmissionsDto) : AdmissionsEntity {
+        fun of(postType: AdmissionsPostType, pageName: String, admissionsDto: AdmissionsDto) : AdmissionsEntity {
             return AdmissionsEntity(
                 postType = postType,
-                title = admissionsDto.title,
+                pageName = pageName,
                 description = admissionsDto.description,
             )
         }

src/main/kotlin/com/wafflestudio/csereal/core/admissions/dto/AdmissionsDto.kt

@@ -5,7 +5,6 @@ import java.time.LocalDateTime
 
 data class AdmissionsDto(
     val id: Long,
-    val title: String,
     val description: String,
     val createdAt: LocalDateTime?,
     val modifiedAt: LocalDateTime?,
@@ -14,7 +13,6 @@ data class AdmissionsDto(
         fun of(entity: AdmissionsEntity) : AdmissionsDto = entity.run {
             AdmissionsDto(
                 id = this.id,
-                title = this.title,
                 description = this.description,
                 createdAt = this.createdAt,
                 modifiedAt = this.modifiedAt,

src/main/kotlin/com/wafflestudio/csereal/core/admissions/service/AdmissionsService.kt

@@ -24,7 +24,13 @@ class AdmissionsServiceImpl(
     override fun createUndergraduateAdmissions(postType: String, request: AdmissionsDto): AdmissionsDto {
         val enumPostType = makeStringToAdmissionsPostType(postType)
 
-        val newAdmissions = AdmissionsEntity.of(enumPostType, request)
+        val pageName = when(enumPostType) {
+            AdmissionsPostType.UNDERGRADUATE_EARLY_ADMISSION -> "수시 모집"
+            AdmissionsPostType.UNDERGRADUATE_REGULAR_ADMISSION -> "정시 모집"
+            else -> throw CserealException.Csereal404("해당하는 페이지를 찾을 수 없습니다.")
+        }
+
+        val newAdmissions = AdmissionsEntity.of(enumPostType, pageName, request)
 
         admissionsRepository.save(newAdmissions)
 
@@ -33,7 +39,7 @@ class AdmissionsServiceImpl(
 
     @Transactional
     override fun createGraduateAdmissions(request: AdmissionsDto): AdmissionsDto {
-        val newAdmissions: AdmissionsEntity = AdmissionsEntity.of(AdmissionsPostType.GRADUATE, request)
+        val newAdmissions: AdmissionsEntity = AdmissionsEntity.of(AdmissionsPostType.GRADUATE, "전기/후기 모집", request)
 
         admissionsRepository.save(newAdmissions)
 

src/main/kotlin/com/wafflestudio/csereal/core/main/api/MainController.kt

@@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
-@RequestMapping
-@RestController("/api/v1")
+@RequestMapping("/api/v1")
+@RestController
 class MainController(
     private val mainService: MainService,
 ) {

src/main/kotlin/com/wafflestudio/csereal/core/main/database/MainRepository.kt

@@ -1,70 +1,121 @@
 package com.wafflestudio.csereal.core.main.database
 
-import com.querydsl.core.QueryFactory
 import com.querydsl.core.types.Projections
 import com.querydsl.jpa.impl.JPAQueryFactory
-import com.sun.tools.javac.Main
-import com.wafflestudio.csereal.core.main.dto.MainResponse
-import com.wafflestudio.csereal.core.main.dto.NewsResponse
-import com.wafflestudio.csereal.core.main.dto.NoticeResponse
+import com.wafflestudio.csereal.core.main.dto.MainImportantResponse
+import com.wafflestudio.csereal.core.main.dto.MainNoticeResponse
+import com.wafflestudio.csereal.core.main.dto.MainSlideResponse
+import com.wafflestudio.csereal.core.news.database.NewsRepository
 import com.wafflestudio.csereal.core.news.database.QNewsEntity.newsEntity
+import com.wafflestudio.csereal.core.notice.database.NoticeRepository
 import com.wafflestudio.csereal.core.notice.database.QNoticeEntity.noticeEntity
 import com.wafflestudio.csereal.core.notice.database.QNoticeTagEntity.noticeTagEntity
 import com.wafflestudio.csereal.core.notice.database.QTagInNoticeEntity.tagInNoticeEntity
+import com.wafflestudio.csereal.core.notice.database.TagInNoticeEnum
+import com.wafflestudio.csereal.core.resource.mainImage.service.MainImageService
+import com.wafflestudio.csereal.core.seminar.database.SeminarRepository
 
 import org.springframework.stereotype.Component
 
 interface MainRepository {
-    fun readMainSlide(): List<NewsResponse>
-    fun readMainNoticeTotal(): List<NoticeResponse>
-    fun readMainNoticeTag(tag: String): List<NoticeResponse>
+    fun readMainSlide(): List<MainSlideResponse>
+    fun readMainNoticeTotal(): List<MainNoticeResponse>
+    fun readMainNoticeTag(tagEnum: TagInNoticeEnum): List<MainNoticeResponse>
+    fun readMainImportant(): List<MainImportantResponse>
 }
 
 @Component
 class MainRepositoryImpl(
     private val queryFactory: JPAQueryFactory,
+    private val mainImageService: MainImageService,
+    private val noticeRepository: NoticeRepository,
+    private val newsRepository: NewsRepository,
+    private val seminarRepository: SeminarRepository,
 ) : MainRepository {
-    override fun readMainSlide(): List<NewsResponse> {
-        return queryFactory.select(
-            Projections.constructor(
-                NewsResponse::class.java,
-                newsEntity.id,
-                newsEntity.title,
-                newsEntity.createdAt
-            )
-        ).from(newsEntity)
-            .where(newsEntity.isDeleted.eq(false), newsEntity.isPublic.eq(true), newsEntity.isSlide.eq(true))
+    override fun readMainSlide(): List<MainSlideResponse> {
+        val newsEntityList = queryFactory.selectFrom(newsEntity)
+            .where(newsEntity.isDeleted.eq(false), newsEntity.isPrivate.eq(false), newsEntity.isSlide.eq(true))
             .orderBy(newsEntity.createdAt.desc())
             .limit(20).fetch()
+
+        return newsEntityList.map {
+            val imageURL = mainImageService.createImageURL(it.mainImage)
+            MainSlideResponse(
+                id = it.id,
+                title = it.title,
+                imageURL = imageURL,
+                createdAt = it.createdAt
+            )
+        }
     }
 
-    override fun readMainNoticeTotal(): List<NoticeResponse> {
+    override fun readMainNoticeTotal(): List<MainNoticeResponse> {
         return queryFactory.select(
             Projections.constructor(
-                NoticeResponse::class.java,
+                MainNoticeResponse::class.java,
                 noticeEntity.id,
                 noticeEntity.title,
                 noticeEntity.createdAt
             )
         ).from(noticeEntity)
-            .where(noticeEntity.isDeleted.eq(false), noticeEntity.isPublic.eq(true))
+            .where(noticeEntity.isDeleted.eq(false), noticeEntity.isPrivate.eq(false))
             .orderBy(noticeEntity.isPinned.desc()).orderBy(noticeEntity.createdAt.desc())
             .limit(6).fetch()
     }
-    override fun readMainNoticeTag(tag: String): List<NoticeResponse> {
+
+    override fun readMainNoticeTag(tagEnum: TagInNoticeEnum): List<MainNoticeResponse> {
         return queryFactory.select(
             Projections.constructor(
-                NoticeResponse::class.java,
+                MainNoticeResponse::class.java,
                 noticeTagEntity.notice.id,
                 noticeTagEntity.notice.title,
                 noticeTagEntity.notice.createdAt,
             )
         ).from(noticeTagEntity)
             .rightJoin(noticeEntity).on(noticeTagEntity.notice.eq(noticeEntity))
             .rightJoin(tagInNoticeEntity).on(noticeTagEntity.tag.eq(tagInNoticeEntity))
-            .where(noticeTagEntity.tag.name.eq(tag))
-            .where(noticeEntity.isDeleted.eq(false), noticeEntity.isPublic.eq(true))
+            .where(noticeTagEntity.tag.name.eq(tagEnum))
+            .where(noticeEntity.isDeleted.eq(false), noticeEntity.isPrivate.eq(true))
             .orderBy(noticeEntity.isPinned.desc()).orderBy(noticeEntity.createdAt.desc())
             .limit(6).distinct().fetch()
     }
+
+    override fun readMainImportant(): List<MainImportantResponse> {
+        val mainImportantResponses: MutableList<MainImportantResponse> = mutableListOf()
+        noticeRepository.findAllByIsImportant(true).forEach {
+            mainImportantResponses.add(
+                MainImportantResponse(
+                    id = it.id,
+                    title = it.title,
+                    createdAt = it.createdAt,
+                    category = "notice"
+                )
+            )
+        }
+
+        newsRepository.findAllByIsImportant(true).forEach {
+            mainImportantResponses.add(
+                MainImportantResponse(
+                    id = it.id,
+                    title = it.title,
+                    createdAt = it.createdAt,
+                    category = "news"
+                )
+            )
+        }
+
+        seminarRepository.findAllByIsImportant(true).forEach {
+            mainImportantResponses.add(
+                MainImportantResponse(
+                    id = it.id,
+                    title = it.title,
+                    createdAt = it.createdAt,
+                    category = "seminar"
+                )
+            )
+        }
+        mainImportantResponses.sortByDescending { it.createdAt }
+
+        return mainImportantResponses
+    }
 }

src/main/kotlin/com/wafflestudio/csereal/core/main/dto/NoticeResponse.kt → src/main/kotlin/com/wafflestudio/csereal/core/main/dto/MainImportantResponse.kt

@@ -1,11 +1,11 @@
 package com.wafflestudio.csereal.core.main.dto
 
-import com.querydsl.core.annotations.QueryProjection
 import java.time.LocalDateTime
 
-data class NoticeResponse @QueryProjection constructor(
+data class MainImportantResponse(
     val id: Long,
     val title: String,
     val createdAt: LocalDateTime?,
-){
+    val category: String,
+) {
 }