Skip to content

Commit 104481a

Browse files
committed
feat: 4차 MVP 기획 변경 반영
1 parent deb0510 commit 104481a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+210
-475
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import jakarta.validation.constraints.Pattern
66
import java.util.*
77

88
data class BoardCreateRequest(
9-
@Schema(description = "제목", example = "쏘니의 보드")
9+
@field:Schema(description = "제목", example = "쏘니의 보드")
1010
@field:NotBlank
1111
@field:Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[!@#$%^&*()_+=-])(?=.*[ㄱ-ㅎㅏ-ㅣ가-힣]).{1,20}$", message = "제목은 국문, 영문, 숫자, 특수문자, 띄어쓰기를 포함한 20자 이내여야 합니다.")
1212
val title: String,
13-
@Schema(description = "작성자 아이디", example = "null", required = false)
13+
@field:Schema(description = "작성자 아이디", example = "null", required = false)
1414
var userId: Long? = null
1515
)
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package com.ddd.sonnypolabobe.domain.board.controller.dto
22

3-
import com.ddd.sonnypolabobe.domain.board.sticker.dto.StickerGetResponse
4-
import com.ddd.sonnypolabobe.domain.polaroid.controller.dto.PolaroidGetResponse
3+
import com.ddd.sonnypolabobe.domain.polaroid.dto.PolaroidGetResponse
54
import io.swagger.v3.oas.annotations.media.Schema
65

76
data class BoardGetResponse(
8-
@Schema(description = "제목", example = "쏘니의 보드")
7+
@field:Schema(description = "제목", example = "쏘니의 보드")
98
val title: String,
10-
@Schema(description = "폴라로이드")
9+
@field:Schema(description = "폴라로이드")
1110
val items: List<PolaroidGetResponse>,
12-
@Schema(description = "스티커 리스트")
13-
val stickers : List<StickerGetResponse>?
1411
)

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

+11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.ddd.sonnypolabobe.domain.board.my.dto
22

33
import com.fasterxml.jackson.annotation.JsonProperty
4+
import io.swagger.v3.oas.annotations.media.Schema
45
import org.springframework.format.annotation.DateTimeFormat
56
import java.time.LocalDateTime
67
import java.util.UUID
@@ -9,26 +10,36 @@ class MyBoardDto {
910
companion object {
1011
data class MBUpdateReq(
1112
@JsonProperty("title")
13+
@field:Schema(description = "제목", example = "쏘니의 보드")
1214
val title: String
1315
)
1416

1517
data class PageListRes(
18+
@field:Schema(description = "보드 아이디", example = "01906259-94b2-74ef-8c13-554385c42943")
1619
val id: UUID,
20+
@field:Schema(description = "제목", example = "쏘니의 보드")
1721
val title: String,
1822
@DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
23+
@field:Schema(description = "생성일", example = "2021-07-01")
1924
val createdAt: LocalDateTime,
2025
)
2126

2227
data class GetOneRes(
28+
@field:Schema(description = "보드 아이디", example = "01906259-94b2-74ef-8c13-554385c42943")
2329
val id: UUID,
30+
@field:Schema(description = "제목", example = "쏘니의 보드")
2431
val title: String,
2532
@DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
33+
@field:Schema(description = "생성일", example = "2021-07-01")
2634
val createdAt: LocalDateTime,
35+
@field:Schema(description = "작성자 아이디", example = "null", required = false)
2736
val userId: Long?
2837
)
2938

3039
data class TotalCountRes(
40+
@field:Schema(description = "총 보드 생성 수", example = "100")
3141
val totalCreateCount: Long,
42+
@field:Schema(description = "총 참여자 수", example = "1000")
3243
val totalParticipantCount: Long
3344
)
3445

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

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ package com.ddd.sonnypolabobe.domain.board.service
33
import com.ddd.sonnypolabobe.domain.board.controller.dto.BoardCreateRequest
44
import com.ddd.sonnypolabobe.domain.board.controller.dto.BoardGetResponse
55
import com.ddd.sonnypolabobe.domain.board.repository.BoardJooqRepository
6-
import com.ddd.sonnypolabobe.domain.board.sticker.dto.StickerGetResponse
7-
import com.ddd.sonnypolabobe.domain.board.sticker.repository.BoardStickerRepository
8-
import com.ddd.sonnypolabobe.domain.polaroid.controller.dto.PolaroidGetResponse
6+
import com.ddd.sonnypolabobe.domain.polaroid.dto.PolaroidGetResponse
97
import com.ddd.sonnypolabobe.domain.polaroid.enumerate.PolaroidOption
108
import com.ddd.sonnypolabobe.domain.user.dto.UserDto
119
import com.ddd.sonnypolabobe.global.exception.ApplicationException
@@ -18,12 +16,10 @@ import com.fasterxml.jackson.databind.ObjectMapper
1816
import org.springframework.beans.factory.annotation.Value
1917
import org.springframework.stereotype.Service
2018
import java.util.*
21-
import javax.swing.text.html.HTML.Tag.U
2219

2320
@Service
2421
class BoardService(
2522
private val boardJooqRepository: BoardJooqRepository,
26-
private val boardStickerRepository: BoardStickerRepository,
2723
private val s3Util: S3Util,
2824
@Value("\${limit.count}")
2925
private val limit: Int
@@ -36,7 +32,6 @@ class BoardService(
3632
return id.run {
3733
val queryResult =
3834
boardJooqRepository.selectOneById(UuidConverter.stringToUUID(this@run))
39-
val stickers = boardStickerRepository.findByBoardId(UuidConverter.stringToUUID(id))
4035
val groupByTitle = queryResult.groupBy { it.title }
4136
groupByTitle.map { entry ->
4237
val title = entry.key
@@ -53,7 +48,7 @@ class BoardService(
5348

5449
)
5550
}.filter { it.id != 0L }.distinctBy { it.id }
56-
BoardGetResponse(title = title ?: "", items = polaroids, stickers = stickers)
51+
BoardGetResponse(title = title ?: "", items = polaroids)
5752
}
5853
}
5954
}

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/sticker/controller/BoardStickerController.kt

-40
This file was deleted.

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/sticker/dto/StickerCreateRequest.kt

-10
This file was deleted.

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/sticker/dto/StickerGetResponse.kt

-9
This file was deleted.

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/sticker/repository/BoardStickerRepository.kt

-11
This file was deleted.

src/main/kotlin/com/ddd/sonnypolabobe/domain/board/sticker/repository/BoardStickerRepositoryImpl.kt

-65
This file was deleted.

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

-20
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package com.ddd.sonnypolabobe.domain.file.controller.dto
22

3+
import io.swagger.v3.oas.annotations.media.Schema
4+
35
data class ImageResignedUrlResponse(
6+
@field:Schema(description = "S3에 저장될 이미지 키", example = "imageKey")
47
val imageKey : String,
8+
@field:Schema(description = "이미지 업로드를 위한 URL", example = "https://cloudfront.net/imageKey")
59
val url : String
610
)

0 commit comments

Comments
 (0)