Develop -> main merge

src/main/kotlin/com/wafflestudio/csereal/CserealApplication.kt

@@ -3,9 +3,11 @@ package com.wafflestudio.csereal
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing
+import org.springframework.scheduling.annotation.EnableAsync
 
 @EnableJpaAuditing
 @SpringBootApplication
+@EnableAsync
 class CserealApplication
 
 fun main(args: Array<String>) {

src/main/kotlin/com/wafflestudio/csereal/common/aop/SecurityAspect.kt

@@ -1,6 +1,7 @@
 package com.wafflestudio.csereal.common.aop
 
 import com.wafflestudio.csereal.common.CserealException
+import com.wafflestudio.csereal.common.mockauth.CustomPrincipal
 import com.wafflestudio.csereal.core.user.database.Role
 import com.wafflestudio.csereal.core.user.database.UserEntity
 import com.wafflestudio.csereal.core.user.database.UserRepository
@@ -38,6 +39,11 @@ class SecurityAspect(private val userRepository: UserRepository) {
         val authentication = SecurityContextHolder.getContext().authentication
         val principal = authentication.principal
 
+        // for dev Mock User
+        if (principal is CustomPrincipal) {
+            return principal.userEntity
+        }
+
         if (principal !is OidcUser) {
             throw CserealException.Csereal401("로그인이 필요합니다.")
         }

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Profile
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.core.Authentication
@@ -18,6 +19,7 @@ import org.springframework.web.cors.CorsConfiguration
 import org.springframework.web.cors.CorsConfigurationSource
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource
 
+@Profile("!test")
 @Configuration
 @EnableWebSecurity
 @EnableConfigurationProperties(EndpointProperties::class)

src/main/kotlin/com/wafflestudio/csereal/common/mockauth/CustomPrincipal.kt

@@ -0,0 +1,10 @@
+package com.wafflestudio.csereal.common.mockauth
+
+import com.wafflestudio.csereal.core.user.database.UserEntity
+import java.security.Principal
+
+data class CustomPrincipal(val userEntity: UserEntity) : Principal {
+    override fun getName(): String {
+        return userEntity.username
+    }
+}

src/main/kotlin/com/wafflestudio/csereal/common/mockauth/DevAuthController.kt

@@ -0,0 +1,49 @@
+package com.wafflestudio.csereal.common.mockauth
+
+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 jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
+import org.springframework.http.ResponseEntity
+import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
+import org.springframework.security.core.authority.SimpleGrantedAuthority
+import org.springframework.security.core.context.SecurityContextHolder
+import org.springframework.security.web.context.SecurityContextRepository
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+//TODO: 정식 릴리즈 후에는 dev 서버에서만 가능하게
+@RestController
+@RequestMapping("/api")
+class DevAuthController(
+    private val authenticationManager: AuthenticationManager,
+    private val userRepository: UserRepository,
+    private val securityContextRepository: SecurityContextRepository
+) {
+
+    @GetMapping("/mock-login")
+    fun mockLogin(request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
+        val mockUser = userRepository.findByUsername("devUser")
+            ?: userRepository.save(UserEntity("devUser", "Mock", "mock@abc.com", "0000-00000", Role.ROLE_STAFF))
+        val customPrincipal = CustomPrincipal(mockUser)
+        val authenticationToken = UsernamePasswordAuthenticationToken(
+            customPrincipal,
+            null,
+            listOf(
+                SimpleGrantedAuthority("ROLE_STAFF")
+            )
+        )
+
+        val authentication = authenticationManager.authenticate(authenticationToken)
+        SecurityContextHolder.getContext().authentication = authentication
+
+        securityContextRepository.saveContext(SecurityContextHolder.getContext(), request, response)
+
+        request.getSession(true)
+
+        return ResponseEntity.ok().body("Mock user authenticated")
+    }
+}

src/main/kotlin/com/wafflestudio/csereal/common/mockauth/DevAuthenticationProvider.kt

@@ -0,0 +1,26 @@
+package com.wafflestudio.csereal.common.mockauth
+
+import com.wafflestudio.csereal.common.CserealException
+import com.wafflestudio.csereal.core.user.database.UserRepository
+import org.springframework.security.authentication.AuthenticationProvider
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
+import org.springframework.security.core.Authentication
+import org.springframework.security.core.authority.SimpleGrantedAuthority
+import org.springframework.stereotype.Component
+
+@Component
+class DevAuthenticationProvider(private val userRepository: UserRepository) : AuthenticationProvider {
+
+    override fun authenticate(authentication: Authentication): Authentication? {
+        val username = authentication.name
+        val userEntity =
+            userRepository.findByUsername(username) ?: throw CserealException.Csereal404("Mock User not found")
+
+        val customPrincipal = CustomPrincipal(userEntity)
+        return UsernamePasswordAuthenticationToken(customPrincipal, null, listOf(SimpleGrantedAuthority("ROLE_STAFF")))
+    }
+
+    override fun supports(authentication: Class<*>): Boolean {
+        return UsernamePasswordAuthenticationToken::class.java.isAssignableFrom(authentication)
+    }
+}

src/main/kotlin/com/wafflestudio/csereal/common/mockauth/MockAuthConfig.kt

@@ -0,0 +1,25 @@
+package com.wafflestudio.csereal.common.mockauth
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.security.authentication.AuthenticationManager
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.web.context.HttpSessionSecurityContextRepository
+import org.springframework.security.web.context.SecurityContextRepository
+
+@Configuration
+class MockAuthConfig(
+    private val devAuthenticationProvider: DevAuthenticationProvider
+) {
+    @Bean
+    fun authenticationManager(http: HttpSecurity): AuthenticationManager {
+        http.authenticationProvider(devAuthenticationProvider)
+        return http.getSharedObject(AuthenticationManagerBuilder::class.java).build()
+    }
+
+    @Bean
+    fun securityContextRepository(): SecurityContextRepository {
+        return HttpSessionSecurityContextRepository()
+    }
+}

src/main/kotlin/com/wafflestudio/csereal/common/properties/LanguageType.kt

@@ -0,0 +1,21 @@
+package com.wafflestudio.csereal.common.properties
+
+import com.wafflestudio.csereal.common.CserealException
+
+enum class LanguageType {
+    KO, EN;
+
+    companion object {
+        fun makeStringToLanguageType(language: String): LanguageType {
+            try {
+                val upperLanguageType = language.uppercase()
+                return LanguageType.valueOf(upperLanguageType)
+            } catch (e: IllegalArgumentException) {
+                throw CserealException.Csereal400("해당하는 enum을 찾을 수 없습니다")
+            }
+        }
+
+        // dto로 통신할 때 소문자로 return
+        fun makeLowercase(languageType: LanguageType): String = languageType.toString().lowercase()
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.wafflestudio.csereal.common.utils
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
+
+@Converter
+class StringListConverter : AttributeConverter<MutableList<String>, String> {
+    override fun convertToDatabaseColumn(p0: MutableList<String>?): String =
+        ObjectMapper().writeValueAsString(p0 ?: mutableListOf<String>())
+
+    override fun convertToEntityAttribute(p0: String?): MutableList<String> =
+        ObjectMapper().readValue(p0 ?: "[]")
+}

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

@@ -26,3 +26,16 @@ fun substringAroundKeyword(keyword: String, content: String, amount: Int): Pair<
         (index - frontIndex) to content.substring(frontIndex, backIndex)
     }
 }
+
+fun exchangePageNum(pageSize: Int, pageNum: Int, total: Long): Int {
+    // Validate
+    if (!(pageSize > 0 && pageNum > 0 && total >= 0)) {
+        throw RuntimeException()
+    }
+
+    return if ((pageNum - 1) * pageSize < total) {
+        pageNum
+    } else {
+        Math.ceil(total.toDouble() / pageSize).toInt()
+    }
+}

src/main/kotlin/com/wafflestudio/csereal/core/about/api/AboutController.kt

@@ -36,24 +36,31 @@ class AboutController(
     // read 목록이 하나
     @GetMapping("/{postType}")
     fun readAbout(
+        @RequestParam(required = false, defaultValue = "ko") language: String,
         @PathVariable postType: String
     ): ResponseEntity<AboutDto> {
-        return ResponseEntity.ok(aboutService.readAbout(postType))
+        return ResponseEntity.ok(aboutService.readAbout(language, postType))
     }
 
     @GetMapping("/student-clubs")
-    fun readAllClubs(): ResponseEntity<List<AboutDto>> {
-        return ResponseEntity.ok(aboutService.readAllClubs())
+    fun readAllClubs(
+        @RequestParam(required = false, defaultValue = "ko") language: String
+    ): ResponseEntity<List<AboutDto>> {
+        return ResponseEntity.ok(aboutService.readAllClubs(language))
     }
 
     @GetMapping("/facilities")
-    fun readAllFacilities(): ResponseEntity<List<AboutDto>> {
-        return ResponseEntity.ok(aboutService.readAllFacilities())
+    fun readAllFacilities(
+        @RequestParam(required = false, defaultValue = "ko") language: String
+    ): ResponseEntity<List<AboutDto>> {
+        return ResponseEntity.ok(aboutService.readAllFacilities(language))
     }
 
     @GetMapping("/directions")
-    fun readAllDirections(): ResponseEntity<List<AboutDto>> {
-        return ResponseEntity.ok(aboutService.readAllDirections())
+    fun readAllDirections(
+        @RequestParam(required = false, defaultValue = "ko") language: String
+    ): ResponseEntity<List<AboutDto>> {
+        return ResponseEntity.ok(aboutService.readAllDirections(language))
     }
 
     @GetMapping("/future-careers")
@@ -95,4 +102,15 @@ class AboutController(
     ): ResponseEntity<List<DirectionDto>> {
         return ResponseEntity.ok(aboutService.migrateDirections(requestList))
     }
+
+    @PatchMapping("/migrateImage/{aboutId}")
+    fun migrateAboutImageAndAttachment(
+        @PathVariable aboutId: Long,
+        @RequestPart("mainImage") mainImage: MultipartFile?,
+        @RequestPart("attachments") attachments: List<MultipartFile>?
+    ): ResponseEntity<AboutDto> {
+        return ResponseEntity.ok(
+            aboutService.migrateAboutImageAndAttachments(aboutId, mainImage, attachments)
+        )
+    }
 }

src/main/kotlin/com/wafflestudio/csereal/core/about/database/AboutEntity.kt

@@ -3,6 +3,8 @@ package com.wafflestudio.csereal.core.about.database
 import com.wafflestudio.csereal.common.config.BaseTimeEntity
 import com.wafflestudio.csereal.common.controller.AttachmentContentEntityType
 import com.wafflestudio.csereal.common.controller.MainImageContentEntityType
+import com.wafflestudio.csereal.common.properties.LanguageType
+import com.wafflestudio.csereal.common.utils.StringListConverter
 import com.wafflestudio.csereal.core.about.dto.AboutDto
 import com.wafflestudio.csereal.core.resource.attachment.database.AttachmentEntity
 import com.wafflestudio.csereal.core.resource.mainImage.database.MainImageEntity
@@ -12,16 +14,18 @@ import jakarta.persistence.*
 class AboutEntity(
     @Enumerated(EnumType.STRING)
     var postType: AboutPostType,
+    @Enumerated(EnumType.STRING)
+    var language: LanguageType = LanguageType.KO,
     var name: String?,
-    var engName: String?,
 
     @Column(columnDefinition = "mediumText")
     var description: String,
 
     var year: Int?,
 
-    @OneToMany(mappedBy = "about", cascade = [CascadeType.ALL], orphanRemoval = true)
-    val locations: MutableList<LocationEntity> = mutableListOf(),
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringListConverter::class)
+    var locations: MutableList<String> = mutableListOf(),
 
     @OneToMany(mappedBy = "")
     var attachments: MutableList<AttachmentEntity> = mutableListOf(),
@@ -34,13 +38,14 @@ class AboutEntity(
     override fun bringAttachments(): List<AttachmentEntity> = attachments
 
     companion object {
-        fun of(postType: AboutPostType, aboutDto: AboutDto): AboutEntity {
+        fun of(postType: AboutPostType, languageType: LanguageType, aboutDto: AboutDto): AboutEntity {
             return AboutEntity(
                 postType = postType,
+                language = languageType,
                 name = aboutDto.name,
-                engName = aboutDto.engName,
                 description = aboutDto.description,
-                year = aboutDto.year
+                year = aboutDto.year,
+                locations = aboutDto.locations?.toMutableList() ?: mutableListOf()
             )
         }
     }

src/main/kotlin/com/wafflestudio/csereal/core/about/database/AboutRepository.kt

@@ -1,8 +1,15 @@
 package com.wafflestudio.csereal.core.about.database
 
+import com.wafflestudio.csereal.common.properties.LanguageType
 import org.springframework.data.jpa.repository.JpaRepository
 
 interface AboutRepository : JpaRepository<AboutEntity, Long> {
-    fun findAllByPostTypeOrderByName(postType: AboutPostType): List<AboutEntity>
-    fun findByPostType(postType: AboutPostType): AboutEntity
+    fun findAllByLanguageAndPostTypeOrderByName(
+        languageType: LanguageType,
+        postType: AboutPostType
+    ): List<AboutEntity>
+    fun findByLanguageAndPostType(
+        languageType: LanguageType,
+        postType: AboutPostType
+    ): AboutEntity
 }