🐛 Fixed bug with related | similar parse 🐛

Author: DeNyWho

src/main/kotlin/club/anifox/backend/controller/anime/AnimeController.kt

@@ -1,13 +1,11 @@
 package club.anifox.backend.controller.anime
 
-import club.anifox.backend.domain.enums.anime.AnimeRelationFranchise
 import club.anifox.backend.domain.enums.anime.AnimeSeason
 import club.anifox.backend.domain.enums.anime.AnimeStatus
 import club.anifox.backend.domain.enums.anime.AnimeType
 import club.anifox.backend.domain.enums.anime.AnimeVideoType
 import club.anifox.backend.domain.enums.anime.filter.AnimeDefaultFilter
 import club.anifox.backend.domain.enums.anime.filter.AnimeSearchFilter
-import club.anifox.backend.domain.model.anime.AnimeFranchise
 import club.anifox.backend.domain.model.anime.AnimeGenre
 import club.anifox.backend.domain.model.anime.AnimeStudio
 import club.anifox.backend.domain.model.anime.AnimeVideo
@@ -208,15 +206,6 @@ class AnimeController {
         return animeService.getAnimeCharacters(page, limit, url, role, search)
     }
 
-    @GetMapping("/{url}/franchise")
-    @Operation(summary = "anime franchise")
-    fun getAnimeFranchise(
-        @PathVariable url: String,
-        type: AnimeRelationFranchise?,
-    ): List<AnimeFranchise> {
-        return animeService.getAnimeFranchises(url, type)
-    }
-
     @GetMapping("/{url}/episodes")
     @Operation(summary = "anime episodes")
     fun getAnimeEpisodes(

src/main/kotlin/club/anifox/backend/domain/repository/anime/AnimeRepository.kt

@@ -1,13 +1,11 @@
 package club.anifox.backend.domain.repository.anime
 
-import club.anifox.backend.domain.enums.anime.AnimeRelationFranchise
 import club.anifox.backend.domain.enums.anime.AnimeSeason
 import club.anifox.backend.domain.enums.anime.AnimeStatus
 import club.anifox.backend.domain.enums.anime.AnimeType
 import club.anifox.backend.domain.enums.anime.AnimeVideoType
 import club.anifox.backend.domain.enums.anime.filter.AnimeDefaultFilter
 import club.anifox.backend.domain.enums.anime.filter.AnimeSearchFilter
-import club.anifox.backend.domain.model.anime.AnimeFranchise
 import club.anifox.backend.domain.model.anime.AnimeGenre
 import club.anifox.backend.domain.model.anime.AnimeStudio
 import club.anifox.backend.domain.model.anime.AnimeVideo
@@ -90,11 +88,6 @@ interface AnimeRepository {
         episodeCount: Int?,
     ): List<AnimeLight>
 
-    fun getAnimeFranchises(
-        url: String,
-        type: AnimeRelationFranchise?,
-    ): List<AnimeFranchise>
-
     fun parseAnimeIntegrations()
     fun getAnimeCharacters(
         page: Int,

src/main/kotlin/club/anifox/backend/jpa/entity/anime/AnimeTable.kt

@@ -3,7 +3,6 @@ package club.anifox.backend.jpa.entity.anime
 import club.anifox.backend.domain.enums.anime.AnimeSeason
 import club.anifox.backend.domain.enums.anime.AnimeStatus
 import club.anifox.backend.domain.enums.anime.AnimeType
-import club.anifox.backend.jpa.entity.anime.common.AnimeFranchiseTable
 import club.anifox.backend.jpa.entity.anime.common.AnimeGenreTable
 import club.anifox.backend.jpa.entity.anime.common.AnimeIdsTable
 import club.anifox.backend.jpa.entity.anime.common.AnimeImagesTable
@@ -192,14 +191,6 @@ data class AnimeTable(
         schema = "anime",
     )
     var studios: MutableSet<AnimeStudioTable> = mutableSetOf(),
-    @OneToMany(
-        mappedBy = "anime",
-        fetch = FetchType.LAZY,
-        cascade = [CascadeType.ALL],
-        orphanRemoval = true,
-    )
-    @BatchSize(size = 10)
-    val franchiseMultiple: MutableSet<AnimeFranchiseTable> = mutableSetOf(),
     var shikimoriRating: Double = 0.0,
     var shikimoriVotes: Int = 0,
     val ratingMpa: String = "",
@@ -295,11 +286,6 @@ data class AnimeTable(
         return this
     }
 
-    fun addFranchiseMultiple(franchises: List<AnimeFranchiseTable>): AnimeTable {
-        this.franchiseMultiple.addAll(franchises)
-        return this
-    }
-
     fun addEpisodesAll(episodesAll: List<AnimeEpisodeTable>): AnimeTable {
         episodesAll.forEach { newEpisode ->
             val existingEpisode = episodes.find { it.number == newEpisode.number }

src/main/kotlin/club/anifox/backend/jpa/entity/anime/common/AnimeFranchiseTable.kt

@@ -1,13 +1,11 @@
 package club.anifox.backend.service.anime
 
-import club.anifox.backend.domain.enums.anime.AnimeRelationFranchise
 import club.anifox.backend.domain.enums.anime.AnimeSeason
 import club.anifox.backend.domain.enums.anime.AnimeStatus
 import club.anifox.backend.domain.enums.anime.AnimeType
 import club.anifox.backend.domain.enums.anime.AnimeVideoType
 import club.anifox.backend.domain.enums.anime.filter.AnimeDefaultFilter
 import club.anifox.backend.domain.enums.anime.filter.AnimeSearchFilter
-import club.anifox.backend.domain.model.anime.AnimeFranchise
 import club.anifox.backend.domain.model.anime.AnimeGenre
 import club.anifox.backend.domain.model.anime.AnimeStudio
 import club.anifox.backend.domain.model.anime.AnimeVideo
@@ -144,13 +142,6 @@ class AnimeService : AnimeRepository {
         return animeCommonComponent.getWeeklySchedule(page, limit, date)
     }
 
-    override fun getAnimeFranchises(
-        url: String,
-        type: AnimeRelationFranchise?,
-    ): List<AnimeFranchise> {
-        return animeCommonComponent.getAnimeFranchise(url, type)
-    }
-
     override fun getAnimeYears(): List<String> {
         return animeCommonComponent.getAnimeYears()
     }

src/main/kotlin/club/anifox/backend/jpa/repository/anime/AnimeFranchiseRepository.kt

@@ -103,7 +103,6 @@ class AnimeBlockComponent {
                 titleOther.clear()
                 episodes.clear()
                 screenshots.clear()
-                franchiseMultiple.clear()
                 similar.clear()
                 related.clear()
                 ids = AnimeIdsTable()

src/main/kotlin/club/anifox/backend/service/anime/AnimeService.kt

@@ -1,6 +1,5 @@
 package club.anifox.backend.service.anime.components.common
 
-import club.anifox.backend.domain.enums.anime.AnimeRelationFranchise
 import club.anifox.backend.domain.enums.anime.AnimeVideoType
 import club.anifox.backend.domain.enums.anime.filter.AnimeDefaultFilter
 import club.anifox.backend.domain.exception.common.NoContentException
@@ -12,7 +11,6 @@ import club.anifox.backend.domain.mappers.anime.toAnimeEpisodeUser
 import club.anifox.backend.domain.mappers.anime.toAnimeVideo
 import club.anifox.backend.domain.mappers.anime.toGenre
 import club.anifox.backend.domain.mappers.anime.toStudio
-import club.anifox.backend.domain.model.anime.AnimeFranchise
 import club.anifox.backend.domain.model.anime.AnimeGenre
 import club.anifox.backend.domain.model.anime.AnimeRelation
 import club.anifox.backend.domain.model.anime.AnimeStudio
@@ -28,7 +26,6 @@ import club.anifox.backend.jpa.entity.anime.AnimeCharacterRoleTable
 import club.anifox.backend.jpa.entity.anime.AnimeCharacterTable
 import club.anifox.backend.jpa.entity.anime.AnimeExternalLinksTable
 import club.anifox.backend.jpa.entity.anime.AnimeTable
-import club.anifox.backend.jpa.entity.anime.common.AnimeFranchiseTable
 import club.anifox.backend.jpa.entity.anime.common.AnimeGenreTable
 import club.anifox.backend.jpa.entity.anime.common.AnimeImagesTable
 import club.anifox.backend.jpa.entity.anime.common.AnimeStudioTable
@@ -401,52 +398,6 @@ class AnimeCommonComponent {
         }
     }
 
-    fun getAnimeFranchise(
-        url: String,
-        type: AnimeRelationFranchise?,
-    ): List<AnimeFranchise> {
-        val anime: AnimeTable = animeUtils.checkAnime(url)
-
-        val criteriaBuilder: CriteriaBuilder = entityManager.criteriaBuilder
-        val criteriaQuery: CriteriaQuery<AnimeFranchiseTable> = criteriaBuilder.createQuery(AnimeFranchiseTable::class.java)
-
-        val animeRoot: Root<AnimeTable> = criteriaQuery.from(AnimeTable::class.java)
-
-        val franchiseJoin = animeRoot.join<AnimeTable, AnimeFranchiseTable>("franchiseMultiple", JoinType.LEFT)
-        franchiseJoin.join<AnimeFranchiseTable, AnimeTable>("target", JoinType.INNER)
-        val targetAnime = franchiseJoin.join<AnimeFranchiseTable, AnimeTable>("target", JoinType.INNER)
-
-        targetAnime.join<AnimeTable, AnimeGenreTable>("genres", JoinType.LEFT)
-        targetAnime.join<AnimeTable, AnimeImagesTable>("images", JoinType.LEFT)
-        targetAnime.join<AnimeTable, AnimeStudioTable>("studios", JoinType.LEFT)
-
-        val predicates =
-            mutableListOf(
-                criteriaBuilder.equal(animeRoot.get<String>("url"), anime.url),
-            )
-
-        if (type != null) {
-            predicates.add(criteriaBuilder.equal(franchiseJoin.get<AnimeRelationFranchise>("relationType"), type))
-        }
-
-        criteriaQuery.select(franchiseJoin)
-        criteriaQuery.where(*predicates.toTypedArray())
-
-        val results = entityManager.createQuery(criteriaQuery).resultList
-
-        if (results.isEmpty()) {
-            throw NoContentException("Franchise relations for this anime not found")
-        }
-
-        return results.map { franchise ->
-            AnimeFranchise(
-                anime = franchise.target.toAnimeLight(),
-                relation = franchise.relationTypeRus,
-                targetUrl = franchise.target.url,
-            )
-        }
-    }
-
     fun getWeeklySchedule(
         page: Int,
         limit: Int,

src/main/kotlin/club/anifox/backend/service/anime/components/block/AnimeBlockComponent.kt

@@ -10,7 +10,6 @@ import io.ktor.http.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component
-import java.time.LocalDate
 
 @Component
 class KodikComponent {
@@ -48,7 +47,6 @@ class KodikComponent {
             parameter("limit", 100)
             parameter("sort", "shikimori_rating")
             parameter("order", "desc")
-//            parameter("year", "${LocalDate.now().year}, ${LocalDate.now().year - 1}")
             parameter("types", "anime-serial, anime")
             parameter("camrip", false)
             parameter("with_episodes_data", true)