usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Uri型のColumnTypeを作成して型安全性を向上

This commit is contained in:
usbharu 2024-09-11 08:09:01 +09:00
parent 498d6d73da
commit 34a36b5ed5
Signed by: usbharu
GPG Key ID: 6556747BF94EEBC8
4 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UriColumnType.kt Normal file
View File

@ -0,0 +1,22 @@
package dev.usbharu.hideout.core.infrastructure.exposed
import org.jetbrains.exposed.sql.Column
import org.jetbrains.exposed.sql.ColumnType
import org.jetbrains.exposed.sql.Table
import org.jetbrains.exposed.sql.vendors.currentDialect
import java.net.URI
class UriColumnType(val colLength: Int) : ColumnType<URI>() {
override fun sqlType(): String = currentDialect.dataTypeProvider.varcharType(colLength)
override fun valueFromDB(value: Any): URI? = when (value) {
is URI -> value
is String -> URI(value)
is CharSequence -> URI(value.toString())
else -> error("Unexpected value of type String: $value of ${value::class.qualifiedName}")
}
override fun notNullValueToDB(value: URI): Any = value.toString()
}
fun Table.uri(name: String, colLength: Int): Column<URI> = registerColumn(name, UriColumnType(colLength))

2
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt
View File

@ -92,7 +92,7 @@ class ExposedUserTimelineQueryService : UserTimelineQueryService, AbstractReposi
screenName = it[Actors.screenName],
url = URI.create(it[Actors.url]),
locked = it[Actors.locked],
icon = it.getOrNull(iconMedia[Media.url])?.let { URI.create(it) }
icon = it.getOrNull(iconMedia[Media.url])
),
overview = it[authorizedQuery[Posts.overview]],
text = it[authorizedQuery[Posts.text]],

26
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedMediaRepository.kt
View File

@ -18,12 +18,12 @@ package dev.usbharu.hideout.core.infrastructure.exposedrepository
import dev.usbharu.hideout.core.domain.model.actor.ActorId
import dev.usbharu.hideout.core.domain.model.media.*
import dev.usbharu.hideout.core.infrastructure.exposed.uri
import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.stereotype.Repository
import java.net.URI
import dev.usbharu.hideout.core.domain.model.media.Media as EntityMedia
@Repository
@ -35,9 +35,9 @@ class ExposedMediaRepository : MediaRepository, AbstractRepository() {
Media.upsert {
it[id] = media.id.id
it[name] = media.name.name
it[url] = media.url.toString()
it[remoteUrl] = media.remoteUrl?.toString()
it[thumbnailUrl] = media.thumbnailUrl?.toString()
it[url] = media.url
it[remoteUrl] = media.remoteUrl
it[thumbnailUrl] = media.thumbnailUrl
it[type] = media.type.name
it[blurhash] = media.blurHash?.hash
it[mimeType] = media.mimeType.type + "/" + media.mimeType.subtype
@ -83,9 +83,9 @@ fun ResultRow.toMedia(): EntityMedia {
return EntityMedia(
id = MediaId(this[Media.id]),
name = MediaName(this[Media.name]),
url = URI.create(this[Media.url]),
remoteUrl = this[Media.remoteUrl]?.let { URI.create(it) },
thumbnailUrl = this[Media.thumbnailUrl]?.let { URI.create(it) },
url = this[Media.url],
remoteUrl = this[Media.remoteUrl],
thumbnailUrl = this[Media.thumbnailUrl],
type = fileType,
blurHash = this[Media.blurhash]?.let { MediaBlurHash(it) },
mimeType = MimeType(mimeType.substringBefore("/"), mimeType.substringAfter("/"), fileType),
@ -100,9 +100,9 @@ fun ResultRow.toMediaOrNull(): EntityMedia? {
return EntityMedia(
id = MediaId(this.getOrNull(Media.id) ?: return null),
name = MediaName(this.getOrNull(Media.name) ?: return null),
url = URI.create(this.getOrNull(Media.url) ?: return null),
remoteUrl = this[Media.remoteUrl]?.let { URI.create(it) },
thumbnailUrl = this[Media.thumbnailUrl]?.let { URI.create(it) },
url = this.getOrNull(Media.url) ?: return null,
remoteUrl = this[Media.remoteUrl],
thumbnailUrl = this[Media.thumbnailUrl],
type = FileType.valueOf(this[Media.type]),
blurHash = this[Media.blurhash]?.let { MediaBlurHash(it) },
mimeType = MimeType(mimeType.substringBefore("/"), mimeType.substringAfter("/"), fileType),
@ -114,9 +114,9 @@ fun ResultRow.toMediaOrNull(): EntityMedia? {
object Media : Table("media") {
val id = long("id")
val name = varchar("name", 255)
val url = varchar("url", 255).uniqueIndex()
val remoteUrl = varchar("remote_url", 255).uniqueIndex().nullable()
val thumbnailUrl = varchar("thumbnail_url", 255).uniqueIndex().nullable()
val url = uri("url", 255).uniqueIndex()
val remoteUrl = uri("remote_url", 255).uniqueIndex().nullable()
val thumbnailUrl = uri("thumbnail_url", 255).uniqueIndex().nullable()
val type = varchar("type", 100)
val blurhash = varchar("blurhash", 255).nullable()
val mimeType = varchar("mime_type", 255)

4
hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedMediaRepositoryTest.kt
View File

@ -72,7 +72,7 @@ class ExposedMediaRepositoryTest : AbstractRepositoryTest(Media) {
.row(0)
.isEqualTo(Media.id, 1)
.isEqualTo(Media.name, "name")
.isEqualTo(Media.url, "https://www.example.com")
.value(Media.url).isEqualTo("https://www.example.com")
.isEqualTo(Media.remoteUrl, null)
.isEqualTo(Media.thumbnailUrl, null)
.isEqualTo(Media.type, "Audio")
@ -165,7 +165,7 @@ class ExposedMediaRepositoryTest : AbstractRepositoryTest(Media) {
.row(0)
.isEqualTo(Media.id, 1)
.isEqualTo(Media.name, "name")
.isEqualTo(Media.url, "https://www.example.com")
.value(Media.url).isEqualTo("https://www.example.com")
.isEqualTo(Media.remoteUrl, null)
.isEqualTo(Media.thumbnailUrl, null)
.isEqualTo(Media.type, "Audio")