Merge pull request #335 from Shikkanime/dev

Dev

build.gradle.kts

@@ -28,6 +28,7 @@ val h2Version = "2.2.224"
 
 plugins {
     kotlin("jvm") version "2.0.0-Beta5"
+    kotlin("kapt") version "1.9.23"
     id("io.ktor.plugin") version "2.3.9"
     jacoco
     id("org.sonarqube") version "5.0.0.4638"
@@ -95,6 +96,9 @@ dependencies {
     implementation("org.twitter4j:twitter4j-core:$twitter4jVersion")
     implementation("io.github.takke:jp.takke.twitter4j-v2:$twitter4jV2Version")
 
+    kapt("org.hibernate.orm:hibernate-jpamodelgen:$hibernateCoreVersion")
+    compileOnly("org.hibernate.orm:hibernate-jpamodelgen:$hibernateCoreVersion")
+
     testImplementation("io.ktor:ktor-server-tests-jvm:$ktorVersion")
     testImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")

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

src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt

@@ -1,7 +1,7 @@
 package fr.shikkanime.controllers.site
 
 import com.google.inject.Inject
-import fr.shikkanime.dtos.AnimeDto
+import fr.shikkanime.dtos.animes.AnimeDto
 import fr.shikkanime.entities.SortParameter
 import fr.shikkanime.entities.enums.ConfigPropertyKey
 import fr.shikkanime.entities.enums.CountryCode

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.services.AnimeService

src/main/kotlin/fr/shikkanime/converters/anime/AnimeToAnimeDtoConverter.kt

@@ -2,16 +2,11 @@ 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.animes.AnimeNoStatusDto
 import fr.shikkanime.dtos.enums.Status
 import fr.shikkanime.entities.Anime
-import fr.shikkanime.services.SimulcastService.Companion.sortBySeasonAndYear
 import fr.shikkanime.services.caches.LanguageCacheService
-import fr.shikkanime.utils.StringUtils
-import fr.shikkanime.utils.withUTC
-import org.hibernate.Hibernate
-import java.time.format.DateTimeFormatter
 
 class AnimeToAnimeDtoConverter : AbstractConverter<Anime, AnimeDto>() {
     @Inject
@@ -26,24 +21,10 @@ class AnimeToAnimeDtoConverter : AbstractConverter<Anime, AnimeDto>() {
             languageCacheService.detectLanguage(from.description) != from.countryCode!!.name.lowercase()
         ) Status.INVALID else Status.VALID
 
-        return AnimeDto(
-            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.sortBySeasonAndYear(),
-                SimulcastDto::class.java
-            ) else null,
-            status = status,
-            slug = from.slug,
-            lastReleaseDateTime = from.lastReleaseDateTime.withUTC()
-                .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+
+        return AnimeDto.from(
+            convert(from, AnimeNoStatusDto::class.java),
+            status
         )
     }
 }

src/main/kotlin/fr/shikkanime/converters/anime/AnimeToAnimeNoStatusDtoConverter.kt

@@ -0,0 +1,34 @@
+package fr.shikkanime.converters.anime
+
+import fr.shikkanime.converters.AbstractConverter
+import fr.shikkanime.dtos.SimulcastDto
+import fr.shikkanime.dtos.animes.AnimeNoStatusDto
+import fr.shikkanime.entities.Anime
+import fr.shikkanime.services.SimulcastService.Companion.sortBySeasonAndYear
+import fr.shikkanime.utils.StringUtils
+import fr.shikkanime.utils.withUTC
+import org.hibernate.Hibernate
+import java.time.format.DateTimeFormatter
+
+class AnimeToAnimeNoStatusDtoConverter : AbstractConverter<Anime, AnimeNoStatusDto>() {
+    override fun convert(from: Anime): AnimeNoStatusDto {
+        return AnimeNoStatusDto(
+            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.sortBySeasonAndYear(),
+                SimulcastDto::class.java
+            ) else null,
+            slug = from.slug,
+            lastReleaseDateTime = from.lastReleaseDateTime.withUTC()
+                .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+        )
+    }
+}

src/main/kotlin/fr/shikkanime/converters/episode/EpisodeToEpisodeDtoConverter.kt

