[Merge]

build.gradle.kts

@@ -42,6 +42,12 @@ dependencies {
 	// 태그 제거
 	implementation("org.jsoup:jsoup:1.15.4")
 
+	// 이미지 업로드
+	implementation("commons-io:commons-io:2.11.0")
+
+	// 썸네일 보여주기
+	implementation("net.coobird:thumbnailator:0.4.19")
+
 }
 noArg {
 	annotation("jakarta.persistence.Entity")

docker-compose-local.yml

@@ -11,7 +11,6 @@ services:
       - '3306:3306'
     volumes:
       - db:/var/lib/mysql
-      - $PWD/db/init.sql:/docker-entrypoint-initdb.d/init.sql
 volumes:
   db:
     driver: local

docker-compose.yml

@@ -6,7 +6,7 @@ services:
       args:
         PROFILE: ${PROFILE}
     ports:
-      - 80:8080
+      - 8080:8080
     environment:
       SPRING_DATASOURCE_URL: "jdbc:mysql://csereal_db_container:3306/${MYSQL_DATABASE}?serverTimezone=Asia/Seoul&useSSL=false&allowPublicKeyRetrieval=true"
       SPRING_DATASOURCE_USERNAME: ${MYSQL_USER}

src/main/kotlin/com/wafflestudio/csereal/common/Exceptions.kt

@@ -6,4 +6,5 @@ open class CserealException(msg: String, val status: HttpStatus) : RuntimeExcept
     class Csereal400(msg: String) : CserealException(msg, HttpStatus.BAD_REQUEST)
     class Csereal404(msg: String) : CserealException(msg, HttpStatus.NOT_FOUND)
     class Csereal401(msg: String) : CserealException(msg, HttpStatus.UNAUTHORIZED)
+    class Csereal409(msg: String) : CserealException(msg, HttpStatus.CONFLICT)
 }

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

@@ -0,0 +1,9 @@
+package com.wafflestudio.csereal.common.aop
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class AuthenticatedStaff
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class AuthenticatedForReservation

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

@@ -0,0 +1,53 @@
+package com.wafflestudio.csereal.common.aop
+
+import com.wafflestudio.csereal.common.CserealException
+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.aspectj.lang.annotation.Aspect
+import org.aspectj.lang.annotation.Before
+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
+
+@Aspect
+@Component
+class SecurityAspect(private val userRepository: UserRepository) {
+
+    @Before("@annotation(AuthenticatedStaff)")
+    fun checkStaffAuthentication() {
+        val user = getLoginUser()
+
+        if (user.role != Role.ROLE_STAFF) {
+            throw CserealException.Csereal401("권한이 없습니다.")
+        }
+    }
+
+    @Before("@annotation(AuthenticatedForReservation)")
+    fun checkReservationAuthentication() {
+        val user = getLoginUser()
+
+        if (user.role == null) {
+            throw CserealException.Csereal401("권한이 없습니다.")
+        }
+    }
+
+    private fun getLoginUser(): UserEntity {
+        val authentication = SecurityContextHolder.getContext().authentication
+        val principal = authentication.principal
+
+        if (principal !is OidcUser) {
+            throw CserealException.Csereal401("로그인이 필요합니다.")
+        }
+
+        val username = principal.idToken.getClaim<String>("username")
+        val user = userRepository.findByUsername(username) ?: throw CserealException.Csereal404("재로그인이 필요합니다.")
+
+        RequestContextHolder.getRequestAttributes()?.setAttribute("loggedInUser", user, RequestAttributes.SCOPE_REQUEST)
+
+        return user
+    }
+
+}

src/main/kotlin/com/wafflestudio/csereal/common/controller/ContentEntityType.kt

@@ -0,0 +1,7 @@
+package com.wafflestudio.csereal.common.controller
+
+import com.wafflestudio.csereal.core.resource.mainImage.database.MainImageEntity
+
+interface ContentEntityType {
+    fun bringMainImage(): MainImageEntity?
+}

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

