fix audio name API

yhornisse / bremer

Browse code fix audio name API master
1 parent 08ea04c commit 7fd4e743cc2ec43abc8c8cdcef54bdf3be93e7ff yhornisse authored on 17 Aug

Patch

Showing 3 changed files

Ignore Space Show notes View src/main/kotlin/dao/AlbumDao.kt
/* * Copyright (c) 2023. yo-saito. All Rights Reserved. / package net.piedpiper.bremer.dao import net.piedpiper.bremer.entity.AlbumEntity import net.piedpiper.bremer.entity.AudioEntity import net.piedpiper.bremer.entity.AudioPlayHistoryEntity import net.piedpiper.bremer.utils.DaoUtils import org.apache.ibatis.annotations. import org.springframework.stereotype.Repository @Repository("bremer.dao.AlbumDao") @Mapper interface AlbumDao { @ResultMap("net.piedpiper.bremer.AlbumEntity") @Select("SELECT * FROM album WHERE id = #{id} FOR UPDATE") fun findOneByIdWithLock(@Param("id") id: Long): AlbumEntity? @ResultMap("net.piedpiper.bremer.AlbumEntity") @Select( """<script> SELECT * FROM album WHERE artist_id IN <foreach item="artistId" collection="artistIds" open="(" separator="," close=")"> #{artistId} </foreach> LIMIT #{limit} </script>""" ) fun findAllByArtistIdInLimit( @Param("artistIds") artistIds: List<Long>, @Param("limit") limit: Int ): List<AlbumEntity> @ResultMap("net.piedpiper.bremer.AlbumEntity") @Select("SELECT * FROM album WHERE name LIKE CONCAT('%', #{nameLike}, '%') LIMIT #{limit}") fun findAllByNameLikeLimit( @Param("nameLike") nameLike: String, @Param("limit") limit: Int ): List<AlbumEntity> @UpdateProvider(type = Sql::class, method = "updateOne") fun updateOne(@Param("entity") entity: AlbumEntity) class Sql { companion object { @JvmStatic fun updateOne(@Param("entity") entity: AlbumEntity): String = DaoUtils.updateOne(entity) } } } /* * Copyright (c) 2023. yo-saito. All Rights Reserved. / package net.piedpiper.bremer.dao import net.piedpiper.bremer.entity.AlbumEntity import net.piedpiper.bremer.entity.AudioPlayHistoryEntity import org.apache.ibatis.annotations.Mapper import org.apache.ibatis.annotations.Param import org.apache.ibatis.annotations.ResultMap import org.apache.ibatis.annotations.Select import org.springframework.stereotype.Repository @Repository("bremer.dao.AlbumDao") @Mapper interface AlbumDao { @ResultMap("net.piedpiper.bremer.AlbumEntity") @Select("""<script> SELECT FROM album WHERE artist_id IN <foreach item="artistId" collection="artistIds" open="(" separator="," close=")"> #{artistId} </foreach> LIMIT #{limit} </script>""") fun findAllByArtistIdInLimit( @Param("artistIds") artistIds: List<Long>, @Param("limit") limit: Int ): List<AlbumEntity> @ResultMap("net.piedpiper.bremer.AlbumEntity") @Select("SELECT * FROM album WHERE name LIKE CONCAT('%', #{nameLike}, '%') LIMIT #{limit}") fun findAllByNameLikeLimit( @Param("nameLike") nameLike: String, @Param("limit") limit: Int ): List<AlbumEntity> }

Ignore Space Show notes View

src/main/kotlin/dao/AlbumDao.kt

/*
 * Copyright (c) 2023. yo-saito. All Rights Reserved.
 */

package net.piedpiper.bremer.dao

import net.piedpiper.bremer.entity.AlbumEntity
import net.piedpiper.bremer.entity.AudioEntity
import net.piedpiper.bremer.entity.AudioPlayHistoryEntity
import net.piedpiper.bremer.utils.DaoUtils
import org.apache.ibatis.annotations.*
import org.springframework.stereotype.Repository

