Merge pull request #180 from Shikkanime/dev

Dev
Shikkanime · Feb 13, 2024 · 6395cd6 · 6395cd6
2 parents 0ab5f38 + 945c042
commit 6395cd6
Show file tree

Hide file tree

Showing 25 changed files with 215 additions and 83 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import java.net.URI
 
 val ktorVersion = "2.3.8"
 val kotlinVersion = "1.9.22"
-val hibernateSearchVersion = "7.1.0.Alpha2"
+val hibernateSearchVersion = "7.1.0.CR1"
 val junitVersion = "5.10.2"
 val tikaVersion = "3.0.0-BETA"
 val ktorSwaggerUiVersion = "2.7.4"

diff --git a/src/main/kotlin/fr/shikkanime/controllers/admin/AdminAnimeController.kt b/src/main/kotlin/fr/shikkanime/controllers/admin/AdminAnimeController.kt
@@ -2,7 +2,7 @@ package fr.shikkanime.controllers.admin
 
 import com.google.inject.Inject
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.AnimeDto
+import fr.shikkanime.dtos.animes.AnimeDto
 import fr.shikkanime.entities.enums.Link
 import fr.shikkanime.services.AnimeService
 import fr.shikkanime.utils.routes.AdminSessionAuthenticated

diff --git a/src/main/kotlin/fr/shikkanime/controllers/api/SimulcastController.kt b/src/main/kotlin/fr/shikkanime/controllers/api/SimulcastController.kt
@@ -2,7 +2,7 @@ package fr.shikkanime.controllers.api
 
 import com.google.inject.Inject
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.SimulcastDto
+import fr.shikkanime.dtos.simulcasts.SimulcastDto
 import fr.shikkanime.services.SimulcastService
 import fr.shikkanime.utils.routes.*
 import fr.shikkanime.utils.routes.method.Get

