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-01-29 20:17:15 +09:00
parent ee88e29770
commit 7141c7bc6a
5 changed files with 0 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotificationRepository.kt
View File

@ -8,17 +8,6 @@ interface MastodonNotificationRepository {
suspend fun deleteById(id: Long)
suspend fun findById(id: Long): MastodonNotification?
@Suppress("LongParameterList", "FunctionMaxLength")
suspend fun findByUserIdAndMaxIdAndMinIdAndSinceIdAndInTypesAndInSourceActorId(
loginUser: Long,
maxId: Long?,
minId: Long?,
sinceId: Long?,
limit: Int,
typesTmp: MutableList<NotificationType>,
accountId: List<Long>
): List<MastodonNotification>
suspend fun findByUserIdAndInTypesAndInSourceActorId(
loginUser: Long,
types: List<NotificationType>,

29
src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedrepository/ExposedMastodonNotificationRepository.kt
View File

@ -62,35 +62,6 @@ class ExposedMastodonNotificationRepository : MastodonNotificationRepository, Ab
MastodonNotifications.select { MastodonNotifications.id eq id }.singleOrNull()?.toMastodonNotification()
}
override suspend fun findByUserIdAndMaxIdAndMinIdAndSinceIdAndInTypesAndInSourceActorId(
loginUser: Long,
maxId: Long?,
minId: Long?,
sinceId: Long?,
limit: Int,
typesTmp: MutableList<NotificationType>,
accountId: List<Long>
): List<MastodonNotification> = query {
val query = MastodonNotifications.select {
MastodonNotifications.userId eq loginUser
}
if (maxId != null) {
query.andWhere { MastodonNotifications.id lessEq maxId }
}
if (minId != null) {
query.andWhere { MastodonNotifications.id greaterEq minId }
}
if (sinceId != null) {
query.andWhere { MastodonNotifications.id greaterEq sinceId }
}
val result = query
.limit(limit)
.orderBy(Timelines.createdAt, SortOrder.DESC)
return@query result.map { it.toMastodonNotification() }
}
override suspend fun findByUserIdAndInTypesAndInSourceActorId(
loginUser: Long,
types: List<NotificationType>,

31
src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt
View File

@ -28,37 +28,6 @@ class MongoMastodonNotificationRepositoryWrapper(
override suspend fun findById(id: Long): MastodonNotification? =
mongoMastodonNotificationRepository.findById(id).getOrNull()
override suspend fun findByUserIdAndMaxIdAndMinIdAndSinceIdAndInTypesAndInSourceActorId(
loginUser: Long,
maxId: Long?,
minId: Long?,
sinceId: Long?,
limit: Int,
typesTmp: MutableList<NotificationType>,
accountId: List<Long>
): List<MastodonNotification> {
val query = Query()
if (maxId != null) {
val criteria = Criteria.where("id").lte(maxId)
query.addCriteria(criteria)
}
if (minId != null) {
val criteria = Criteria.where("id").gte(minId)
query.addCriteria(criteria)
}
if (sinceId != null) {
val criteria = Criteria.where("id").gte(sinceId)
query.addCriteria(criteria)
}
query.limit(limit)
query.with(Sort.by(Sort.Direction.DESC, "createdAt"))
return mongoTemplate.find(query, MastodonNotification::class.java)
}
override suspend fun findByUserIdAndInTypesAndInSourceActorId(
loginUser: Long,
types: List<NotificationType>,

11
src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiService.kt
View File

@ -6,17 +6,6 @@ import dev.usbharu.hideout.domain.mastodon.model.generated.Notification
import dev.usbharu.hideout.mastodon.domain.model.NotificationType
interface NotificationApiService {
@Suppress("LongParameterList")
suspend fun notifications(
loginUser: Long,
maxId: Long?,
minId: Long?,
sinceId: Long?,
limit: Int,
types: List<NotificationType>,
excludeTypes: List<NotificationType>,
accountId: List<Long>
): List<Notification>
suspend fun notifications(
loginUser: Long,

47
src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt
View File

@ -19,53 +19,6 @@ class NotificationApiServiceImpl(
private val statusQueryService: StatusQueryService
) :
NotificationApiService {
override suspend fun notifications(
loginUser: Long,
maxId: Long?,
minId: Long?,
sinceId: Long?,
limit: Int,
types: List<NotificationType>,
excludeTypes: List<NotificationType>,
accountId: List<Long>
): List<Notification> = transaction.transaction {
val typesTmp = mutableListOf<NotificationType>()
typesTmp.addAll(types)
typesTmp.removeAll(excludeTypes)
val mastodonNotifications =
mastodonNotificationRepository.findByUserIdAndMaxIdAndMinIdAndSinceIdAndInTypesAndInSourceActorId(
loginUser,
maxId,
minId,
sinceId,
limit,
typesTmp,
accountId
)
val accounts = accountService.findByIds(
mastodonNotifications.map {
it.accountId
}
).associateBy { it.id.toLong() }
val statuses = statusQueryService.findByPostIds(mastodonNotifications.mapNotNull { it.statusId })
.associateBy { it.id.toLong() }
mastodonNotifications.map {
Notification(
id = it.id.toString(),
type = convertNotificationType(it.type),
createdAt = it.createdAt.toString(),
account = accounts.getValue(it.accountId),
status = statuses[it.statusId],
report = null,
relationshipSeveranceEvent = null
)
}
}
override suspend fun notifications(
loginUser: Long,