@Repository("bremer.dao.AlbumDao")
@Mapper
interface AlbumDao {

@ResultMap("net.piedpiper.bremer.AlbumEntity")
    @Select("SELECT * FROM album WHERE id = #{id} FOR UPDATE")
    fun findOneByIdWithLock(@Param("id") id: Long): AlbumEntity?

@ResultMap("net.piedpiper.bremer.AlbumEntity")
    @Select(
        """<script>
    SELECT * FROM album WHERE artist_id IN
    <foreach item="artistId" collection="artistIds" open="(" separator="," close=")">
    #{artistId}
    </foreach>
    LIMIT #{limit}
    </script>"""
    )
    fun findAllByArtistIdInLimit(
        @Param("artistIds") artistIds: List<Long>,
        @Param("limit") limit: Int
    ): List<AlbumEntity>

@ResultMap("net.piedpiper.bremer.AlbumEntity")
    @Select("SELECT * FROM album WHERE name LIKE CONCAT('%', #{nameLike}, '%') LIMIT #{limit}")
    fun findAllByNameLikeLimit(
        @Param("nameLike") nameLike: String,
        @Param("limit") limit: Int
    ): List<AlbumEntity>

@UpdateProvider(type = Sql::class, method = "updateOne")
    fun updateOne(@Param("entity") entity: AlbumEntity)

class Sql {
        companion object {
            @JvmStatic
            fun updateOne(@Param("entity") entity: AlbumEntity): String =
                DaoUtils.updateOne(entity)
        }
    }
}

/*
 * Copyright (c) 2023. yo-saito. All Rights Reserved.
 */

package net.piedpiper.bremer.dao

import net.piedpiper.bremer.entity.AlbumEntity
import net.piedpiper.bremer.entity.AudioPlayHistoryEntity
import org.apache.ibatis.annotations.Mapper
import org.apache.ibatis.annotations.Param
import org.apache.ibatis.annotations.ResultMap
import org.apache.ibatis.annotations.Select
import org.springframework.stereotype.Repository