@@ -2,9 +2,9 @@ package fr.shikkanime.converters.episode
 
 import com.google.inject.Inject
 import fr.shikkanime.converters.AbstractConverter
-import fr.shikkanime.dtos.AnimeDto
 import fr.shikkanime.dtos.EpisodeDto
 import fr.shikkanime.dtos.PlatformDto
+import fr.shikkanime.dtos.animes.AnimeDto
 import fr.shikkanime.dtos.enums.Status
 import fr.shikkanime.entities.Episode
 import fr.shikkanime.services.caches.LanguageCacheService

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.dtos.enums.Status
 import fr.shikkanime.entities.enums.EpisodeType
 import fr.shikkanime.entities.enums.LangType

src/main/kotlin/fr/shikkanime/dtos/WeeklyAnimeDto.kt

@@ -1,5 +1,7 @@
 package fr.shikkanime.dtos
 
+import fr.shikkanime.dtos.animes.AnimeDto
+
 data class WeeklyAnimeDto(
     val anime: AnimeDto,
     val releaseDateTime: String,

src/main/kotlin/fr/shikkanime/dtos/animes/AnimeDto.kt

@@ -0,0 +1,52 @@
+package fr.shikkanime.dtos.animes
+
+import fr.shikkanime.dtos.SimulcastDto
+import fr.shikkanime.dtos.enums.Status
+import fr.shikkanime.entities.enums.CountryCode
+import java.util.*
+
+data class AnimeDto(
+    override val uuid: UUID?,
+    override val countryCode: CountryCode,
+    override var name: String,
+    override var shortName: String,
+    override var releaseDateTime: String,
+    override val image: String? = null,
+    override val banner: String? = null,
+    override val description: String?,
+    override val simulcasts: List<SimulcastDto>?,
+    override val slug: String? = null,
+    override val lastReleaseDateTime: String? = null,
+    val status: Status? = null,
+) : AnimeNoStatusDto(
+    uuid,
+    countryCode,
+    name,
+    shortName,
+    releaseDateTime,
+    image,
+    banner,
+    description,
+    simulcasts,
+    slug,
+    lastReleaseDateTime
+) {
+    companion object {
+        fun from(animeNoStatusDto: AnimeNoStatusDto, status: Status?): AnimeDto {
+            return AnimeDto(
+                animeNoStatusDto.uuid,
+                animeNoStatusDto.countryCode,
+                animeNoStatusDto.name,
+                animeNoStatusDto.shortName,
+                animeNoStatusDto.releaseDateTime,
+                animeNoStatusDto.image,
+                animeNoStatusDto.banner,
+                animeNoStatusDto.description,
+                animeNoStatusDto.simulcasts,
+                animeNoStatusDto.slug,
+                animeNoStatusDto.lastReleaseDateTime,
+                status,
+            )
+        }
+    }
+}

src/main/kotlin/fr/shikkanime/dtos/animes/AnimeNoStatusDto.kt

@@ -0,0 +1,32 @@
+package fr.shikkanime.dtos.animes
+
+import fr.shikkanime.dtos.SimulcastDto
+import fr.shikkanime.entities.enums.CountryCode
+import java.util.*
+
+open class AnimeNoStatusDto(
+    @Transient
+    open val uuid: UUID?,
+    @Transient
+    open val countryCode: CountryCode,
+    @Transient
+    open var name: String,
+    @Transient
+    open var shortName: String,
+    @Transient
+    open var releaseDateTime: String,
+    @Transient
+    open val image: String? = null,
+    @Transient
+    open val banner: String? = null,
+    @Transient
+    open val description: String?,
+    @Transient
+    open val simulcasts: List<SimulcastDto>?,
+    @Transient
+    open val slug: String? = null,
+    @Transient
+    open val lastReleaseDateTime: String? = null
+) {
+    fun toAnimeDto() = AnimeDto.from(this, null)
+}

src/main/kotlin/fr/shikkanime/entities/Anime.kt

@@ -14,6 +14,7 @@ import java.util.*
     name = "anime",
     indexes = [
         Index(name = "idx_anime_country_code", columnList = "country_code"),
+        Index(name = "idx_anime_slug", columnList = "slug"),
     ]
 )
 @Indexed
@@ -44,7 +45,7 @@ class Anime(
     )
     @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
     var simulcasts: MutableSet<Simulcast> = mutableSetOf(),