diff --git a/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt b/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt
@@ -71,8 +71,17 @@ class SiteController {
     @Path("sitemap.xml")
     @Get
     private fun sitemap(): Response {
-        val simulcasts = simulcastCacheService.findAll()!!
-        val animes = animeCacheService.findAll()!!
+        val simulcasts = simulcastCacheService.findAllUpdated()!!
+
+        val animes = simulcasts.flatMap {
+            animeCacheService.findAllByUpdated(
+                CountryCode.FR,
+                it.uuid,
+                listOf(SortParameter("name", SortParameter.Order.ASC)),
+                1,
+                102
+            )!!.data
+        }
 
         val episode = episodeCacheService.findAllBy(
             CountryCode.FR,
@@ -87,8 +96,8 @@ class SiteController {
             null,
             mutableMapOf(
                 "episode" to episode,
-                "simulcasts" to simulcasts,
-                "animes" to animes
+                "simulcastsUpdated" to simulcasts,
+                "animesUpdated" to animes
             ),
             contentType = ContentType.Text.Xml
         )

diff --git a/src/main/kotlin/fr/shikkanime/converters/anime/AnimeDtoToAnimeConverter.kt b/src/main/kotlin/fr/shikkanime/converters/anime/AnimeDtoToAnimeConverter.kt
@@ -2,7 +2,7 @@ package fr.shikkanime.converters.anime
 
 import com.google.inject.Inject
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.AnimeDto
+import fr.shikkanime.dtos.animes.AnimeDto
 import fr.shikkanime.entities.Anime
 import fr.shikkanime.entities.Simulcast
 import fr.shikkanime.entities.enums.CountryCode

diff --git a/src/main/kotlin/fr/shikkanime/converters/anime/AnimeToAnimeDtoConverter.kt b/src/main/kotlin/fr/shikkanime/converters/anime/AnimeToAnimeDtoConverter.kt
@@ -1,13 +1,10 @@
 package fr.shikkanime.converters.anime
 
-import com.google.inject.Inject
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.AnimeDto
-import fr.shikkanime.dtos.SimulcastDto
+import fr.shikkanime.dtos.animes.AnimeDto
 import fr.shikkanime.dtos.enums.Status
+import fr.shikkanime.dtos.simulcasts.SimulcastDto
 import fr.shikkanime.entities.Anime
-import fr.shikkanime.entities.SortParameter
-import fr.shikkanime.services.caches.EpisodeCacheService
 import fr.shikkanime.utils.StringUtils
 import fr.shikkanime.utils.withUTC
 import org.apache.tika.language.detect.LanguageDetector
@@ -17,24 +14,13 @@ import java.time.format.DateTimeFormatter
 class AnimeToAnimeDtoConverter : AbstractConverter<Anime, AnimeDto>() {
     private val languageDetector: LanguageDetector = LanguageDetector.getDefaultLanguageDetector().loadModels()
 
-    @Inject
-    private lateinit var episodeCacheService: EpisodeCacheService
-
     override fun convert(from: Anime): AnimeDto {
-        val lastReleaseDate = episodeCacheService.findAllBy(
-            from.countryCode!!,
-            from.uuid,
-            listOf(SortParameter("releaseDateTime", SortParameter.Order.DESC)),
-            1,
-            1
-        )?.data?.firstOrNull()?.releaseDateTime
-
         val status = if (
             from.image.isNullOrBlank() ||
             from.banner.isNullOrBlank() ||
             from.description.isNullOrBlank() ||
             from.description?.startsWith("(") == true ||
-            languageDetector.detect(from.description).language.lowercase() != from.countryCode.name.lowercase()
+            languageDetector.detect(from.description).language.lowercase() != from.countryCode!!.name.lowercase()
         ) Status.INVALID else Status.VALID
 
         return AnimeDto(
@@ -43,7 +29,7 @@ class AnimeToAnimeDtoConverter : AbstractConverter<Anime, AnimeDto>() {
                 .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME),
             image = from.image,
             banner = from.banner,
-            countryCode = from.countryCode,
+            countryCode = from.countryCode!!,
             name = from.name!!,
             shortName = StringUtils.getShortName(from.name!!),
             description = from.description,
@@ -53,7 +39,6 @@ class AnimeToAnimeDtoConverter : AbstractConverter<Anime, AnimeDto>() {
             ) else null,
             status = status,
             slug = from.slug,
-            lastReleaseDateTime = lastReleaseDate
         )
     }
 }
diff --git a/src/main/kotlin/fr/shikkanime/converters/anime/AnimeToUpdatedAnimeDtoConverter.kt b/src/main/kotlin/fr/shikkanime/converters/anime/AnimeToUpdatedAnimeDtoConverter.kt
@@ -0,0 +1,59 @@
+package fr.shikkanime.converters.anime
+
+import com.google.inject.Inject
+import fr.shikkanime.converters.AbstractConverter
+import fr.shikkanime.dtos.animes.UpdatedAnimeDto
+import fr.shikkanime.dtos.enums.Status
+import fr.shikkanime.dtos.simulcasts.SimulcastDto
+import fr.shikkanime.entities.Anime
+import fr.shikkanime.entities.SortParameter
+import fr.shikkanime.services.caches.EpisodeCacheService
+import fr.shikkanime.utils.StringUtils
+import fr.shikkanime.utils.withUTC
+import org.apache.tika.language.detect.LanguageDetector
+import org.hibernate.Hibernate
+import java.time.format.DateTimeFormatter
+
+class AnimeToUpdatedAnimeDtoConverter : AbstractConverter<Anime, UpdatedAnimeDto>() {
+    private val languageDetector: LanguageDetector = LanguageDetector.getDefaultLanguageDetector().loadModels()
+
+    @Inject
+    private lateinit var episodeCacheService: EpisodeCacheService
+
+    override fun convert(from: Anime): UpdatedAnimeDto {
+        val lastReleaseDate = episodeCacheService.findAllBy(
+            from.countryCode!!,
+            from.uuid,
+            listOf(SortParameter("releaseDateTime", SortParameter.Order.DESC)),
+            1,
+            1
+        )?.data?.firstOrNull()?.releaseDateTime
+
+        val status = if (
+            from.image.isNullOrBlank() ||
+            from.banner.isNullOrBlank() ||
+            from.description.isNullOrBlank() ||
+            from.description?.startsWith("(") == true ||
+            languageDetector.detect(from.description).language.lowercase() != from.countryCode.name.lowercase()
+        ) Status.INVALID else Status.VALID
+
+        return UpdatedAnimeDto(
+            uuid = from.uuid,
+            releaseDateTime = from.releaseDateTime.withUTC()
+                .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME),
+            image = from.image,
+            banner = from.banner,
+            countryCode = from.countryCode,
+            name = from.name!!,
+            shortName = StringUtils.getShortName(from.name!!),
+            description = from.description,
+            simulcasts = if (Hibernate.isInitialized(from.simulcasts)) convert(
+                from.simulcasts,
+                SimulcastDto::class.java
+            ) else null,
+            status = status,
+            slug = from.slug,
+            lastReleaseDateTime = lastReleaseDate
+        )
+    }
+}
diff --git a/src/main/kotlin/fr/shikkanime/converters/episode/EpisodeToEpisodeDtoConverter.kt b/src/main/kotlin/fr/shikkanime/converters/episode/EpisodeToEpisodeDtoConverter.kt
@@ -1,8 +1,8 @@
 package fr.shikkanime.converters.episode
 
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.AnimeDto
 import fr.shikkanime.dtos.EpisodeDto
+import fr.shikkanime.dtos.animes.AnimeDto
 import fr.shikkanime.entities.Episode
 import fr.shikkanime.utils.withUTC
 import java.time.format.DateTimeFormatter

diff --git a/src/main/kotlin/fr/shikkanime/converters/simulcast/SimulcastDtoToSimulcastConverter.kt b/src/main/kotlin/fr/shikkanime/converters/simulcast/SimulcastDtoToSimulcastConverter.kt
@@ -2,7 +2,7 @@ package fr.shikkanime.converters.simulcast
 
 import com.google.inject.Inject
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.SimulcastDto
+import fr.shikkanime.dtos.simulcasts.SimulcastDto
 import fr.shikkanime.entities.Simulcast
 import fr.shikkanime.services.SimulcastService
 

diff --git a/src/main/kotlin/fr/shikkanime/converters/simulcast/SimulcastToSimulcastDtoConverter.kt b/src/main/kotlin/fr/shikkanime/converters/simulcast/SimulcastToSimulcastDtoConverter.kt
@@ -1,26 +1,11 @@
 package fr.shikkanime.converters.simulcast
 
-import com.google.inject.Inject
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.SimulcastDto
+import fr.shikkanime.dtos.simulcasts.SimulcastDto
 import fr.shikkanime.entities.Simulcast
-import fr.shikkanime.entities.SortParameter
-import fr.shikkanime.entities.enums.CountryCode
-import fr.shikkanime.services.caches.AnimeCacheService
 
 class SimulcastToSimulcastDtoConverter : AbstractConverter<Simulcast, SimulcastDto>() {
-    @Inject
-    private lateinit var animeCacheService: AnimeCacheService
-
     override fun convert(from: Simulcast): SimulcastDto {
-        val lastReleaseDateTime = animeCacheService.findAllBy(
-            CountryCode.FR,
-            from.uuid,
-            listOf(SortParameter("releaseDateTime", SortParameter.Order.DESC)),
-            1,
-            1
-        )?.data?.firstOrNull()?.releaseDateTime
-
         return SimulcastDto(
             uuid = from.uuid,
             season = from.season!!,
@@ -33,7 +18,6 @@ class SimulcastToSimulcastDtoConverter : AbstractConverter<Simulcast, SimulcastD
                 "AUTUMN" -> "Automne"
                 else -> "Inconnu"
             } + " ${from.year}",
-            lastReleaseDateTime = lastReleaseDateTime
         )
     }
 }
diff --git a/...main/kotlin/fr/shikkanime/converters/simulcast/SimulcastToUpdatedSimulcastDtoConverter.kt b/...main/kotlin/fr/shikkanime/converters/simulcast/SimulcastToUpdatedSimulcastDtoConverter.kt
@@ -0,0 +1,39 @@
+package fr.shikkanime.converters.simulcast
+
+import com.google.inject.Inject
+import fr.shikkanime.converters.AbstractConverter
+import fr.shikkanime.dtos.simulcasts.UpdatedSimulcastDto
+import fr.shikkanime.entities.Simulcast
+import fr.shikkanime.entities.SortParameter
+import fr.shikkanime.entities.enums.CountryCode
+import fr.shikkanime.services.caches.AnimeCacheService
+
+class SimulcastToUpdatedSimulcastDtoConverter : AbstractConverter<Simulcast, UpdatedSimulcastDto>() {
+    @Inject
+    private lateinit var animeCacheService: AnimeCacheService
+
+    override fun convert(from: Simulcast): UpdatedSimulcastDto {
+        val lastReleaseDateTime = animeCacheService.findAllBy(
+            CountryCode.FR,
+            from.uuid,
+            listOf(SortParameter("releaseDateTime", SortParameter.Order.DESC)),
+            1,
+            1
+        )?.data?.firstOrNull()?.releaseDateTime
+
+        return UpdatedSimulcastDto(
+            uuid = from.uuid,
+            season = from.season!!,
+            year = from.year!!,
+            slug = "${from.season.lowercase()}-${from.year}",
+            label = when (from.season) {
+                "WINTER" -> "Hiver"
+                "SPRING" -> "Printemps"
+                "SUMMER" -> "Été"
+                "AUTUMN" -> "Automne"
+                else -> "Inconnu"
+            } + " ${from.year}",
+            lastReleaseDateTime = lastReleaseDateTime
+        )
+    }
+}
diff --git a/src/main/kotlin/fr/shikkanime/dtos/EpisodeDto.kt b/src/main/kotlin/fr/shikkanime/dtos/EpisodeDto.kt
@@ -1,5 +1,6 @@
 package fr.shikkanime.dtos
 
+import fr.shikkanime.dtos.animes.AnimeDto
 import fr.shikkanime.entities.enums.EpisodeType
 import fr.shikkanime.entities.enums.LangType
 import fr.shikkanime.entities.enums.Platform

diff --git a/...ain/kotlin/fr/shikkanime/dtos/AnimeDto.kt → ...lin/fr/shikkanime/dtos/animes/AnimeDto.kt b/...ain/kotlin/fr/shikkanime/dtos/AnimeDto.kt → ...lin/fr/shikkanime/dtos/animes/AnimeDto.kt
@@ -1,6 +1,7 @@
-package fr.shikkanime.dtos
+package fr.shikkanime.dtos.animes
 
 import fr.shikkanime.dtos.enums.Status
+import fr.shikkanime.dtos.simulcasts.SimulcastDto
 import fr.shikkanime.entities.enums.CountryCode
 import java.io.Serializable
 import java.util.*
@@ -17,5 +18,4 @@ data class AnimeDto(
     val simulcasts: List<SimulcastDto>?,
     val status: Status? = null,
     val slug: String? = null,
-    val lastReleaseDateTime: String? = null
 ) : Serializable
diff --git a/src/main/kotlin/fr/shikkanime/dtos/animes/UpdatedAnimeDto.kt b/src/main/kotlin/fr/shikkanime/dtos/animes/UpdatedAnimeDto.kt
@@ -0,0 +1,22 @@
+package fr.shikkanime.dtos.animes
+
+import fr.shikkanime.dtos.enums.Status
+import fr.shikkanime.dtos.simulcasts.SimulcastDto
+import fr.shikkanime.entities.enums.CountryCode
+import java.io.Serializable
+import java.util.*
+
+data class UpdatedAnimeDto(
+    val uuid: UUID?,
+    val countryCode: CountryCode,
+    var name: String,
+    var shortName: String,
+    var releaseDateTime: String,
+    val image: String? = null,
+    val banner: String? = null,
+    val description: String?,
+    val simulcasts: List<SimulcastDto>?,
+    val status: Status? = null,
+    val slug: String? = null,
+    val lastReleaseDateTime: String? = null
+) : Serializable
diff --git a/src/main/kotlin/fr/shikkanime/dtos/simulcasts/SimulcastDto.kt b/src/main/kotlin/fr/shikkanime/dtos/simulcasts/SimulcastDto.kt
@@ -0,0 +1,12 @@
+package fr.shikkanime.dtos.simulcasts
+
+import java.io.Serializable
+import java.util.*
+
+data class SimulcastDto(
+    val uuid: UUID?,
+    val season: String,
+    val year: Int,
+    val slug: String,
+    val label: String,
+) : Serializable
diff --git a/...kotlin/fr/shikkanime/dtos/SimulcastDto.kt → ...me/dtos/simulcasts/UpdatedSimulcastDto.kt b/...kotlin/fr/shikkanime/dtos/SimulcastDto.kt → ...me/dtos/simulcasts/UpdatedSimulcastDto.kt
@@ -1,9 +1,9 @@
-package fr.shikkanime.dtos
+package fr.shikkanime.dtos.simulcasts
 
 import java.io.Serializable
 import java.util.*
 
-data class SimulcastDto(
+data class UpdatedSimulcastDto(
     val uuid: UUID?,
     val season: String,
     val year: Int,

diff --git a/src/main/kotlin/fr/shikkanime/services/caches/AnimeCacheService.kt b/src/main/kotlin/fr/shikkanime/services/caches/AnimeCacheService.kt
@@ -4,8 +4,9 @@ import com.google.inject.Inject
 import fr.shikkanime.caches.CountryCodeNamePaginationKeyCache
 import fr.shikkanime.caches.CountryCodeUUIDSortPaginationKeyCache
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.AnimeDto
 import fr.shikkanime.dtos.PageableDto
+import fr.shikkanime.dtos.animes.AnimeDto
+import fr.shikkanime.dtos.animes.UpdatedAnimeDto
 import fr.shikkanime.entities.Anime
 import fr.shikkanime.entities.SortParameter
 import fr.shikkanime.entities.enums.CountryCode
@@ -25,6 +26,14 @@ class AnimeCacheService : AbstractCacheService() {
             )
         }
 
+    private val findAllByUpdatedCache =
+        MapCache<CountryCodeUUIDSortPaginationKeyCache, PageableDto<UpdatedAnimeDto>>(classes = listOf(Anime::class.java)) {
+            PageableDto.fromPageable(
+                animeService.findAllBy(it.countryCode, it.uuid, it.sort, it.page, it.limit),
+                UpdatedAnimeDto::class.java
+            )
+        }
+
     private val findAllByNameCache = MapCache<CountryCodeNamePaginationKeyCache, PageableDto<AnimeDto>>(classes = listOf(Anime::class.java)) {
         PageableDto.fromPageable(
             animeService.findAllByName(it.name, it.countryCode, it.page, it.limit),
@@ -52,6 +61,14 @@ class AnimeCacheService : AbstractCacheService() {
         limit: Int
     ) = findAllByCache[CountryCodeUUIDSortPaginationKeyCache(countryCode, uuid, sort, page, limit)]
 
+    fun findAllByUpdated(
+        countryCode: CountryCode?,
+        uuid: UUID?,
+        sort: List<SortParameter>,
+        page: Int,
+        limit: Int
+    ) = findAllByUpdatedCache[CountryCodeUUIDSortPaginationKeyCache(countryCode, uuid, sort, page, limit)]
+
     fun findAllByName(name: String, countryCode: CountryCode?, page: Int, limit: Int) =
         findAllByNameCache[CountryCodeNamePaginationKeyCache(countryCode, name, page, limit)]