Merge pull request #36 from DDD-Community/feature/POLABO-130

feat: 4차 MVP 기획 변경 반영

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/controller/dto/BoardCreateRequest.kt

@@ -6,10 +6,10 @@ import jakarta.validation.constraints.Pattern
 import java.util.*
 
 data class BoardCreateRequest(
-    @Schema(description = "제목", example = "쏘니의 보드")
+    @field:Schema(description = "제목", example = "쏘니의 보드")
     @field:NotBlank
     @field:Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[!@#$%^&*()_+=-])(?=.*[ㄱ-ㅎㅏ-ㅣ가-힣]).{1,20}$", message = "제목은 국문, 영문, 숫자, 특수문자, 띄어쓰기를 포함한 20자 이내여야 합니다.")
     val title: String,
-    @Schema(description = "작성자 아이디", example = "null", required = false)
+    @field:Schema(description = "작성자 아이디", example = "null", required = false)
     var userId: Long? = null
 )

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/controller/dto/BoardGetResponse.kt

@@ -1,14 +1,11 @@
 package com.ddd.sonnypolabobe.domain.board.controller.dto
 
-import com.ddd.sonnypolabobe.domain.board.sticker.dto.StickerGetResponse
-import com.ddd.sonnypolabobe.domain.polaroid.controller.dto.PolaroidGetResponse
+import com.ddd.sonnypolabobe.domain.polaroid.dto.PolaroidGetResponse
 import io.swagger.v3.oas.annotations.media.Schema
 
 data class BoardGetResponse(
-    @Schema(description = "제목", example = "쏘니의 보드")
+    @field:Schema(description = "제목", example = "쏘니의 보드")
     val title: String,
-    @Schema(description = "폴라로이드")
+    @field:Schema(description = "폴라로이드")
     val items: List<PolaroidGetResponse>,
-    @Schema(description = "스티커 리스트")
-    val stickers : List<StickerGetResponse>?
 )

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/my/dto/MyBoardDto.kt

@@ -1,6 +1,7 @@
 package com.ddd.sonnypolabobe.domain.board.my.dto
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import org.springframework.format.annotation.DateTimeFormat
 import java.time.LocalDateTime
 import java.util.UUID
@@ -9,26 +10,36 @@ class MyBoardDto {
     companion object {
         data class MBUpdateReq(
             @JsonProperty("title")
+            @field:Schema(description = "제목", example = "쏘니의 보드")
             val title: String
         )
 
         data class PageListRes(
+            @field:Schema(description = "보드 아이디", example = "01906259-94b2-74ef-8c13-554385c42943")
             val id: UUID,
+            @field:Schema(description = "제목", example = "쏘니의 보드")
             val title: String,
             @DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
+            @field:Schema(description = "생성일", example = "2021-07-01")
             val createdAt: LocalDateTime,
         )
 
         data class GetOneRes(
+            @field:Schema(description = "보드 아이디", example = "01906259-94b2-74ef-8c13-554385c42943")
             val id: UUID,
+            @field:Schema(description = "제목", example = "쏘니의 보드")
             val title: String,
             @DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
+            @field:Schema(description = "생성일", example = "2021-07-01")
             val createdAt: LocalDateTime,
+            @field:Schema(description = "작성자 아이디", example = "null", required = false)
             val userId: Long?
         )
 
         data class TotalCountRes(
+            @field:Schema(description = "총 보드 생성 수", example = "100")
             val totalCreateCount: Long,
+            @field:Schema(description = "총 참여자 수", example = "1000")
             val totalParticipantCount: Long
         )
 

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/service/BoardService.kt

@@ -3,9 +3,7 @@ package com.ddd.sonnypolabobe.domain.board.service
 import com.ddd.sonnypolabobe.domain.board.controller.dto.BoardCreateRequest
 import com.ddd.sonnypolabobe.domain.board.controller.dto.BoardGetResponse
 import com.ddd.sonnypolabobe.domain.board.repository.BoardJooqRepository
-import com.ddd.sonnypolabobe.domain.board.sticker.dto.StickerGetResponse
-import com.ddd.sonnypolabobe.domain.board.sticker.repository.BoardStickerRepository
-import com.ddd.sonnypolabobe.domain.polaroid.controller.dto.PolaroidGetResponse
+import com.ddd.sonnypolabobe.domain.polaroid.dto.PolaroidGetResponse
 import com.ddd.sonnypolabobe.domain.polaroid.enumerate.PolaroidOption
 import com.ddd.sonnypolabobe.domain.user.dto.UserDto
 import com.ddd.sonnypolabobe.global.exception.ApplicationException
@@ -18,12 +16,10 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import java.util.*
-import javax.swing.text.html.HTML.Tag.U
 
 @Service
 class BoardService(
     private val boardJooqRepository: BoardJooqRepository,
-    private val boardStickerRepository: BoardStickerRepository,
     private val s3Util: S3Util,
     @Value("\${limit.count}")
     private val limit: Int
@@ -36,7 +32,6 @@ class BoardService(
         return id.run {
             val queryResult =
                 boardJooqRepository.selectOneById(UuidConverter.stringToUUID(this@run))
-            val stickers = boardStickerRepository.findByBoardId(UuidConverter.stringToUUID(id))
             val groupByTitle = queryResult.groupBy { it.title }
             groupByTitle.map { entry ->
                 val title = entry.key
@@ -53,7 +48,7 @@ class BoardService(
 
                     )
                 }.filter { it.id != 0L }.distinctBy { it.id }
-                BoardGetResponse(title = title ?: "", items = polaroids, stickers = stickers)
+                BoardGetResponse(title = title ?: "", items = polaroids)
             }
         }
     }

src/main/kotlin/com/ddd/sonnypolabobe/domain/file/controller/dto/ImageResignedUrlResponse.kt

@@ -1,6 +1,10 @@
 package com.ddd.sonnypolabobe.domain.file.controller.dto
 
+import io.swagger.v3.oas.annotations.media.Schema
+
 data class ImageResignedUrlResponse(
+    @field:Schema(description = "S3에 저장될 이미지 키", example = "imageKey")
     val imageKey : String,
+    @field:Schema(description = "이미지 업로드를 위한 URL", example = "https://cloudfront.net/imageKey")
     val url : String
 )