⚡️ Optimized search ⚡️

Author: DeNyWho

src/main/kotlin/club/anifox/backend/domain/enums/common/LanguageType.kt

@@ -0,0 +1,5 @@
+package club.anifox.backend.domain.enums.common
+
+enum class LanguageType {
+    JAPANESE, RUSSIAN, ENGLISH, UNKNOWN
+}

src/main/kotlin/club/anifox/backend/service/anime/components/search/AnimeSearchComponent.kt

@@ -5,6 +5,7 @@ import club.anifox.backend.domain.enums.anime.AnimeStatus
 import club.anifox.backend.domain.enums.anime.AnimeType
 import club.anifox.backend.domain.enums.anime.filter.AnimeDefaultFilter
 import club.anifox.backend.domain.enums.anime.filter.AnimeSearchFilter
+import club.anifox.backend.domain.enums.common.LanguageType.*
 import club.anifox.backend.domain.mappers.anime.light.toAnimeLight
 import club.anifox.backend.domain.model.anime.light.AnimeLight
 import club.anifox.backend.jpa.entity.anime.AnimeTable
@@ -14,6 +15,8 @@ import club.anifox.backend.jpa.entity.anime.common.AnimeStudioTable
 import club.anifox.backend.jpa.entity.anime.episodes.AnimeTranslationTable
 import club.anifox.backend.jpa.repository.anime.AnimeGenreRepository
 import club.anifox.backend.jpa.repository.anime.AnimeStudiosRepository
+import club.anifox.backend.util.detectLanguage
+import club.anifox.backend.util.replaceLast
 import jakarta.persistence.EntityManager
 import jakarta.persistence.PersistenceContext
 import jakarta.persistence.criteria.JoinType
@@ -163,14 +166,26 @@ class AnimeSearchComponent {
 
             println("FVCX = $searchVariants")
 
-            val searchFields = listOf(
+            val language = searchQuery.detectLanguage()
+
+            val searchFields = mutableListOf(
                 root.get<String>("title"),
-                root.joinList<AnimeTable, String>("titleOther", JoinType.LEFT),
-                root.joinList<AnimeTable, String>("titleEn", JoinType.LEFT),
-                root.joinList<AnimeTable, String>("titleJapan", JoinType.LEFT),
-                root.joinList<AnimeTable, String>("synonyms", JoinType.LEFT),
             )
 
+            when (language) {
+                JAPANESE -> {
+                    searchFields.add(root.joinList<AnimeTable, String>("titleJapan", JoinType.LEFT))
+                }
+                RUSSIAN -> {
+                    searchFields.add(root.joinList<AnimeTable, String>("titleOther", JoinType.LEFT))
+                    searchFields.add(root.joinList<AnimeTable, String>("synonyms", JoinType.LEFT))
+                }
+                ENGLISH -> {
+                    searchFields.add(root.joinList<AnimeTable, String>("titleEn", JoinType.LEFT))
+                }
+                UNKNOWN -> { }
+            }
+
             val searchPredicates = mutableListOf<Predicate>()
 
             // Для каждого варианта написания создаем предикаты
@@ -387,14 +402,4 @@ class AnimeSearchComponent {
 
         return variants
     }
-
-    fun String.replaceLast(oldValue: String, newValue: String): String {
-        val lastIndex = lastIndexOf(oldValue)
-        if (lastIndex == -1) {
-            return this
-        }
-        val prefix = substring(0, lastIndex)
-        val suffix = substring(lastIndex + oldValue.length)
-        return "$prefix$newValue$suffix"
-    }
 }

src/main/kotlin/club/anifox/backend/tasks/ParserTasks.kt

@@ -16,30 +16,30 @@ class ParserTasks {
 
     private val logger = LoggerFactory.getLogger(this::class.java)
 
-    @Scheduled(fixedDelay = 24, timeUnit = TimeUnit.HOURS)
-    fun parseAnime() {
-        animeService.parseTranslations(listOf(610, 609, 735, 643, 559, 739, 767, 825, 933, 557, 794, 1002, 1978, 1291, 1272, 1946))
-        animeService.parseAnime()
-    }
+//    @Scheduled(fixedDelay = 24, timeUnit = TimeUnit.HOURS)
+//    fun parseAnime() {
+//        animeService.parseTranslations(listOf(610, 609, 735, 643, 559, 739, 767, 825, 933, 557, 794, 1002, 1978, 1291, 1272, 1946))
+//        animeService.parseAnime()
+//    }
 
     @Scheduled(fixedDelay = 24, timeUnit = TimeUnit.HOURS)
     fun parseAnimeIntegrations() {
         animeService.parseAnimeIntegrations()
     }
 
-    @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.SECONDS)
-    fun updateData() {
-        animeService.updateEpisodes(
-            onlyOngoing = false,
-        )
-    }
-
-    @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.SECONDS)
-    fun updateDataOngoingOnly() {
-        animeService.updateEpisodes(
-            onlyOngoing = true,
-        )
-    }
+//    @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.SECONDS)
+//    fun updateData() {
+//        animeService.updateEpisodes(
+//            onlyOngoing = false,
+//        )
+//    }
+//
+//    @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.SECONDS)
+//    fun updateDataOngoingOnly() {
+//        animeService.updateEpisodes(
+//            onlyOngoing = true,
+//        )
+//    }
 
     @Scheduled(fixedDelay = 5, timeUnit = TimeUnit.MINUTES)
     fun logHealthStatus() {

src/main/kotlin/club/anifox/backend/util/String.kt

@@ -0,0 +1,30 @@
+package club.anifox.backend.util
+
+import club.anifox.backend.domain.enums.common.LanguageType
+
+fun String.replaceLast(oldValue: String, newValue: String): String {
+    val lastIndex = lastIndexOf(oldValue)
+    if (lastIndex == -1) {
+        return this
+    }
+    val prefix = substring(0, lastIndex)
+    val suffix = substring(lastIndex + oldValue.length)
+    return "$prefix$newValue$suffix"
+}
+
+fun String.detectLanguage(): LanguageType {
+    val japaneseRegex = Regex("[ぁ-んァ-ン一-龥]")
+    val russianRegex = Regex("[А-Яа-я]")
+    val englishRegex = Regex("[A-Za-z]")
+
+    val japaneseCount = japaneseRegex.findAll(this).count()
+    val russianCount = russianRegex.findAll(this).count()
+    val englishCount = englishRegex.findAll(this).count()
+
+    return when {
+        japaneseCount > englishCount && japaneseCount > russianCount -> LanguageType.JAPANESE
+        russianCount > japaneseCount && russianCount > englishCount -> LanguageType.RUSSIAN
+        englishCount > japaneseCount && englishCount > russianCount -> LanguageType.ENGLISH
+        else -> LanguageType.UNKNOWN
+    }
+}