@Repository("bremer.dao.AlbumDao")
@Mapper
interface AlbumDao {

@ResultMap("net.piedpiper.bremer.AlbumEntity")
    @Select("""<script>
    SELECT * FROM album WHERE artist_id IN
    <foreach item="artistId" collection="artistIds" open="(" separator="," close=")">
    #{artistId}
    </foreach>
    LIMIT #{limit}
    </script>""")
    fun findAllByArtistIdInLimit(
        @Param("artistIds") artistIds: List<Long>,
        @Param("limit") limit: Int
    ): List<AlbumEntity>

Ignore Space Show notes View src/main/kotlin/dao/ArtistDao.kt
/* * Copyright (c) 2023. yo-saito. All Rights Reserved. / package net.piedpiper.bremer.dao import net.piedpiper.bremer.entity.ArtistEntity import net.piedpiper.bremer.utils.DaoUtils import org.apache.ibatis.annotations. import org.springframework.stereotype.Repository @Repository("bremer.dao.ArtistDao") @Mapper interface ArtistDao { @ResultMap("net.piedpiper.bremer.ArtistEntity") @Select("SELECT * FROM artist WHERE name LIKE CONCAT('%', #{nameLike}, '%') LIMIT #{limit}") fun findAllByNameLikeLimit( @Param("nameLike") nameLike: String, @Param("limit") limit: Int ): List<ArtistEntity> @ResultMap("net.piedpiper.bremer.ArtistEntity") @Select("SELECT * FROM artist WHERE id = #{id} FOR UPDATE") fun findOneByIdWithLock(@Param("id") id: Long) : ArtistEntity? @UpdateProvider(type = Sql::class, method = "updateOne") fun updateOne(@Param("entity") entity: ArtistEntity) class Sql { companion object { @JvmStatic fun updateOne(@Param("entity") entity: ArtistEntity): String = DaoUtils.updateOne(entity) } } } /* * Copyright (c) 2023. yo-saito. All Rights Reserved. / package net.piedpiper.bremer.dao import net.piedpiper.bremer.entity.ArtistEntity import org.apache.ibatis.annotations.Mapper import org.apache.ibatis.annotations.Param import org.apache.ibatis.annotations.ResultMap import org.apache.ibatis.annotations.Select import org.springframework.stereotype.Repository @Repository("bremer.dao.ArtistDao") @Mapper interface ArtistDao { @ResultMap("net.piedpiper.bremer.ArtistEntity") @Select("SELECT FROM artist WHERE name LIKE CONCAT('%', #{nameLike}, '%') LIMIT #{limit}") fun findAllByNameLikeLimit( @Param("nameLike") nameLike: String, @Param("limit") limit: Int ): List<ArtistEntity> }

Ignore Space Show notes View

src/main/kotlin/dao/ArtistDao.kt

/*
 * Copyright (c) 2023. yo-saito. All Rights Reserved.
 */

package net.piedpiper.bremer.dao

import net.piedpiper.bremer.entity.ArtistEntity
import net.piedpiper.bremer.utils.DaoUtils
import org.apache.ibatis.annotations.*
import org.springframework.stereotype.Repository

@Repository("bremer.dao.ArtistDao")
@Mapper
interface ArtistDao {

@ResultMap("net.piedpiper.bremer.ArtistEntity")
    @Select("SELECT * FROM artist WHERE name LIKE CONCAT('%', #{nameLike}, '%') LIMIT #{limit}")
    fun findAllByNameLikeLimit(
        @Param("nameLike") nameLike: String,
        @Param("limit") limit: Int
    ): List<ArtistEntity>

@ResultMap("net.piedpiper.bremer.ArtistEntity")
    @Select("SELECT * FROM artist WHERE id = #{id} FOR UPDATE")
    fun findOneByIdWithLock(@Param("id") id: Long) : ArtistEntity?

@UpdateProvider(type = Sql::class, method = "updateOne")
    fun updateOne(@Param("entity") entity: ArtistEntity)

class Sql {
        companion object {
            @JvmStatic
            fun updateOne(@Param("entity") entity: ArtistEntity): String =
                DaoUtils.updateOne(entity)
        }
    }
}

Ignore Space Show notes View src/main/kotlin/service/AudioService.kt
/* * Copyright (c) 2023. yo-saito. All Rights Reserved. / package net.piedpiper.bremer.service import net.piedpiper.bremer.dao. import net.piedpiper.bremer.entity.AudioEntity import net.piedpiper.bremer.entity.AudioPlayHistoryEntity import net.piedpiper.bremer.exception.NotFoundException import net.piedpiper.bremer.model.api.AudioListResponse import net.piedpiper.bremer.model.api.AudioRequest import org.springframework.beans.factory.annotation.Qualifier import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.io.File import java.time.LocalDateTime import java.time.ZoneId @Service("bremer.service.AudioService") class AudioService( @Qualifier("bremer.dao.AudioDao") private val audioDao: AudioDao, @Qualifier("bremer.dao.ArtistDao") private val artistDao: ArtistDao, @Qualifier("bremer.dao.AlbumDao") private val albumDao: AlbumDao, @Qualifier("bremer.dao.AudioPlayHistoryDao") private val audioPlayHistoryDao: AudioPlayHistoryDao, @Qualifier("bremer.dao.TagDao") private val tagDao: TagDao ) { /** 音楽ファイル取得 / @Transactional fun getAudioFile(slug: String): File { val audio = audioDao.findOneBySlug(slug) ?: throw NotFoundException() val file = File(audio.path) if (!file.exists()) { throw NotFoundException() } audioPlayHistoryDao.insertOrUpdateOne( AudioPlayHistoryEntity( audioId = audio.id, lastPlayedAt = LocalDateTime.now(ZoneId.of("Asia/Tokyo")) ) ) return file } /* キーワード検索 / @Transactional fun getByKeywords( audioNameLike: String?, artistNameLike: String?, albumNameLike: String?, tagNameLike: String?, pageSize: Int ): AudioListResponse { val set = mutableSetOf<AudioEntity>() if (audioNameLike?.isNotEmpty() == true) { set.addAll(audioDao.findAllByNameLikeLimit(audioNameLike, pageSize)) } if (artistNameLike?.isNotEmpty() == true && set.size <= pageSize) { set.addAll(findAllByArtistNameLikeLimit(artistNameLike, pageSize)) } if (albumNameLike?.isNotEmpty() == true && set.size <= pageSize) { set.addAll(findAllByAlbumNameLikeLimit(albumNameLike, pageSize)) } if (tagNameLike?.isNotEmpty() == true && set.size <= pageSize) { set.addAll(findAllByTagNameLikeLimit(tagNameLike, pageSize)) } return AudioListResponse( set.sortedWith(compareBy({ it.albumId }, { it.sequence })) .take(pageSize) .toList() ) } /* 最近再生した曲一覧を取得 / @Transactional fun getLeastRecentlyAccessedAudio(pageSize: Int): AudioListResponse { val historyMap = audioPlayHistoryDao.findAllOrderLastPlayedAtDescLimit(pageSize) .associateBy { it.audioId } return if (historyMap.isNotEmpty()) audioDao.findAllByIdIn(historyMap.keys.map { it }) .sortedByDescending { historyMap[it.id]?.lastPlayedAt ?: LocalDateTime.MIN }.let { AudioListResponse(it) } else AudioListResponse() } @Transactional fun update(slug: String, request: AudioRequest) = audioDao.findOneBySlugWithLock(slug) ?.let { request.name?.apply { it.name = request.name audioDao.updateOne(it) } albumDao.findOneByIdWithLock(it.albumId)?.let { album -> request.album?.apply { album.name = request.album albumDao.updateOne(album) } request.artist?.apply { artistDao.findOneByIdWithLock(album.artistId)?.let { artist -> artist.name = request.artist artistDao.updateOne(artist) } } } } ?: throw NotFoundException() private fun findAllByArtistNameLikeLimit( artistNameLike: String, limit: Int ): List<AudioEntity> { val artists = artistDao.findAllByNameLikeLimit(artistNameLike, limit) if (artists.isEmpty()) { return emptyList() } val albums = albumDao.findAllByArtistIdInLimit(artists.map { it.id }.distinct(), limit) if (albums.isEmpty()) { return emptyList() } return audioDao.findAllByAlbumIdIn(albums.map { it.id }.distinct()) } private fun findAllByAlbumNameLikeLimit(albumNameLike: String, limit: Int): List<AudioEntity> { val albums = albumDao.findAllByNameLikeLimit(albumNameLike, limit) return if (albums.isNotEmpty()) audioDao .findAllByAlbumIdIn(albums.map { it.id }) else emptyList() } private fun findAllByTagNameLikeLimit(tagNameLike: String, limit: Int): List<AudioEntity> { val tags = tagDao.findAllByNameLikeLimit(tagNameLike, limit) return if (tags.isNotEmpty()) audioDao.findAllByTagIdIn(tags.map { it.id }) else emptyList() } } / * Copyright (c) 2023. yo-saito. All Rights Reserved. / package net.piedpiper.bremer.service import net.piedpiper.bremer.dao. import net.piedpiper.bremer.entity.AudioEntity import net.piedpiper.bremer.entity.AudioPlayHistoryEntity import net.piedpiper.bremer.exception.NotFoundException import net.piedpiper.bremer.model.api.AudioListResponse import net.piedpiper.bremer.model.api.AudioRequest import org.springframework.beans.factory.annotation.Qualifier import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.io.File import java.time.LocalDateTime import java.time.ZoneId @Service("bremer.service.AudioService") class AudioService( @Qualifier("bremer.dao.AudioDao") private val audioDao: AudioDao, @Qualifier("bremer.dao.ArtistDao") private val artistDao: ArtistDao, @Qualifier("bremer.dao.AlbumDao") private val albumDao: AlbumDao, @Qualifier("bremer.dao.AudioPlayHistoryDao") private val audioPlayHistoryDao: AudioPlayHistoryDao, @Qualifier("bremer.dao.TagDao") private val tagDao: TagDao ) { /** 音楽ファイル取得 / @Transactional fun getAudioFile(slug: String): File { val audio = audioDao.findOneBySlug(slug) ?: throw NotFoundException() val file = File(audio.path) if (!file.exists()) { throw NotFoundException() } audioPlayHistoryDao.insertOrUpdateOne( AudioPlayHistoryEntity( audioId = audio.id, lastPlayedAt = LocalDateTime.now(ZoneId.of("Asia/Tokyo")) ) ) return file } /* キーワード検索 / @Transactional fun getByKeywords( audioNameLike: String?, artistNameLike: String?, albumNameLike: String?, tagNameLike: String?, pageSize: Int ): AudioListResponse { val set = mutableSetOf<AudioEntity>() if (audioNameLike?.isNotEmpty() == true) { set.addAll(audioDao.findAllByNameLikeLimit(audioNameLike, pageSize)) } if (artistNameLike?.isNotEmpty() == true && set.size <= pageSize) { set.addAll(findAllByArtistNameLikeLimit(artistNameLike, pageSize)) } if (albumNameLike?.isNotEmpty() == true && set.size <= pageSize) { set.addAll(findAllByAlbumNameLikeLimit(albumNameLike, pageSize)) } if (tagNameLike?.isNotEmpty() == true && set.size <= pageSize) { set.addAll(findAllByTagNameLikeLimit(tagNameLike, pageSize)) } return AudioListResponse( set.sortedWith(compareBy({ it.albumId }, { it.sequence })) .take(pageSize) .toList() ) } /* 最近再生した曲一覧を取得 */ @Transactional fun getLeastRecentlyAccessedAudio(pageSize: Int): AudioListResponse { val historyMap = audioPlayHistoryDao.findAllOrderLastPlayedAtDescLimit(pageSize) .associateBy { it.audioId } return if (historyMap.isNotEmpty()) audioDao.findAllByIdIn(historyMap.keys.map { it }) .sortedByDescending { historyMap[it.id]?.lastPlayedAt ?: LocalDateTime.MIN }.let { AudioListResponse(it) } else AudioListResponse() } @Transactional fun update(slug: String, request: AudioRequest) = audioDao.findOneBySlugWithLock(slug) ?.let { request?.name?.apply { it.name = request.name audioDao.updateOne(it) } } ?: throw NotFoundException() private fun findAllByArtistNameLikeLimit( artistNameLike: String, limit: Int ): List<AudioEntity> { val artists = artistDao.findAllByNameLikeLimit(artistNameLike, limit) if (artists.isEmpty()) { return emptyList() } val albums = albumDao.findAllByArtistIdInLimit(artists.map { it.id }.distinct(), limit) if (albums.isEmpty()) { return emptyList() } return audioDao.findAllByAlbumIdIn(albums.map { it.id }.distinct()) } private fun findAllByAlbumNameLikeLimit(albumNameLike: String, limit: Int): List<AudioEntity> { val albums = albumDao.findAllByNameLikeLimit(albumNameLike, limit) return if (albums.isNotEmpty()) audioDao .findAllByAlbumIdIn(albums.map { it.id }) else emptyList() } private fun findAllByTagNameLikeLimit(tagNameLike: String, limit: Int): List<AudioEntity> { val tags = tagDao.findAllByNameLikeLimit(tagNameLike, limit) return if (tags.isNotEmpty()) audioDao.findAllByTagIdIn(tags.map { it.id }) else emptyList() } }

