klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'test' (#212) from test into main 

Reviewed-on: #212
This commit is contained in:
klaus 2024-09-11 07:47:35 +00:00
parent a58a67e0a2 edb77d7ad7
commit 2497bb69bc
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt
View File

@ -104,7 +104,7 @@ class AudioContentController(private val service: AudioContentService) {
@GetMapping @GetMapping
fun getAudioContentList( fun getAudioContentList(
@RequestParam("creator-id") creatorId: Long, @RequestParam("creator-id") creatorId: Long,
@RequestParam("sort-type", required = false) sortType: SortType = SortType.NEWEST, @RequestParam("sort-type", required = false) sortType: SortType? = SortType.NEWEST,
@RequestParam("category-id", required = false) categoryId: Long? = 0, @RequestParam("category-id", required = false) categoryId: Long? = 0,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
@ -114,7 +114,7 @@ class AudioContentController(private val service: AudioContentService) {
ApiResponse.ok( ApiResponse.ok(
service.getAudioContentList( service.getAudioContentList(
creatorId = creatorId, creatorId = creatorId,
sortType = sortType, sortType = sortType ?: SortType.NEWEST,
categoryId = categoryId ?: 0, categoryId = categoryId ?: 0,
member = member, member = member,
offset = pageable.offset, offset = pageable.offset,

4
src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt
View File

@ -18,12 +18,12 @@ class AudioContentCurationController(private val service: AudioContentCurationSe
@GetMapping("/{id}") @GetMapping("/{id}")
fun getCurationContent( fun getCurationContent(
@PathVariable id: Long, @PathVariable id: Long,
@RequestParam("sort-type", required = false) sortType: SortType = SortType.NEWEST, @RequestParam("sort-type", required = false) sortType: SortType? = SortType.NEWEST,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(service.getCurationContent(id, sortType, member, pageable)) ApiResponse.ok(service.getCurationContent(id, sortType ?: SortType.NEWEST, member, pageable))
} }
} }

8
src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesController.kt
View File

@ -18,7 +18,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
@GetMapping @GetMapping
fun getSeriesList( fun getSeriesList(
@RequestParam creatorId: Long, @RequestParam creatorId: Long,
@RequestParam("sortType", required = false) sortType: SeriesSortType = SeriesSortType.NEWEST, @RequestParam("sortType", required = false) sortType: SeriesSortType? = SeriesSortType.NEWEST,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -27,7 +27,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
ApiResponse.ok( ApiResponse.ok(
service.getSeriesList( service.getSeriesList(
creatorId = creatorId, creatorId = creatorId,
sortType = sortType, sortType = sortType ?: SeriesSortType.NEWEST,
member = member, member = member,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()
@ -50,7 +50,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
@GetMapping("/{id}/content") @GetMapping("/{id}/content")
fun getSeriesContentList( fun getSeriesContentList(
@PathVariable id: Long, @PathVariable id: Long,
@RequestParam("sortType", defaultValue = "NEWEST") sortType: SeriesSortType, @RequestParam("sortType", required = false) sortType: SeriesSortType? = SeriesSortType.NEWEST,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -60,7 +60,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
service.getSeriesContentList( service.getSeriesContentList(
seriesId = id, seriesId = id,
member = member, member = member,
sortType = sortType, sortType = sortType ?: SeriesSortType.NEWEST,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()
) )

4
src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeController.kt
View File

@ -29,7 +29,7 @@ class AudioContentThemeController(private val service: AudioContentThemeService)
@GetMapping("/{id}/content") @GetMapping("/{id}/content")
fun getContentByTheme( fun getContentByTheme(
@PathVariable id: Long, @PathVariable id: Long,
@RequestParam("sort-type", required = false) sortType: SortType = SortType.NEWEST, @RequestParam("sort-type", required = false) sortType: SortType? = SortType.NEWEST,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -38,7 +38,7 @@ class AudioContentThemeController(private val service: AudioContentThemeService)
ApiResponse.ok( ApiResponse.ok(
service.getContentByTheme( service.getContentByTheme(
themeId = id, themeId = id,
sortType = sortType, sortType = sortType ?: SortType.NEWEST,
member = member, member = member,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()

10
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureController.kt
View File

@ -41,13 +41,19 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature
@RequestParam("can") can: Int, @RequestParam("can") can: Int,
@RequestParam("time") time: Int, @RequestParam("time") time: Int,
@RequestParam("image") image: MultipartFile, @RequestParam("image") image: MultipartFile,
@RequestParam("isAdult", required = false) isAdult: Boolean = false, @RequestParam("isAdult", required = false) isAdult: Boolean? = false,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(
service.createSignature(can = can, time = time, image = image, isAdult = isAdult, memberId = member.id!!), service.createSignature(
can = can,
time = time,
image = image,
isAdult = isAdult ?: false,
memberId = member.id!!
),
"등록되었습니다." "등록되었습니다."
) )
} }