From 650a15fa60a3a9868734f1c36b6b715ba16209bd Mon Sep 17 00:00:00 2001
From: xb205 <62425964+devxb@users.noreply.github.com>
Date: Thu, 7 Mar 2024 11:32:28 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20:=20gallery=20=EC=A1=B0=ED=9A=8C=20job?=
 =?UTF-8?q?=20->=20BOOKMARK=20=EB=B0=8F=20=EC=A1=B0=ED=9A=8C=20=EC=9D=B8?=
 =?UTF-8?q?=EC=9E=90=20uppercase=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20(#392)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/kotlin/me/nalab/gallery/app/GalleryGetApp.kt   | 6 +++---
 .../kotlin/me/nalab/gallery/controller/GalleryController.kt | 4 ++--
 .../main/kotlin/me/nalab/gallery/domain/GalleryService.kt   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gallery/src/main/kotlin/me/nalab/gallery/app/GalleryGetApp.kt b/gallery/src/main/kotlin/me/nalab/gallery/app/GalleryGetApp.kt
index 4e02e8f0..5df4ff6b 100644
--- a/gallery/src/main/kotlin/me/nalab/gallery/app/GalleryGetApp.kt
+++ b/gallery/src/main/kotlin/me/nalab/gallery/app/GalleryGetApp.kt
@@ -51,9 +51,9 @@ class GalleryGetApp(
     }
 
     private fun getPage(page: Int, count: Int, orderType: String): Pageable {
-        return when (orderType.lowercase()) {
-            "update" -> PageRequest.of(page, count, Sort.by("updateOrder").descending())
-            "job" -> PageRequest.of(page, count, Sort.by("survey.bookmarkedCount").descending())
+        return when (orderType.uppercase()) {
+            "UPDATE" -> PageRequest.of(page, count, Sort.by("updateOrder").descending())
+            "BOOKMARK" -> PageRequest.of(page, count, Sort.by("survey.bookmarkedCount").descending())
             else -> throw IllegalArgumentException("orderType 은 update와 bookmark중 하나여야 합니다. 현재 orderType \"$orderType\"")
         }
     }
diff --git a/gallery/src/main/kotlin/me/nalab/gallery/controller/GalleryController.kt b/gallery/src/main/kotlin/me/nalab/gallery/controller/GalleryController.kt
index be01c988..18c21259 100644
--- a/gallery/src/main/kotlin/me/nalab/gallery/controller/GalleryController.kt
+++ b/gallery/src/main/kotlin/me/nalab/gallery/controller/GalleryController.kt
@@ -40,10 +40,10 @@ class GalleryController(
     @GetMapping
     @ResponseStatus(HttpStatus.OK)
     fun getGalleries(
-        @RequestParam(name = "job", defaultValue = "all") job: String,
+        @RequestParam(name = "job", defaultValue = "ALL") job: String,
         @RequestParam(name = "page", defaultValue = "0") page: Int,
         @RequestParam(name = "count", defaultValue = "5") count: Int,
-        @RequestParam(name = "order-type", defaultValue = "update") orderType: String
+        @RequestParam(name = "order-type", defaultValue = "UPDATE") orderType: String
     ): GalleriesDto {
         return galleryGetApp.getGalleries(job, page, count, orderType)
     }
diff --git a/gallery/src/main/kotlin/me/nalab/gallery/domain/GalleryService.kt b/gallery/src/main/kotlin/me/nalab/gallery/domain/GalleryService.kt
index 78f2610c..595ee76f 100644
--- a/gallery/src/main/kotlin/me/nalab/gallery/domain/GalleryService.kt
+++ b/gallery/src/main/kotlin/me/nalab/gallery/domain/GalleryService.kt
@@ -31,8 +31,8 @@ class GalleryService(
     }
 
     fun getGalleries(job: String, pageable: Pageable): Page<Gallery> {
-        val jobs = when (job) {
-            "all" -> Job.entries.toList()
+        val jobs = when (job.uppercase()) {
+            "ALL" -> Job.entries.toList()
             else -> listOf(Job.valueOf(job.uppercase()))
         }