feat: 공지사항 수정, 삭제, 태그 기능 추가

build.gradle.kts

@@ -24,6 +24,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
 	implementation("org.springframework.boot:spring-boot-starter-security")
 	implementation("org.springframework.boot:spring-boot-starter-web")
+	implementation("org.springframework.boot:spring-boot-starter-validation")
 	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	runtimeOnly("com.mysql:mysql-connector-j")

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

@@ -0,0 +1,33 @@
+package com.wafflestudio.csereal.common.config
+
+import com.wafflestudio.csereal.common.CserealException
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
+import org.springframework.validation.BindingResult
+import org.springframework.web.bind.MethodArgumentNotValidException
+import org.springframework.web.bind.annotation.ExceptionHandler
+import org.springframework.web.bind.annotation.RestControllerAdvice
+import java.sql.SQLIntegrityConstraintViolationException
+
+@RestControllerAdvice
+class CserealExceptionHandler {
+
+    // @Valid로 인해 오류 떴을 때 메시지 전송
+    @ExceptionHandler(value = [MethodArgumentNotValidException::class])
+    fun handle(e: MethodArgumentNotValidException): ResponseEntity<Any> {
+        val bindingResult: BindingResult = e.bindingResult
+        return ResponseEntity(bindingResult.fieldError?.defaultMessage, HttpStatus.BAD_REQUEST)
+    }
+
+    // csereal 내부 규정 오류
+    @ExceptionHandler(value = [CserealException::class])
+    fun handle(e: CserealException): ResponseEntity<Any> {
+        return ResponseEntity(e.message, e.status)
+    }
+
+    // db에서 중복된 값 있을 때
+    @ExceptionHandler(value = [SQLIntegrityConstraintViolationException::class])
+    fun handle(e: SQLIntegrityConstraintViolationException): ResponseEntity<Any> {
+        return ResponseEntity("중복된 값이 있습니다.", HttpStatus.CONFLICT)
+    }
+}

src/main/kotlin/com/wafflestudio/csereal/core/notice/api/NoticeController.kt

@@ -2,7 +2,11 @@ package com.wafflestudio.csereal.core.notice.api
 
 import com.wafflestudio.csereal.core.notice.dto.CreateNoticeRequest
 import com.wafflestudio.csereal.core.notice.dto.NoticeDto
+import com.wafflestudio.csereal.core.notice.dto.UpdateNoticeRequest
 import com.wafflestudio.csereal.core.notice.service.NoticeService
+import jakarta.validation.Valid
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 
 @RequestMapping("/notice")
@@ -19,8 +23,31 @@ class NoticeController(
 
     @PostMapping
     fun createNotice(
-        @RequestBody request: CreateNoticeRequest
+        @Valid @RequestBody request: CreateNoticeRequest
     ) : NoticeDto {
         return noticeService.createNotice(request)
     }
+
+    @PatchMapping("/{noticeId}")
+    fun updateNotice(
+        @PathVariable noticeId: Long,
+        @Valid @RequestBody request: UpdateNoticeRequest,
+    ) : NoticeDto {
+        return noticeService.updateNotice(noticeId, request)
+    }
+
+    @DeleteMapping("/{noticeId}")
+    fun deleteNotice(
+        @PathVariable noticeId: Long
+    ) {
+        noticeService.deleteNotice(noticeId)
+    }
+
+    @PostMapping("/tag")
+    fun enrollTag(
+        @RequestBody tagName: Map<String, String>
+    ) : ResponseEntity<String> {
+        noticeService.enrollTag(tagName["name"]!!)
+        return ResponseEntity<String>("등록되었습니다. (tagName: ${tagName["name"]})", HttpStatus.OK)
+    }
 }

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

@@ -1,17 +1,42 @@
 package com.wafflestudio.csereal.core.notice.database
 
 import com.wafflestudio.csereal.common.config.BaseTimeEntity
