-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #366 from skaengus2012/feature/issue344_data
Add required data features to the Schedule screen
- Loading branch information
Showing
31 changed files
with
597 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...ain/kotlin/com/nlab/reminder/core/data/repository/impl/DefaultScheduleDetailRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * Copyright (C) 2025 The N's lab Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.nlab.reminder.core.data.repository.impl | ||
|
|
||
| import com.nlab.reminder.core.data.model.Link | ||
| import com.nlab.reminder.core.data.model.LinkMetadata | ||
| import com.nlab.reminder.core.data.model.Schedule | ||
| import com.nlab.reminder.core.data.model.ScheduleDetail | ||
| import com.nlab.reminder.core.data.model.ScheduleId | ||
| import com.nlab.reminder.core.data.model.Tag | ||
| import com.nlab.reminder.core.data.repository.GetScheduleQuery | ||
| import com.nlab.reminder.core.data.repository.GetTagQuery | ||
| import com.nlab.reminder.core.data.repository.LinkMetadataRepository | ||
| import com.nlab.reminder.core.data.repository.ScheduleDetailRepository | ||
| import com.nlab.reminder.core.data.repository.ScheduleRepository | ||
| import com.nlab.reminder.core.data.repository.ScheduleTagListRepository | ||
| import com.nlab.reminder.core.data.repository.TagRepository | ||
| import com.nlab.reminder.core.kotlin.collections.toSet | ||
| import com.nlab.reminder.core.kotlin.collections.toSetNotNull | ||
| import com.nlab.reminder.core.kotlinx.coroutine.flow.combine | ||
| import com.nlab.reminder.core.kotlinx.coroutine.flow.flatMapLatest | ||
| import com.nlab.reminder.core.kotlinx.coroutine.flow.map | ||
| import kotlinx.coroutines.flow.Flow | ||
|
|
||
| /** | ||
| * @author Thalys | ||
| */ | ||
| class DefaultScheduleDetailRepository( | ||
| private val scheduleRepository: ScheduleRepository, | ||
| private val tagRepository: TagRepository, | ||
| private val scheduleTagListRepository: ScheduleTagListRepository, | ||
| private val linkMetadataRepository: LinkMetadataRepository | ||
| ) : ScheduleDetailRepository { | ||
| override suspend fun getScheduleDetailsAsStream( | ||
| query: GetScheduleQuery | ||
| ): Flow<Set<ScheduleDetail>> = scheduleRepository | ||
| .getSchedulesAsStream(query) | ||
| .flatMapLatest(::createScheduleDetailsFlow) | ||
|
|
||
| private fun createScheduleDetailsFlow(schedules: Set<Schedule>): Flow<Set<ScheduleDetail>> { | ||
| val scheduleIds = mutableSetOf<ScheduleId>() | ||
| val links = mutableSetOf<Link>() | ||
| schedules.forEach { schedule -> | ||
| schedule.id.let(scheduleIds::add) | ||
| schedule.content.link?.let(links::add) | ||
| } | ||
| return combine( | ||
| createScheduleIdsToTagListTableFlow(scheduleIds = scheduleIds), | ||
| linkMetadataRepository.getAsStream(links = links), | ||
| ) { scheduleIdToTagsTable, linkToMetadataTable -> | ||
| createScheduleDetails( | ||
| schedules = schedules, | ||
| scheduleIdToTagsTable = scheduleIdToTagsTable, | ||
| linkToMetadataTable = linkToMetadataTable | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun createScheduleIdsToTagListTableFlow( | ||
| scheduleIds: Set<ScheduleId>, | ||
| ): Flow<Map<ScheduleId, Set<Tag>>> = scheduleTagListRepository | ||
| .getScheduleTagListAsStream(scheduleIds) | ||
| .flatMapLatest { scheduleIdToTagIds -> | ||
| tagRepository | ||
| .getTagsAsStream(GetTagQuery.ByIds(tagIds = scheduleIdToTagIds.values.flatten().toSet())) | ||
| .map { tags -> | ||
| val idToTable = tags.associateBy { it.id } | ||
| scheduleIdToTagIds.mapValues { entry -> entry.value.toSetNotNull { idToTable[it] } } | ||
| } | ||
| } | ||
|
|
||
| private fun createScheduleDetails( | ||
| schedules: Set<Schedule>, | ||
| scheduleIdToTagsTable: Map<ScheduleId, Set<Tag>>, | ||
| linkToMetadataTable: Map<Link, LinkMetadata> | ||
| ): Set<ScheduleDetail> = schedules.toSet { schedule -> | ||
| ScheduleDetail( | ||
| schedule = schedule, | ||
| tags = scheduleIdToTagsTable[schedule.id] ?: emptySet(), | ||
| linkMetadata = linkToMetadataTable[schedule.content.link] | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...main/kotlin/com/nlab/reminder/core/data/repository/impl/LocalScheduleTagListRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Copyright (C) 2025 The N's lab Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.nlab.reminder.core.data.repository.impl | ||
|
|
||
| import com.nlab.reminder.core.data.model.ScheduleId | ||
| import com.nlab.reminder.core.data.model.TagId | ||
| import com.nlab.reminder.core.data.repository.ScheduleTagListRepository | ||
| import com.nlab.reminder.core.kotlin.NonNegativeLong | ||
| import com.nlab.reminder.core.kotlin.Result | ||
| import com.nlab.reminder.core.kotlin.catching | ||
| import com.nlab.reminder.core.kotlin.collections.toSet | ||
| import com.nlab.reminder.core.kotlin.toNonNegativeLong | ||
| import com.nlab.reminder.core.kotlinx.coroutine.flow.map | ||
| import com.nlab.reminder.core.local.database.dao.ScheduleTagListDAO | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.distinctUntilChanged | ||
|
|
||
| /** | ||
| * @author Thalys | ||
| */ | ||
| class LocalScheduleTagListRepository( | ||
| private val scheduleTagListDAO: ScheduleTagListDAO, | ||
| ) : ScheduleTagListRepository { | ||
| override fun getScheduleTagListAsStream(scheduleIds: Set<ScheduleId>): Flow<Map<ScheduleId, Set<TagId>>> = | ||
| scheduleTagListDAO | ||
| .findByScheduleIdsAsStream(scheduleIds.toSet(ScheduleId::rawId)) | ||
| .distinctUntilChanged() | ||
| .map { entities -> | ||
| entities | ||
| .groupBy(keySelector = { ScheduleId(it.scheduleId) }, valueTransform = { TagId(it.tagId) }) | ||
| .mapValues { (_, value) -> value.toSet() } | ||
| } | ||
|
|
||
| override suspend fun getTagUsageCount(tagId: TagId): Result<NonNegativeLong> = catching { | ||
| scheduleTagListDAO | ||
| .findTagUsageCount(tagId = tagId.rawId) | ||
| .toNonNegativeLong() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.