refactor: MastodonAPIをRelationshipServiceでの操作に置き換え

This commit is contained in:
usbharu 2023-12-10 15:13:13 +09:00
parent b5e2981095
commit 0f65f242b6
2 changed files with 56 additions and 85 deletions

View File

@ -28,7 +28,7 @@ class MastodonAccountApiController(
): ResponseEntity<Relationship> { ): ResponseEntity<Relationship> {
val principal = SecurityContextHolder.getContext().getAuthentication().principal as Jwt val principal = SecurityContextHolder.getContext().getAuthentication().principal as Jwt
return ResponseEntity.ok(accountApiService.follow(principal.getClaim<String>("uid").toLong(), id.toLong())) return ResponseEntity.ok(accountApiService.follow2(principal.getClaim<String>("uid").toLong(), id.toLong()))
} }
override suspend fun apiV1AccountsIdGet(id: String): ResponseEntity<Account> = override suspend fun apiV1AccountsIdGet(id: String): ResponseEntity<Account> =

View File

@ -1,11 +1,8 @@
package dev.usbharu.hideout.mastodon.service.account package dev.usbharu.hideout.mastodon.service.account
import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.application.external.Transaction
import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
import dev.usbharu.hideout.core.domain.model.block.BlockRepository import dev.usbharu.hideout.core.service.relationship.RelationshipService
import dev.usbharu.hideout.core.domain.model.user.UserRepository
import dev.usbharu.hideout.core.query.FollowerQueryService
import dev.usbharu.hideout.core.service.block.BlockService
import dev.usbharu.hideout.core.service.user.UserCreateDto import dev.usbharu.hideout.core.service.user.UserCreateDto
import dev.usbharu.hideout.core.service.user.UserService import dev.usbharu.hideout.core.service.user.UserService
import dev.usbharu.hideout.domain.mastodon.model.generated.* import dev.usbharu.hideout.domain.mastodon.model.generated.*
@ -32,7 +29,7 @@ interface AccountApiService {
suspend fun verifyCredentials(userid: Long): CredentialAccount suspend fun verifyCredentials(userid: Long): CredentialAccount
suspend fun registerAccount(userCreateDto: UserCreateDto): Unit suspend fun registerAccount(userCreateDto: UserCreateDto): Unit
suspend fun follow(userid: Long, followeeId: Long): Relationship suspend fun follow2(loginUser: Long, followTargetUserId: Long): Relationship
suspend fun account(id: Long): Account suspend fun account(id: Long): Account
suspend fun relationships(userid: Long, id: List<Long>, withSuspended: Boolean): List<Relationship> suspend fun relationships(userid: Long, id: List<Long>, withSuspended: Boolean): List<Relationship>
@ -51,11 +48,9 @@ class AccountApiServiceImpl(
private val accountService: AccountService, private val accountService: AccountService,
private val transaction: Transaction, private val transaction: Transaction,
private val userService: UserService, private val userService: UserService,
private val followerQueryService: FollowerQueryService,
private val userRepository: UserRepository,
private val statusQueryService: StatusQueryService, private val statusQueryService: StatusQueryService,
private val blockService: BlockService, private val relationshipService: RelationshipService,
private val blockRepository: BlockRepository private val relationshipRepository: RelationshipRepository
) : ) :
AccountApiService { AccountApiService {
override suspend fun accountsStatuses( override suspend fun accountsStatuses(
@ -75,7 +70,7 @@ class AccountApiServiceImpl(
false false
} else { } else {
transaction.transaction { transaction.transaction {
followerQueryService.alreadyFollow(userid, loginUser) isFollowing(loginUser, userid)
} }
} }
@ -105,34 +100,10 @@ class AccountApiServiceImpl(
userService.createLocalUser(UserCreateDto(userCreateDto.name, userCreateDto.name, "", userCreateDto.password)) userService.createLocalUser(UserCreateDto(userCreateDto.name, userCreateDto.name, "", userCreateDto.password))
} }
override suspend fun follow(userid: Long, followeeId: Long): Relationship = transaction.transaction { override suspend fun follow2(loginUser: Long, followTargetUserId: Long): Relationship {
val alreadyFollow = followerQueryService.alreadyFollow(followeeId, userid) relationshipService.followRequest(loginUser, followTargetUserId)
val followRequest = if (alreadyFollow) { return fetchRelationship(loginUser, followTargetUserId)
true
} else {
userService.followRequest(followeeId, userid)
}
val alreadyFollow1 = followerQueryService.alreadyFollow(userid, followeeId)
val followRequestsById = userRepository.findFollowRequestsById(followeeId, userid)
return@transaction Relationship(
followeeId.toString(),
followRequest,
true,
false,
alreadyFollow1,
false,
false,
false,
false,
followRequestsById,
false,
false,
""
)
} }
override suspend fun account(id: Long): Account = transaction.transaction { override suspend fun account(id: Long): Account = transaction.transaction {
@ -150,57 +121,14 @@ class AccountApiServiceImpl(
val subList = id.subList(0, min(id.size, 20)) val subList = id.subList(0, min(id.size, 20))
return@transaction subList.map { return@transaction subList.map {
val alreadyFollow = followerQueryService.alreadyFollow(userid, it) fetchRelationship(userid, it)
val followed = followerQueryService.alreadyFollow(it, userid)
val requested = userRepository.findFollowRequestsById(it, userid)
Relationship(
id = it.toString(),
following = alreadyFollow,
showingReblogs = true,
notifying = false,
followedBy = followed,
blocking = false,
blockedBy = false,
muting = false,
mutingNotifications = false,
requested = requested,
domainBlocking = false,
endorsed = false,
note = ""
)
} }
} }
override suspend fun block(userid: Long, target: Long): Relationship = transaction.transaction { override suspend fun block(userid: Long, target: Long): Relationship = transaction.transaction {
blockService.block(userid, target) relationshipService.block(userid, target)
val blocked = try { fetchRelationship(userid, target)
blockRepository.findByUserIdAndTarget(target, userid)
true
} catch (e: FailedToGetResourcesException) {
false
}
val requested = userRepository.findFollowRequestsById(target, userid)
Relationship(
target.toString(),
false,
true,
false,
false,
true,
blocked,
false,
false,
requested,
false,
false,
""
)
} }
private fun from(account: Account): CredentialAccount { private fun from(account: Account): CredentialAccount {
@ -241,6 +169,49 @@ class AccountApiServiceImpl(
) )
} }
private suspend fun fetchRelationship(userid: Long, targetId: Long): Relationship {
val relationship = relationshipRepository.findByUserIdAndTargetUserId(userid, targetId)
?: dev.usbharu.hideout.core.domain.model.relationship.Relationship(
userId = userid,
targetUserId = targetId,
following = false,
blocking = false,
muting = false,
followRequest = false,
ignoreFollowRequestFromTarget = false
)
val inverseRelationship = relationshipRepository.findByUserIdAndTargetUserId(targetId, userid)
?: dev.usbharu.hideout.core.domain.model.relationship.Relationship(
userId = targetId,
targetUserId = userid,
following = false,
blocking = false,
muting = false,
followRequest = false,
ignoreFollowRequestFromTarget = false
)
return Relationship(
id = targetId.toString(),
following = relationship.following,
showingReblogs = true,
notifying = false,
followedBy = inverseRelationship.following,
blocking = relationship.blocking,
blockedBy = inverseRelationship.blocking,
muting = relationship.muting,
mutingNotifications = relationship.muting,
requested = relationship.followRequest,
domainBlocking = false,
endorsed = false,
note = ""
)
}
private suspend fun isFollowing(userid: Long, target: Long): Boolean =
relationshipRepository.findByUserIdAndTargetUserId(userid, target)?.following ?: false
companion object { companion object {
private val logger = LoggerFactory.getLogger(AccountApiServiceImpl::class.java) private val logger = LoggerFactory.getLogger(AccountApiServiceImpl::class.java)
} }