+import jakarta.persistence.CascadeType
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
+import jakarta.persistence.OneToMany
 
 
 @Entity(name = "notice")
 class NoticeEntity(
+
+    @Column
+    var isDeleted: Boolean = false,
+
     @Column
     var title: String,
 
     @Column(columnDefinition = "text")
-    var description: String
+    var description: String,
+
+//    var postType: String,
+//
+//    var isPublic: Boolean,
+//
+//    var isSlide: Boolean,
+//
+//    var isPinned: Boolean,
+
+    @OneToMany(mappedBy = "notice", cascade = [CascadeType.ALL])
+    var noticeTag: MutableSet<NoticeTagEntity> = mutableSetOf()
 ): BaseTimeEntity() {
 
+    fun setNoticeTag(noticeTag: NoticeTagEntity) {
+
+        this.noticeTag.add(noticeTag)
+        noticeTag.notice = this
+    }
+
+
+
 }

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

@@ -0,0 +1,17 @@
+package com.wafflestudio.csereal.core.notice.database
+
+import com.wafflestudio.csereal.common.config.BaseTimeEntity
+import jakarta.persistence.*
+
+@Entity(name="noticeTag")
+class NoticeTagEntity(
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "notice_id")
+    var notice: NoticeEntity,
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "tag_id")
+    var tag: TagEntity,
+
+    ) : BaseTimeEntity() {
+}

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

@@ -0,0 +1,8 @@
+package com.wafflestudio.csereal.core.notice.database
+
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface NoticeTagRepository : JpaRepository<NoticeTagEntity, Long> {
+    fun findAllByNoticeId(noticeId: Long)
+    fun deleteAllByNoticeId(noticeId: Long)
+}

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

@@ -0,0 +1,15 @@
+package com.wafflestudio.csereal.core.notice.database
+
+import com.wafflestudio.csereal.common.config.BaseTimeEntity
+import jakarta.persistence.CascadeType
+import jakarta.persistence.Entity
+import jakarta.persistence.OneToMany
+
+@Entity(name = "tag")
+class TagEntity(
+    var name: String,
+
+    @OneToMany(mappedBy = "tag")
+    val noticeTag: MutableSet<NoticeTagEntity> = mutableSetOf()
+) : BaseTimeEntity() {
+}

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

@@ -0,0 +1,6 @@
+package com.wafflestudio.csereal.core.notice.database
+
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface TagRepository : JpaRepository<TagEntity, Long> {
+}

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

@@ -1,7 +1,14 @@
 package com.wafflestudio.csereal.core.notice.dto
 
+import jakarta.validation.constraints.NotBlank
+
 data class CreateNoticeRequest(
+    @field:NotBlank(message = "제목은 비어있을 수 없습니다")
     val title: String,
-    val description: String
+
+    @field:NotBlank(message = "내용은 비어있을 수 없습니다")
+    val description: String,
+
+    val tag: List<Long> = emptyList()
 ) {
 }

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