@@ -4,13 +4,8 @@ import com.wafflestudio.csereal.core.about.dto.AboutDto
 import com.wafflestudio.csereal.core.about.service.AboutService
 import jakarta.validation.Valid
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
+import org.springframework.web.multipart.MultipartFile
 
 @RequestMapping("/about")
 @RestController
@@ -25,9 +20,10 @@ class AboutController(
     @PostMapping("/{postType}")
     fun createAbout(
         @PathVariable postType: String,
-        @Valid @RequestBody request: AboutDto
+        @Valid @RequestPart("request") request: AboutDto,
+        @RequestPart("image") image: MultipartFile?,
     ) : ResponseEntity<AboutDto> {
-        return ResponseEntity.ok(aboutService.createAbout(postType, request))
+        return ResponseEntity.ok(aboutService.createAbout(postType, request, image))
     }
 
     // read 목록이 하나

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

@@ -1,7 +1,9 @@
 package com.wafflestudio.csereal.core.about.database
 
 import com.wafflestudio.csereal.common.config.BaseTimeEntity
+import com.wafflestudio.csereal.common.controller.ContentEntityType
 import com.wafflestudio.csereal.core.about.dto.AboutDto
+import com.wafflestudio.csereal.core.resource.mainImage.database.MainImageEntity
 import jakarta.persistence.*
 
 @Entity(name = "about")
@@ -14,8 +16,14 @@ class AboutEntity(
     var year: Int?,
 
     @OneToMany(mappedBy = "about", cascade = [CascadeType.ALL], orphanRemoval = true)
-    val locations: MutableList<LocationEntity> = mutableListOf()
-) : BaseTimeEntity() {
+    val locations: MutableList<LocationEntity> = mutableListOf(),
+
+    @OneToOne
+    var mainImage: MainImageEntity? = null,
+
+) : BaseTimeEntity(), ContentEntityType {
+    override fun bringMainImage(): MainImageEntity? = mainImage
+
     companion object {
         fun of(postType: AboutPostType, aboutDto: AboutDto): AboutEntity {
             return AboutEntity(

src/main/kotlin/com/wafflestudio/csereal/core/about/dto/AboutDto.kt

@@ -12,10 +12,11 @@ data class AboutDto(
     val year: Int?,
     val createdAt: LocalDateTime?,
     val modifiedAt: LocalDateTime?,
-    val locations: List<String>?
+    val locations: List<String>?,
+    val imageURL: String?
 ) {
     companion object {
-        fun of(entity: AboutEntity) : AboutDto = entity.run {
+        fun of(entity: AboutEntity, imageURL: String?) : AboutDto = entity.run {
             AboutDto(
                 id = this.id,
                 name = this.name,
@@ -24,7 +25,8 @@ data class AboutDto(
                 year = this.year,
                 createdAt = this.createdAt,
                 modifiedAt = this.modifiedAt,
-                locations = this.locations.map { it.name }
+                locations = this.locations.map { it.name },
+                imageURL = imageURL
             )
         }
     }

src/main/kotlin/com/wafflestudio/csereal/core/about/service/AboutService.kt

@@ -6,11 +6,13 @@ import com.wafflestudio.csereal.core.about.database.AboutPostType
 import com.wafflestudio.csereal.core.about.database.AboutRepository
 import com.wafflestudio.csereal.core.about.database.LocationEntity
 import com.wafflestudio.csereal.core.about.dto.AboutDto
+import com.wafflestudio.csereal.core.resource.mainImage.service.ImageService
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
+import org.springframework.web.multipart.MultipartFile
 
 interface AboutService {
-    fun createAbout(postType: String, request: AboutDto): AboutDto
+    fun createAbout(postType: String, request: AboutDto, image: MultipartFile?): AboutDto
     fun readAbout(postType: String): AboutDto
     fun readAllClubs() : List<AboutDto>
     fun readAllFacilities() : List<AboutDto>
@@ -19,10 +21,11 @@ interface AboutService {
 
 @Service
 class AboutServiceImpl(
-    private val aboutRepository: AboutRepository
+    private val aboutRepository: AboutRepository,
+    private val imageService: ImageService,
 ) : AboutService {
     @Transactional
-    override fun createAbout(postType: String, request: AboutDto): AboutDto {
+    override fun createAbout(postType: String, request: AboutDto, image: MultipartFile?): AboutDto {
         val enumPostType = makeStringToEnum(postType)
         val newAbout = AboutEntity.of(enumPostType, request)
 
@@ -32,23 +35,30 @@ class AboutServiceImpl(
             }
         }
 
+        if(image != null) {
+            imageService.uploadImage(newAbout, image)
+        }
         aboutRepository.save(newAbout)
 
-        return AboutDto.of(newAbout)
+        val imageURL = imageService.createImageURL(newAbout.mainImage)
+
+        return AboutDto.of(newAbout, imageURL)
     }
 
     @Transactional(readOnly = true)
     override fun readAbout(postType: String): AboutDto {
         val enumPostType = makeStringToEnum(postType)
         val about = aboutRepository.findByPostType(enumPostType)
+        val imageURL = imageService.createImageURL(about.mainImage)
 
-        return AboutDto.of(about)
+        return AboutDto.of(about, imageURL)
     }
 
     @Transactional(readOnly = true)
     override fun readAllClubs(): List<AboutDto> {
         val clubs = aboutRepository.findAllByPostTypeOrderByName(AboutPostType.STUDENT_CLUBS).map {
-            AboutDto.of(it)
+            val imageURL = imageService.createImageURL(it.mainImage)
+            AboutDto.of(it, imageURL)
         }
 
         return clubs
@@ -57,7 +67,8 @@ class AboutServiceImpl(
     @Transactional(readOnly = true)
     override fun readAllFacilities(): List<AboutDto> {
         val facilities = aboutRepository.findAllByPostTypeOrderByName(AboutPostType.FACILITIES).map {
-            AboutDto.of(it)
+            val imageURL = imageService.createImageURL(it.mainImage)
+            AboutDto.of(it, imageURL)
         }
 
         return facilities
@@ -66,7 +77,8 @@ class AboutServiceImpl(
     @Transactional(readOnly = true)
     override fun readAllDirections(): List<AboutDto> {
         val directions = aboutRepository.findAllByPostTypeOrderByName(AboutPostType.DIRECTIONS).map {
-            AboutDto.of(it)
+            val imageURL = imageService.createImageURL(it.mainImage)
+            AboutDto.of(it, imageURL)
         }
 
         return directions

src/main/kotlin/com/wafflestudio/csereal/core/member/api/ProfessorController.kt

@@ -6,6 +6,7 @@ import com.wafflestudio.csereal.core.member.dto.SimpleProfessorDto
 import com.wafflestudio.csereal.core.member.service.ProfessorService
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
+import org.springframework.web.multipart.MultipartFile
 
 @RequestMapping("/professor")
 @RestController
@@ -14,8 +15,11 @@ class ProfessorController(
 ) {
 
     @PostMapping
-    fun createProfessor(@RequestBody createProfessorRequest: ProfessorDto): ResponseEntity<ProfessorDto> {
-        return ResponseEntity.ok(professorService.createProfessor(createProfessorRequest))
+    fun createProfessor(
+        @RequestPart("request") createProfessorRequest: ProfessorDto,
+        @RequestPart("image") image: MultipartFile?,
+    ): ResponseEntity<ProfessorDto> {
+        return ResponseEntity.ok(professorService.createProfessor(createProfessorRequest, image))
     }
 
     @GetMapping("/{professorId}")

src/main/kotlin/com/wafflestudio/csereal/core/member/api/StaffController.kt

@@ -4,14 +4,8 @@ import com.wafflestudio.csereal.core.member.dto.SimpleStaffDto
 import com.wafflestudio.csereal.core.member.dto.StaffDto
 import com.wafflestudio.csereal.core.member.service.StaffService
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.DeleteMapping
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PatchMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
+import org.springframework.web.multipart.MultipartFile
 
 @RequestMapping("/staff")
 @RestController
@@ -20,8 +14,11 @@ class StaffController(
 ) {
 
     @PostMapping
-    fun createStaff(@RequestBody createStaffRequest: StaffDto): ResponseEntity<StaffDto> {
-        return ResponseEntity.ok(staffService.createStaff(createStaffRequest))
+    fun createStaff(
+        @RequestPart("request") createStaffRequest: StaffDto,
+        @RequestPart("image") image: MultipartFile?,
+    ): ResponseEntity<StaffDto> {
+        return ResponseEntity.ok(staffService.createStaff(createStaffRequest,image))
     }
 
     @GetMapping("/{staffId}")

src/main/kotlin/com/wafflestudio/csereal/core/member/database/ProfessorEntity.kt

@@ -1,8 +1,10 @@
 package com.wafflestudio.csereal.core.member.database
 
 import com.wafflestudio.csereal.common.config.BaseTimeEntity
+import com.wafflestudio.csereal.common.controller.ContentEntityType
 import com.wafflestudio.csereal.core.member.dto.ProfessorDto
 import com.wafflestudio.csereal.core.research.database.LabEntity
+import com.wafflestudio.csereal.core.resource.mainImage.database.MainImageEntity
 import jakarta.persistence.*
 import java.time.LocalDate
 
@@ -39,8 +41,11 @@ class ProfessorEntity(
     @OneToMany(mappedBy = "professor", cascade = [CascadeType.ALL], orphanRemoval = true)
     val careers: MutableList<CareerEntity> = mutableListOf(),
 
-    var imageUri: String? = null
-) : BaseTimeEntity() {
+    @OneToOne
+    var mainImage: MainImageEntity? = null,
+
+) : BaseTimeEntity(), ContentEntityType {
+    override fun bringMainImage(): MainImageEntity? = mainImage
 
     companion object {
         fun of(professorDto: ProfessorDto): ProfessorEntity {
@@ -54,7 +59,7 @@ class ProfessorEntity(
                 phone = professorDto.phone,
                 fax = professorDto.fax,
                 email = professorDto.email,
-                website = professorDto.website
+                website = professorDto.website,
             )
         }
     }

src/main/kotlin/com/wafflestudio/csereal/core/member/database/StaffEntity.kt

@@ -1,10 +1,13 @@
 package com.wafflestudio.csereal.core.member.database
 
 import com.wafflestudio.csereal.common.config.BaseTimeEntity
+import com.wafflestudio.csereal.common.controller.ContentEntityType
 import com.wafflestudio.csereal.core.member.dto.StaffDto
+import com.wafflestudio.csereal.core.resource.mainImage.database.MainImageEntity
 import jakarta.persistence.CascadeType
 import jakarta.persistence.Entity
 import jakarta.persistence.OneToMany
+import jakarta.persistence.OneToOne
 
 @Entity(name = "staff")
 class StaffEntity(
@@ -18,9 +21,11 @@ class StaffEntity(
     @OneToMany(mappedBy = "staff", cascade = [CascadeType.ALL], orphanRemoval = true)
     val tasks: MutableList<TaskEntity> = mutableListOf(),
 
-    var imageUri: String? = null
+    @OneToOne
+    var mainImage: MainImageEntity? = null,
 
-) : BaseTimeEntity() {
+    ) : BaseTimeEntity(), ContentEntityType {
+    override fun bringMainImage(): MainImageEntity? = mainImage
 
     companion object {
         fun of(staffDto: StaffDto): StaffEntity {
@@ -29,7 +34,7 @@ class StaffEntity(
                 role = staffDto.role,
                 office = staffDto.office,
                 phone = staffDto.phone,
-                email = staffDto.email
+                email = staffDto.email,
             )
         }
     }