Ignore Space Show notes View

src/main/kotlin/service/AudioService.kt

package net.piedpiper.bremer.service

import net.piedpiper.bremer.dao.*
import net.piedpiper.bremer.entity.AudioEntity
import net.piedpiper.bremer.entity.AudioPlayHistoryEntity
import net.piedpiper.bremer.exception.NotFoundException
import net.piedpiper.bremer.model.api.AudioListResponse
import net.piedpiper.bremer.model.api.AudioRequest
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
import java.io.File
import java.time.LocalDateTime
import java.time.ZoneId

@Service("bremer.service.AudioService")
class AudioService(
    @Qualifier("bremer.dao.AudioDao")
    private val audioDao: AudioDao,
    @Qualifier("bremer.dao.ArtistDao")
    private val artistDao: ArtistDao,
    @Qualifier("bremer.dao.AlbumDao")
    private val albumDao: AlbumDao,
    @Qualifier("bremer.dao.AudioPlayHistoryDao")
    private val audioPlayHistoryDao: AudioPlayHistoryDao,
    @Qualifier("bremer.dao.TagDao")
    private val tagDao: TagDao
) {

/** 音楽ファイル取得 */
    @Transactional
    fun getAudioFile(slug: String): File {
        val audio = audioDao.findOneBySlug(slug) ?: throw NotFoundException()
        val file = File(audio.path)
        if (!file.exists()) {
            throw NotFoundException()
        }
        audioPlayHistoryDao.insertOrUpdateOne(
            AudioPlayHistoryEntity(
                audioId = audio.id,
                lastPlayedAt = LocalDateTime.now(ZoneId.of("Asia/Tokyo"))
            )
        )
        return file
    }

/** キーワード検索 */
    @Transactional
    fun getByKeywords(
        audioNameLike: String?,
        artistNameLike: String?,
        albumNameLike: String?,
        tagNameLike: String?,
        pageSize: Int
    ): AudioListResponse {
        val set = mutableSetOf<AudioEntity>()
        if (audioNameLike?.isNotEmpty() == true) {
            set.addAll(audioDao.findAllByNameLikeLimit(audioNameLike, pageSize))
        }
        if (artistNameLike?.isNotEmpty() == true && set.size <= pageSize) {
            set.addAll(findAllByArtistNameLikeLimit(artistNameLike, pageSize))
        }
        if (albumNameLike?.isNotEmpty() == true && set.size <= pageSize) {
            set.addAll(findAllByAlbumNameLikeLimit(albumNameLike, pageSize))
        }
        if (tagNameLike?.isNotEmpty() == true && set.size <= pageSize) {
            set.addAll(findAllByTagNameLikeLimit(tagNameLike, pageSize))
        }
        return AudioListResponse(
            set.sortedWith(compareBy({ it.albumId }, { it.sequence }))
                .take(pageSize)
                .toList()
        )
    }

/** 最近再生した曲一覧を取得 */
    @Transactional
    fun getLeastRecentlyAccessedAudio(pageSize: Int): AudioListResponse {
        val historyMap = audioPlayHistoryDao.findAllOrderLastPlayedAtDescLimit(pageSize)
            .associateBy { it.audioId }
        return if (historyMap.isNotEmpty())
            audioDao.findAllByIdIn(historyMap.keys.map { it })
                .sortedByDescending {
                    historyMap[it.id]?.lastPlayedAt ?: LocalDateTime.MIN
                }.let {
                    AudioListResponse(it)
                }
        else AudioListResponse()
    }

@Transactional
    fun update(slug: String, request: AudioRequest) = audioDao.findOneBySlugWithLock(slug)
        ?.let {
            request.name?.apply {
                it.name = request.name
                audioDao.updateOne(it)
            }
            albumDao.findOneByIdWithLock(it.albumId)?.let { album ->
                request.album?.apply {
                    album.name = request.album
                    albumDao.updateOne(album)
                }
                request.artist?.apply {
                    artistDao.findOneByIdWithLock(album.artistId)?.let { artist ->
                        artist.name = request.artist
                        artistDao.updateOne(artist)
                    }
                }
            }
        } ?: throw NotFoundException()

private fun findAllByArtistNameLikeLimit(
        artistNameLike: String,
        limit: Int
    ): List<AudioEntity> {
        val artists = artistDao.findAllByNameLikeLimit(artistNameLike, limit)
        if (artists.isEmpty()) {
            return emptyList()
        }
        val albums = albumDao.findAllByArtistIdInLimit(artists.map { it.id }.distinct(), limit)
        if (albums.isEmpty()) {
            return emptyList()
        }
        return audioDao.findAllByAlbumIdIn(albums.map { it.id }.distinct())
    }

private fun findAllByAlbumNameLikeLimit(albumNameLike: String, limit: Int): List<AudioEntity> {
        val albums = albumDao.findAllByNameLikeLimit(albumNameLike, limit)
        return if (albums.isNotEmpty()) audioDao
            .findAllByAlbumIdIn(albums.map { it.id }) else emptyList()
    }

private fun findAllByTagNameLikeLimit(tagNameLike: String, limit: Int): List<AudioEntity> {
        val tags = tagDao.findAllByNameLikeLimit(tagNameLike, limit)
        return if (tags.isNotEmpty()) audioDao.findAllByTagIdIn(tags.map { it.id }) else emptyList()
    }
}

package net.piedpiper.bremer.service

@Transactional
    fun update(slug: String, request: AudioRequest)
        = audioDao.findOneBySlugWithLock(slug)
        ?.let {
            request?.name?.apply {
                it.name = request.name
                audioDao.updateOne(it)
            }
        } ?: throw NotFoundException()

Show line notes below