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

feat: ページングに対応

This commit is contained in:
usbharu 2024-07-30 10:50:51 +09:00
parent fcd6ebc518
commit d9bd21661c
Signed by: usbharu
GPG Key ID: 6556747BF94EEBC8
5 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,9 @@
package dev.usbharu.hideout.core.external.timeline
import dev.usbharu.hideout.core.domain.model.post.Post
import dev.usbharu.hideout.core.domain.model.post.PostId
import dev.usbharu.hideout.core.domain.model.support.page.Page
import dev.usbharu.hideout.core.domain.model.support.page.PaginationList
import dev.usbharu.hideout.core.domain.model.support.timelineobjectdetail.TimelineObjectDetail
import dev.usbharu.hideout.core.domain.model.timeline.Timeline
import dev.usbharu.hideout.core.domain.model.timelinerelationship.TimelineRelationship
@ -21,5 +23,5 @@ interface TimelineStore {
timeline: Timeline,
option: ReadTimelineOption? = null,
page: Page? = null
): List<TimelineObjectDetail>
): PaginationList<TimelineObjectDetail, PostId>
}

6
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoInternalTimelineObjectRepository.kt
View File

@ -65,7 +65,7 @@ class MongoInternalTimelineObjectRepository(
timelineId: TimelineId,
internalTimelineObjectOption: InternalTimelineObjectOption?,
page: Page?
): PaginationList<TimelineObject, TimelineObjectId> {
): PaginationList<TimelineObject, PostId> {
val query = Query()
if (page?.minId != null) {
@ -85,8 +85,8 @@ class MongoInternalTimelineObjectRepository(
return PaginationList(
timelineObjects,
timelineObjects.lastOrNull()?.id,
timelineObjects.firstOrNull()?.id
timelineObjects.lastOrNull()?.postId,
timelineObjects.firstOrNull()?.postId
)
}
}

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

@ -8,6 +8,7 @@ import dev.usbharu.hideout.core.domain.model.post.Post
import dev.usbharu.hideout.core.domain.model.post.PostId
import dev.usbharu.hideout.core.domain.model.post.Visibility
import dev.usbharu.hideout.core.domain.model.support.page.Page
import dev.usbharu.hideout.core.domain.model.support.page.PaginationList
import dev.usbharu.hideout.core.domain.model.support.timelineobjectdetail.TimelineObjectDetail
import dev.usbharu.hideout.core.domain.model.timeline.Timeline
import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
@ -110,7 +111,7 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
timelineId: TimelineId,
readTimelineOption: ReadTimelineOption?,
page: Page?
): List<TimelineObject>
): PaginationList<TimelineObject, PostId>
override suspend fun updatePost(post: Post) {
val timelineObjectByPostId = getTimelineObjectByPostId(post.id)
@ -205,7 +206,7 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
timeline: Timeline,
option: ReadTimelineOption?,
page: Page?
): List<TimelineObjectDetail> {
): PaginationList<TimelineObjectDetail, PostId> {
val timelineObjectList = getTimelineObject(timeline.id, option, page)
val lastUpdatedAt = timelineObjectList.minBy { it.lastUpdatedAt }.lastUpdatedAt
@ -231,7 +232,8 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
post.id to applyFilters(post, newerFilters)
}
return timelineObjectList.mapNotNull<TimelineObject, TimelineObjectDetail> {
return PaginationList(
timelineObjectList.mapNotNull<TimelineObject, TimelineObjectDetail> {
val timelineUserDetail = userDetails[it.userDetailId] ?: return@mapNotNull null
val actor = actors[it.postActorId] ?: return@mapNotNull null
val post = postMap[it.postId] ?: return@mapNotNull null
@ -255,7 +257,10 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
)
}
)
}
},
timelineObjectList.lastOrNull()?.postId,
timelineObjectList.firstOrNull()?.postId
)
}
abstract suspend fun getActors(actorIds: List<ActorId>): Map<ActorId, Actor>

3
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/DefaultTimelineStore.kt
View File

@ -13,6 +13,7 @@ import dev.usbharu.hideout.core.domain.model.post.PostId
import dev.usbharu.hideout.core.domain.model.post.PostRepository
import dev.usbharu.hideout.core.domain.model.post.Visibility
import dev.usbharu.hideout.core.domain.model.support.page.Page
import dev.usbharu.hideout.core.domain.model.support.page.PaginationList
import dev.usbharu.hideout.core.domain.model.timeline.Timeline
import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
import dev.usbharu.hideout.core.domain.model.timeline.TimelineRepository
@ -106,7 +107,7 @@ open class DefaultTimelineStore(
timelineId: TimelineId,
readTimelineOption: ReadTimelineOption?,
page: Page?
): List<TimelineObject> {
): PaginationList<TimelineObject, PostId> {
return internalTimelineObjectRepository.findByTimelineId(
timelineId,
InternalTimelineObjectOption(

3
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/InternalTimelineObjectRepository.kt
View File

@ -6,7 +6,6 @@ import dev.usbharu.hideout.core.domain.model.support.page.Page
import dev.usbharu.hideout.core.domain.model.support.page.PaginationList
import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
import dev.usbharu.hideout.core.domain.model.timelineobject.TimelineObject
import dev.usbharu.hideout.core.domain.model.timelineobject.TimelineObjectId
interface InternalTimelineObjectRepository {
suspend fun save(timelineObject: TimelineObject): TimelineObject
@ -24,7 +23,7 @@ interface InternalTimelineObjectRepository {
timelineId: TimelineId,
internalTimelineObjectOption: InternalTimelineObjectOption? = null,
page: Page? = null
): PaginationList<TimelineObject, TimelineObjectId>
): PaginationList<TimelineObject, PostId>
}
data class InternalTimelineObjectOption(