@@ -5,6 +5,7 @@ import java.time.LocalDateTime
 
 data class NoticeDto(
     val id: Long,
+    val isDeleted: Boolean,
     val title: String,
     val description: String,
     // val postType: String,
@@ -20,10 +21,15 @@ data class NoticeDto(
         fun of(entity: NoticeEntity): NoticeDto = entity.run {
             NoticeDto(
                 id = this.id,
+                isDeleted = false,
                 title = this.title,
                 description = this.description,
+                // postType = this.postType,
                 createdAt = this.createdAt,
-                modifiedAt = this.modifiedAt
+                modifiedAt = this.modifiedAt,
+//                isPublic = this.isPublic,
+//                isSlide = this.isSlide,
+//                isPinned = this.isPinned,
             )
         }
 

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

@@ -0,0 +1,8 @@
+package com.wafflestudio.csereal.core.notice.dto
+
+data class UpdateNoticeRequest(
+    val title: String?,
+    val description: String?,
+    val tag: List<Long>?
+) {
+}

src/main/kotlin/com/wafflestudio/csereal/core/notice/service/NoticeService.kt

@@ -1,42 +1,103 @@
 package com.wafflestudio.csereal.core.notice.service
 
 import com.wafflestudio.csereal.common.CserealException
-import com.wafflestudio.csereal.core.notice.database.NoticeEntity
-import com.wafflestudio.csereal.core.notice.database.NoticeRepository
+import com.wafflestudio.csereal.core.notice.database.*
 import com.wafflestudio.csereal.core.notice.dto.CreateNoticeRequest
 import com.wafflestudio.csereal.core.notice.dto.NoticeDto
+import com.wafflestudio.csereal.core.notice.dto.UpdateNoticeRequest
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 interface NoticeService {
     fun readNotice(noticeId: Long): NoticeDto
     fun createNotice(request: CreateNoticeRequest): NoticeDto
+    fun updateNotice(noticeId: Long, request: UpdateNoticeRequest): NoticeDto
+    fun deleteNotice(noticeId: Long)
+    fun enrollTag(tagName: String)
 }
 
 @Service
 class NoticeServiceImpl(
     private val noticeRepository: NoticeRepository,
+    private val tagRepository: TagRepository,
+    private val noticeTagRepository: NoticeTagRepository
 ) : NoticeService {
 
     @Transactional(readOnly = true)
     override fun readNotice(noticeId: Long): NoticeDto {
         val notice: NoticeEntity = noticeRepository.findByIdOrNull(noticeId)
             ?: throw CserealException.Csereal400("존재하지 않는 공지사항입니다.(noticeId: $noticeId)")
+        if (notice.isDeleted) throw CserealException.Csereal400("삭제된 공지사항입니다.(noticeId: $noticeId)")
         return NoticeDto.of(notice)
     }
 
     @Transactional
     override fun createNotice(request: CreateNoticeRequest): NoticeDto {
-        // TODO:"아직 날짜가 제대로 안 뜸"
         val newNotice = NoticeEntity(
             title = request.title,
             description = request.description,
         )
 
+        for (i: Int in 0 until request.tag.size) {
+            newNotice.setNoticeTag(
+                NoticeTagEntity(
+                    notice = newNotice,
+                    tag = tagRepository.findByIdOrNull(request.tag[i])
+                        ?: throw CserealException.Csereal400("해당하는 태그가 없습니다")
+                )
+            )
+        }
+
         noticeRepository.save(newNotice)
 
         return NoticeDto.of(newNotice)
 
     }
+
+    @Transactional
+    override fun updateNotice(noticeId: Long, request: UpdateNoticeRequest): NoticeDto {
+        val notice: NoticeEntity = noticeRepository.findByIdOrNull(noticeId)
+            ?: throw CserealException.Csereal400("존재하지 않는 공지사항입니다.(noticeId: $noticeId")
+        if (notice.isDeleted) throw CserealException.Csereal400("삭제된 공지사항입니다.(noticeId: $noticeId")
+
+        notice.title = request.title ?: notice.title
+        notice.description = request.description ?: notice.description
+
+        if (request.tag != null) {
+            noticeTagRepository.deleteAllByNoticeId(noticeId)
+            notice.noticeTag = mutableSetOf()
+            for (i: Int in 0 until request.tag.size) {
+                notice.setNoticeTag(
+                    NoticeTagEntity(
+                        notice = notice,
+                        tag = tagRepository.findByIdOrNull(request.tag[i])
+                            ?: throw CserealException.Csereal400("해당하는 태그가 없습니다")
+                    )
+                )
+            }
+        }
+
+
+
+        return NoticeDto.of(notice)
+    }
+
+    @Transactional
+    override fun deleteNotice(noticeId: Long) {
+        val notice: NoticeEntity = noticeRepository.findByIdOrNull(noticeId)
+            ?: throw CserealException.Csereal400("존재하지 않는 공지사항입니다.(noticeId: $noticeId)")
+
+        notice.isDeleted = true
+
+    }
+
+    override fun enrollTag(tagName: String) {
+        val newTag = TagEntity(
+            name = tagName
+        )
+        tagRepository.save(newTag)
+    }
+
+    //TODO: 이미지 등록, 페이지네이션, 검색
 }

src/main/resources/application.yaml

@@ -5,9 +5,14 @@ spring:
 ---
 spring:
   config.activate.on-profile: local
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/csereal_local?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul
+    username: root
+    password: toor
   jpa:
     hibernate:
-      ddl-auto: create
+      ddl-auto: update
     show-sql: true
 logging.level:
   default: INFO