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

refactor: タイムラインの実装方式を変更

This commit is contained in:
usbharu 2024-07-06 16:41:47 +09:00
parent faee779cfb
commit a4a3f4c0c4
Signed by: usbharu
GPG Key ID: 6556747BF94EEBC8
15 changed files with 82 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt
View File

@ -22,6 +22,7 @@ import dev.usbharu.hideout.core.domain.model.actor.Actor
import dev.usbharu.hideout.core.domain.model.actor.ActorId
import dev.usbharu.hideout.core.domain.model.actor.Role
import dev.usbharu.hideout.core.domain.model.emoji.EmojiId
import dev.usbharu.hideout.core.domain.model.instance.InstanceId
import dev.usbharu.hideout.core.domain.model.media.MediaId
import dev.usbharu.hideout.core.domain.model.post.Post.Companion.Action.*
import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEventStorable
@ -32,6 +33,7 @@ import java.time.Instant
class Post(
val id: PostId,
actorId: ActorId,
val instanceId: InstanceId,
overview: PostOverview?,
content: PostContent,
val createdAt: Instant,
@ -48,6 +50,7 @@ class Post(
moveTo: PostId?,
) : DomainEventStorable() {
val actorId = actorId
get() {
if (deleted) {
@ -227,6 +230,7 @@ class Post(
return Post(
id = id,
actorId = actorId,
instanceId = instanceId,
overview = overview,
content = PostContent(this.content.text, this.content.content, emojis),
createdAt = createdAt,
@ -273,6 +277,7 @@ class Post(
fun create(
id: PostId,
actorId: ActorId,
instanceId: InstanceId,
overview: PostOverview? = null,
content: PostContent,
createdAt: Instant,
@ -301,6 +306,7 @@ class Post(
val post = Post(
id = id,
actorId = actorId,
instanceId = instanceId,
overview = overview,
content = content,
createdAt = createdAt,

10
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepository.kt
View File

@ -22,4 +22,14 @@ interface RelationshipRepository {
suspend fun save(relationship: Relationship): Relationship
suspend fun delete(relationship: Relationship)
suspend fun findByActorIdAndTargetId(actorId: ActorId, targetId: ActorId): Relationship?
suspend fun findByTargetId(targetId: ActorId, option: FindRelationshipOption? = null): List<Relationship>
}
data class FindRelationshipOption(
val follow: Boolean? = null,
val block: Boolean? = null,
val mute: Boolean? = null,
val followRequest: Boolean? = null,
val muteFollowRequest: Boolean? = null
)

2
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/TimelineRepository.kt
View File

@ -3,4 +3,6 @@ package dev.usbharu.hideout.core.domain.model.timeline
interface TimelineRepository {
suspend fun save(timeline: Timeline): Timeline
suspend fun delete(timeline: Timeline)
suspend fun findByIds(ids: List<TimelineId>): List<Timeline>
}

4
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelinebuilder/TimelineBuilder.kt
View File

@ -1,4 +0,0 @@
package dev.usbharu.hideout.core.domain.model.timelinebuilder
class TimelineBuilder(val id: TimelineBuilderId, val timelineBuilderName: TimelineBuilderName) {
}

4
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelinebuilder/TimelineBuilderId.kt
View File

@ -1,4 +0,0 @@
package dev.usbharu.hideout.core.domain.model.timelinebuilder
@JvmInline
value class TimelineBuilderId(val value: Long)

4
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelinebuilder/TimelineBuilderName.kt
View File

@ -1,4 +0,0 @@
package dev.usbharu.hideout.core.domain.model.timelinebuilder
@JvmInline
value class TimelineBuilderName(val value: String)

6
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelinebuilder/TimelineBuilderRepository.kt
View File

@ -1,6 +0,0 @@
package dev.usbharu.hideout.core.domain.model.timelinebuilder
interface TimelineBuilderRepository {
suspend fun save(timelineBuilder: TimelineBuilder): TimelineBuilder
suspend fun delete(timelineBuilder: TimelineBuilder)
}

10
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelinerelationship/TimelineRelationship.kt
View File

@ -1,10 +0,0 @@
package dev.usbharu.hideout.core.domain.model.timelinerelationship
import dev.usbharu.hideout.core.domain.model.actor.ActorId
import dev.usbharu.hideout.core.domain.model.instance.InstanceId
class TimelineRelationship(
val timelineRelationshipId: TimelineRelationshipId,
val actorId: ActorId?,
val instanceId: InstanceId?
)

4
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelinerelationship/TimelineRelationshipId.kt
View File

@ -1,4 +0,0 @@
package dev.usbharu.hideout.core.domain.model.timelinerelationship
@JvmInline
value class TimelineRelationshipId(val value: Long)

6
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelinerelationship/TimelineRelationshipRepository.kt
View File

@ -1,6 +0,0 @@
package dev.usbharu.hideout.core.domain.model.timelinerelationship
interface TimelineRelationshipRepository {
suspend fun save(timelineRelationship: TimelineRelationship): TimelineRelationship
suspend fun delete(timelineRelationship: TimelineRelationship)
}

7
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/timeline/TimelineStore.kt vendored Normal file
View File

@ -0,0 +1,7 @@
package dev.usbharu.hideout.core.external.timeline
import dev.usbharu.hideout.core.domain.model.post.Post
interface TimelineStore {
suspend fun newPost(post: Post)
}

28
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedRelationshipRepository.kt
View File

@ -17,6 +17,7 @@
package dev.usbharu.hideout.core.infrastructure.exposedrepository
import dev.usbharu.hideout.core.domain.model.actor.ActorId
import dev.usbharu.hideout.core.domain.model.relationship.FindRelationshipOption
import dev.usbharu.hideout.core.domain.model.relationship.Relationship
import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEventPublisher
@ -66,11 +67,38 @@ class ExposedRelationshipRepository(override val domainEventPublisher: DomainEve
}.singleOrNull()?.toRelationships()
}
override suspend fun findByTargetId(targetId: ActorId, option: FindRelationshipOption?): List<Relationship> {
val query = Relationships.selectAll().where {
Relationships.targetActorId eq targetId.id
}
option.apply(query)
return query.map(ResultRow::toRelationships)
}
companion object {
private val logger = LoggerFactory.getLogger(ExposedRelationshipRepository::class.java)
}
}
fun FindRelationshipOption?.apply(query: Query) {
if (this?.follow != null) {
query.andWhere { Relationships.following eq this@apply.follow }
}
if (this?.mute != null) {
query.andWhere { Relationships.muting eq this@apply.mute }
}
if (this?.block != null) {
query.andWhere { Relationships.blocking eq this@apply.block }
}
if (this?.followRequest != null) {
query.andWhere { Relationships.followRequesting eq this@apply.followRequest }
}
if (this?.muteFollowRequest != null) {
query.andWhere { Relationships.mutingFollowRequest eq this@apply.muteFollowRequest }
}
}
fun ResultRow.toRelationships(): Relationship = Relationship(
actorId = ActorId(this[Relationships.actorId]),
targetActorId = ActorId(this[Relationships.targetActorId]),

1
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/factory/PostFactoryImpl.kt
View File

@ -52,6 +52,7 @@ class PostFactoryImpl(
return Post.create(
id = PostId(id),
actorId = actor.id,
instanceId = actor.instance,
overview = overview,
content = postContentFactoryImpl.create(content),
createdAt = Instant.now(),

19
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/AbstractTimelineStore.kt Normal file
View File

@ -0,0 +1,19 @@
package dev.usbharu.hideout.core.infrastructure.timeline
import dev.usbharu.hideout.core.domain.model.post.Post
import dev.usbharu.hideout.core.domain.model.relationship.FindRelationshipOption
import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
import dev.usbharu.hideout.core.domain.model.timeline.TimelineRepository
import dev.usbharu.hideout.core.external.timeline.TimelineStore
abstract class AbstractTimelineStore(
private val timelineRepository: TimelineRepository,
private val relationshipRepository: RelationshipRepository
) :
TimelineStore {
override suspend fun newPost(post: Post) {
relationshipRepository.findByTargetId(post.actorId, FindRelationshipOption(follow = true, mute = false))
}
}

10
hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/PostTest.kt
View File

@ -312,6 +312,7 @@ class PostTest {
Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
overview = null,
content = PostContent.empty,
createdAt = Instant.now(),
@ -327,7 +328,6 @@ class PostTest {
hide = false,
moveTo = null,
actor = actor
)
}
}
@ -339,6 +339,7 @@ class PostTest {
val post = Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
overview = null,
content = PostContent.empty,
createdAt = Instant.now(),
@ -366,6 +367,7 @@ class PostTest {
val post = Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
overview = null,
content = PostContent.empty,
createdAt = Instant.now(),
@ -396,6 +398,7 @@ class PostTest {
Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
overview = null,
content = PostContent.empty,
createdAt = Instant.now(),
@ -425,6 +428,7 @@ class PostTest {
Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
content = PostContent.empty,
createdAt = Instant.now(),
visibility = Visibility.PUBLIC,
@ -447,6 +451,7 @@ class PostTest {
val post = Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
content = PostContent("aaa", "aaa", emojiIds),
createdAt = Instant.now(),
visibility = Visibility.PUBLIC,
@ -472,6 +477,7 @@ class PostTest {
val post = Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
content = PostContent("aaa", "aaa", emojiIds),
createdAt = Instant.now(),
visibility = Visibility.PUBLIC,
@ -510,6 +516,7 @@ class PostTest {
val post = Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
content = PostContent("aaa", "aaa", emojiIds),
createdAt = Instant.now(),
visibility = Visibility.PUBLIC,
@ -536,6 +543,7 @@ class PostTest {
val post = Post.create(
id = PostId(1),
actorId = actor.id,
instanceId = actor.instance,
content = PostContent("aaa", "aaa", emojiIds),
createdAt = Instant.now(),
visibility = Visibility.PUBLIC,