Add keywords search filter

Jezorko · Jan 4, 2022 · 033a3e7 · 033a3e7
1 parent b9bedbd
commit 033a3e7
Show file tree

Hide file tree

Showing 9 changed files with 513 additions and 16 deletions.
diff --git a/src/commonMain/kotlin/jezorko/github/gfngameslist/games/Keywords.kt b/src/commonMain/kotlin/jezorko/github/gfngameslist/games/Keywords.kt
diff --git a/src/commonMain/kotlin/jezorko/github/gfngameslist/localization/Messages.kt b/src/commonMain/kotlin/jezorko/github/gfngameslist/localization/Messages.kt
@@ -21,6 +21,7 @@ data class Messages(
     val publisher: String,
     val genreLabel: String,
     val storeLabel: String,
+    val keywordsLabel: String,
     val searchPlaceholder: String,
     val status: String,
     val specificStatus: GameStatusMessages,

diff --git a/src/jsMain/kotlin/api/ApiClient.kt b/src/jsMain/kotlin/api/ApiClient.kt
@@ -1,8 +1,8 @@
 package api
 
 import jezorko.github.gfngameslist.games.GameGenre
-import jezorko.github.gfngameslist.games.GetGamesResponse
 import jezorko.github.gfngameslist.games.GameStore
+import jezorko.github.gfngameslist.games.GetGamesResponse
 import jezorko.github.gfngameslist.localization.Messages
 import jezorko.github.gfngameslist.shared.serialize
 import jezorko.github.gfngameslist.versions.VersionInfo
@@ -39,13 +39,15 @@ object ApiClient {
         page: Int,
         textSearch: String?,
         stores: List<GameStore>?,
-        genres: List<GameGenre>?
+        genres: List<GameGenre>?,
+        keywords: List<String>?
     ): Promise<GetGamesResponse> {
         val textSearchParam = if (textSearch != null) "&query=${encodeURIComponent(textSearch)}" else ""
         val storeParam = if (stores != null) "&store=${encodeURIComponent(stores.serialize())}" else ""
         val genreParam = if (genres != null) "&genre=${encodeURIComponent(genres.serialize())}" else ""
+        val keywordsParam = if (keywords != null) "&keywords=${encodeURIComponent(keywords.joinToString(","))}" else ""
         return window.fetch(
-            "/api/games?limit=$limit&page=$page$textSearchParam$storeParam$genreParam",
+            "/api/games?limit=$limit&page=$page$textSearchParam$storeParam$genreParam$keywordsParam",
             object : RequestInit {
                 override var method: String? = "GET"
             }

diff --git a/src/jsMain/kotlin/components/MainPage.kt b/src/jsMain/kotlin/components/MainPage.kt
@@ -2,10 +2,7 @@ package components
 
 import api.ApiClient
 import getMainContainer
-import jezorko.github.gfngameslist.games.GameGenre
-import jezorko.github.gfngameslist.games.GameStore
-import jezorko.github.gfngameslist.games.GetGamesResponse
-import jezorko.github.gfngameslist.games.validStores
+import jezorko.github.gfngameslist.games.*
 import jezorko.github.gfngameslist.localization.Messages
 import jezorko.github.gfngameslist.localization.get
 import kotlinx.browser.window
@@ -39,6 +36,7 @@ external interface MainPageState : State {
     var textSearch: String?
     var genresSearch: List<String>?
     var storeSearch: List<String>?
+    var keywordsSearch: List<String>?
     var getGamesResponse: GetGamesResponse?
 }
 
@@ -112,6 +110,15 @@ class MainPage(props: Props) : RComponent<Props, MainPageState>(props) {
                 messages = state.messages
             }
         }
+        child(MultiSelect::class) {
+            attrs {
+                id = "keywords-search"
+                name = state.messages[Messages::keywordsLabel]
+                options = keywords.map(::Option)
+                onSelection = updateState(MainPageState::keywordsSearch)
+                messages = state.messages
+            }
+        }
         state.getGamesResponse?.games?.let { games ->
             child(GameDataTable::class) {
                 attrs {
@@ -197,7 +204,8 @@ class MainPage(props: Props) : RComponent<Props, MainPageState>(props) {
             page,
             state.textSearch,
             state.storeSearch?.map(GameStore::valueOf),
-            state.genresSearch?.map(GameGenre::valueOf)
+            state.genresSearch?.map(GameGenre::valueOf),
+            state.keywordsSearch
         ).flatThen { response -> setState { loadingMoreGames = false }.then { response } }
     }
 

diff --git a/src/jsMain/kotlin/components/MultiSelect.kt b/src/jsMain/kotlin/components/MultiSelect.kt
@@ -21,7 +21,7 @@ import styled.css
 import styled.styledButton
 import styled.styledDiv
 
-data class Option(val name: String, val value: String)
+data class Option(val name: String, val value: String = name)
 
 external interface MultiSelectProps : Props {
     var id: String?

diff --git a/src/jvmMain/kotlin/jezorko/github/gfngameslist/games/GamesRoutes.kt b/src/jvmMain/kotlin/jezorko/github/gfngameslist/games/GamesRoutes.kt
@@ -12,8 +12,18 @@ fun Application.gamesRoutes() = routing {
         val searchQuery = call.request.queryParameters["query"]
         val storesFilter = GameStore::class.deserializeSet(call.request.queryParameters["store"])
         val genresFilter = GameGenre::class.deserializeSet(call.request.queryParameters["genre"])
+        val keywordsFilter = call.request.queryParameters["keywords"]?.split(",")?.toSet()
 
-        call.respondJson(provider = { GamesService.getGames(limit, page, searchQuery, storesFilter, genresFilter) })
+        call.respondJson(provider = {
+            GamesService.getGames(
+                limit,
+                page,
+                searchQuery,
+                storesFilter,
+                genresFilter,
+                keywordsFilter
+            )
+        })
         GamesService.updateIfNeeded()
     }
 }
diff --git a/src/jvmMain/kotlin/jezorko/github/gfngameslist/games/GamesService.kt b/src/jvmMain/kotlin/jezorko/github/gfngameslist/games/GamesService.kt
@@ -22,19 +22,31 @@ internal object GamesService {
         page: Int,
         searchQuery: String?,
         storesFilter: Set<GameStore>,
-        genresFilter: Set<GameGenre>
+        genresFilter: Set<GameGenre>,
+        keywordsFilter: Set<String>?
     ) =
         GetGamesResponse(
             supportedGamesCount = localGamesCache.get().distinctBy(Game::title).count(),
             games = localGamesCache.get()
                 .asSequence()
                 .filter { game -> storesFilter.isEmpty() || game.stores.containsAll(storesFilter) }
                 .filter { game -> genresFilter.isEmpty() || game.genres.containsAll(genresFilter) }
-                .filter { game -> searchQuery?.uppercase()?.let {
-                    listOf(game.title, game.publisher, game.keywords)
-                        .map(String::uppercase)
-                        .any { textFragment->textFragment.contains(it) }
-                } ?: true }
+                .filter { game ->
+                    keywordsFilter?.map(String::uppercase)?.all { keyword ->
+                        game.keywords
+                            .replace('_', ' ')
+                            .replace('-', ' ')
+                            .uppercase()
+                            .contains(keyword)
+                    } ?: true
+                }
+                .filter { game ->
+                    searchQuery?.uppercase()?.let {
+                        listOf(game.title, game.publisher, game.keywords)
+                            .map(String::uppercase)
+                            .any { textFragment -> textFragment.contains(it) }
+                    } ?: true
+                }
                 .sortedBy(Game::title)
                 .drop(page * limit)
                 .take(limit)

diff --git a/src/jvmMain/resources/localization/messages_en_US.json b/src/jvmMain/resources/localization/messages_en_US.json
@@ -6,6 +6,7 @@
   "publisher": "publisher",
   "genreLabel": "genres",
   "storeLabel": "stores",
+  "keywordsLabel": "keywords",
   "searchPlaceholder": "search",
   "status": "status",
   "specificStatus": {

diff --git a/src/jvmMain/resources/localization/messages_pl_PL.json b/src/jvmMain/resources/localization/messages_pl_PL.json
@@ -6,6 +6,7 @@
   "publisher": "wydawca",
   "genreLabel": "kategorie",
   "storeLabel": "sklepy",
+  "keywordsLabel": "słowa kluczowe",
   "searchPlaceholder": "wyszukaj",
   "status": "status",
   "specificStatus": {