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

Reviewed-on: #212

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

@@ -104,7 +104,7 @@ class AudioContentController(private val service: AudioContentService) {
     @GetMapping
     fun getAudioContentList(
         @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,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
@@ -114,7 +114,7 @@ class AudioContentController(private val service: AudioContentService) {
         ApiResponse.ok(
             service.getAudioContentList(
                 creatorId = creatorId,
-                sortType = sortType,
+                sortType = sortType ?: SortType.NEWEST,
                 categoryId = categoryId ?: 0,
                 member = member,
                 offset = pageable.offset,

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

@@ -18,12 +18,12 @@ class AudioContentCurationController(private val service: AudioContentCurationSe
     @GetMapping("/{id}")
     fun getCurationContent(
         @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?,
         pageable: Pageable
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(service.getCurationContent(id, sortType, member, pageable))
+        ApiResponse.ok(service.getCurationContent(id, sortType ?: SortType.NEWEST, member, pageable))
     }
 }

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

@@ -18,7 +18,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
     @GetMapping
     fun getSeriesList(
         @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?,
         pageable: Pageable
     ) = run {
@@ -27,7 +27,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
         ApiResponse.ok(
             service.getSeriesList(
                 creatorId = creatorId,
-                sortType = sortType,
+                sortType = sortType ?: SeriesSortType.NEWEST,
                 member = member,
                 offset = pageable.offset,
                 limit = pageable.pageSize.toLong()
@@ -50,7 +50,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
     @GetMapping("/{id}/content")
     fun getSeriesContentList(
         @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?,
         pageable: Pageable
     ) = run {
@@ -60,7 +60,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
             service.getSeriesContentList(
                 seriesId = id,
                 member = member,
-                sortType = sortType,
+                sortType = sortType ?: SeriesSortType.NEWEST,
                 offset = pageable.offset,
                 limit = pageable.pageSize.toLong()
             )

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

@@ -29,7 +29,7 @@ class AudioContentThemeController(private val service: AudioContentThemeService)
     @GetMapping("/{id}/content")
     fun getContentByTheme(
         @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?,
         pageable: Pageable
     ) = run {
@@ -38,7 +38,7 @@ class AudioContentThemeController(private val service: AudioContentThemeService)
         ApiResponse.ok(
             service.getContentByTheme(
                 themeId = id,
-                sortType = sortType,
+                sortType = sortType ?: SortType.NEWEST,
                 member = member,
                 offset = pageable.offset,
                 limit = pageable.pageSize.toLong()

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

@@ -41,13 +41,19 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature
         @RequestParam("can") can: Int,
         @RequestParam("time") time: Int,
         @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?
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
         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!!
+            ),
             "등록되었습니다."
         )
     }