-    @Column(nullable = true)
+    @Column(nullable = false, unique = true)
     var slug: String? = null,
     @Column(nullable = false, name = "last_release_date_time")
     var lastReleaseDateTime: ZonedDateTime = releaseDateTime,

src/main/kotlin/fr/shikkanime/repositories/AbstractRepository.kt

@@ -6,6 +6,7 @@ import fr.shikkanime.entities.ShikkEntity
 import fr.shikkanime.utils.Database
 import jakarta.persistence.EntityManager
 import jakarta.persistence.TypedQuery
+import jakarta.persistence.criteria.CriteriaQuery
 import org.hibernate.ScrollMode
 import org.hibernate.jpa.AvailableHints
 import org.hibernate.query.Query
@@ -41,6 +42,11 @@ abstract class AbstractRepository<E : ShikkEntity> {
             .setHint(AvailableHints.HINT_READ_ONLY, true)
     }
 
+    fun <T> createReadOnlyQuery(entityManager: EntityManager, criteriaQuery: CriteriaQuery<T>): TypedQuery<T> {
+        return entityManager.createQuery(criteriaQuery)
+            .setHint(AvailableHints.HINT_READ_ONLY, true)
+    }
+
     fun buildPageableQuery(query: TypedQuery<E>, page: Int, limit: Int): Pageable<E> {
         val scrollableResults = query.unwrap(Query::class.java)
             .setReadOnly(true)

src/main/kotlin/fr/shikkanime/repositories/AnimeRepository.kt

@@ -1,6 +1,7 @@
 package fr.shikkanime.repositories
 
 import fr.shikkanime.entities.Anime
+import fr.shikkanime.entities.Anime_
 import fr.shikkanime.entities.Pageable
 import fr.shikkanime.entities.SortParameter
 import fr.shikkanime.entities.enums.CountryCode
@@ -139,9 +140,15 @@ class AnimeRepository : AbstractRepository<Anime>() {
     }
 
     fun findBySlug(slug: String): Anime? {
-        return inTransaction {
-            createReadOnlyQuery(it, "FROM Anime WHERE slug = :slug", getEntityClass())
-                .setParameter("slug", slug)
+        return inTransaction { entityManager ->
+            val cb = entityManager.criteriaBuilder
+            val query = cb.createQuery(getEntityClass())
+            val root = query.from(getEntityClass())
+
+            query.select(root)
+                .where(cb.equal(root[Anime_.slug], slug))
+
+            createReadOnlyQuery(entityManager, query)
                 .resultList
                 .firstOrNull()
                 ?.initialize()

src/main/kotlin/fr/shikkanime/repositories/EpisodeRepository.kt

@@ -1,8 +1,6 @@
 package fr.shikkanime.repositories
 
-import fr.shikkanime.entities.Episode
-import fr.shikkanime.entities.Pageable
-import fr.shikkanime.entities.SortParameter
+import fr.shikkanime.entities.*
 import fr.shikkanime.entities.enums.CountryCode
 import fr.shikkanime.entities.enums.EpisodeType
 import fr.shikkanime.entities.enums.LangType
@@ -164,19 +162,17 @@ class EpisodeRepository : AbstractRepository<Episode>() {
         end: ZonedDateTime,
     ): List<Episode> {
         return inTransaction { entityManager ->
-            createReadOnlyQuery(
-                entityManager,
-                """
-                    FROM Episode e
-                    WHERE e.anime.countryCode = :countryCode AND e.releaseDateTime BETWEEN :start AND :end
-                """.trimIndent(),
-                getEntityClass()
-            )
-                .setParameter("countryCode", countryCode)
-                .setParameter("start", start)
-                .setParameter("end", end)
+            val cb = entityManager.criteriaBuilder
+            val query = cb.createQuery(getEntityClass())
+            val root = query.from(getEntityClass())
+
+            val countryPredicate = cb.equal(root[Episode_.anime][Anime_.countryCode], countryCode)
+            val datePredicate = cb.between(root[Episode_.releaseDateTime], start, end)
+
+            query.select(root).where(cb.and(countryPredicate, datePredicate))
+
+            createReadOnlyQuery(entityManager, query)
                 .resultList
-                .initialize()
         }
     }
 }