9 changed files with 20 additions and 185 deletions
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt
@ -2,7 +2,6 @@ package dev.usbharu.hideout.activitypub.interfaces.api.actor

 import dev.usbharu.hideout.activitypub.domain.model.Person
 import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
-import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.RestController
@ -10,11 +9,7 @@ import org.springframework.web.bind.annotation.RestController
@RestController
 class UserAPControllerImpl(private val apUserService: APUserService) : UserAPController {
    override suspend fun userAp(username: String): ResponseEntity<Person> {
-        val person = try {
-            apUserService.getPersonByName(username)
-        } catch (e: FailedToGetResourcesException) {
-            return ResponseEntity.notFound().build()
-        }
+        val person = apUserService.getPersonByName(username)
        person.context += listOf("https://www.w3.org/ns/activitystreams")
        return ResponseEntity(person, HttpStatus.OK)
    }
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxController.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxController.kt
@ -15,7 +15,7 @@ interface InboxController {
            "application/activity+json",
            "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""
        ],
-        method = [RequestMethod.POST]
+        method = [RequestMethod.GET, RequestMethod.POST]
    )
    suspend fun inbox(@RequestBody string: String): ResponseEntity<Unit>
 }
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxController.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxController.kt
@ -1,6 +1,7 @@
 package dev.usbharu.hideout.activitypub.interfaces.api.outbox

 import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestMethod
 import org.springframework.web.bind.annotation.RestController
@ -8,5 +9,5 @@ import org.springframework.web.bind.annotation.RestController
@RestController
 interface OutboxController {
    @RequestMapping("/outbox", "/users/{username}/outbox", method = [RequestMethod.POST, RequestMethod.GET])
-    suspend fun outbox(): ResponseEntity<Unit>
+    suspend fun outbox(@RequestBody string: String): ResponseEntity<Unit>
 }
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImpl.kt
@ -2,10 +2,11 @@ package dev.usbharu.hideout.activitypub.interfaces.api.outbox

 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RestController

@RestController
 class OutboxControllerImpl : OutboxController {
-    override suspend fun outbox(): ResponseEntity<Unit> =
+    override suspend fun outbox(@RequestBody string: String): ResponseEntity<Unit> =
        ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
 }
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerController.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerController.kt
@ -3,7 +3,6 @@ package dev.usbharu.hideout.activitypub.interfaces.api.webfinger
 import dev.usbharu.hideout.activitypub.domain.model.webfinger.WebFinger
 import dev.usbharu.hideout.activitypub.service.webfinger.WebFingerApiService
 import dev.usbharu.hideout.application.config.ApplicationConfig
-import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
 import dev.usbharu.hideout.util.AcctUtil
 import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory
@ -27,11 +26,8 @@ class WebFingerController(
            logger.warn("FAILED Parse acct.", e)
            return@runBlocking ResponseEntity.badRequest().build()
        }
-        val user = try {
+        val user =
            webFingerApiService.findByNameAndDomain(acct.username, acct.domain ?: applicationConfig.url.host)
-        } catch (_: FailedToGetResourcesException) {
-            return@runBlocking ResponseEntity.notFound().build()
-        }
        val webFinger = WebFinger(
            "acct:${user.name}@${user.domain}",
            listOf(
--- a/src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImpl.kt
@ -1,7 +1,6 @@
 package dev.usbharu.hideout.core.service.reaction

 import dev.usbharu.hideout.activitypub.service.activity.like.APReactionService
-import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
 import dev.usbharu.hideout.core.domain.model.reaction.Reaction
 import dev.usbharu.hideout.core.domain.model.reaction.ReactionRepository
 import dev.usbharu.hideout.core.query.ReactionQueryService
@ -27,26 +26,18 @@ class ReactionServiceImpl(
    }

    override suspend fun sendReaction(name: String, userId: Long, postId: Long) {
-        try {
-            val findByPostIdAndUserIdAndEmojiId =
-                reactionQueryService.findByPostIdAndUserIdAndEmojiId(postId, userId, 0)
-            apReactionService.removeReaction(findByPostIdAndUserIdAndEmojiId)
-            reactionRepository.delete(findByPostIdAndUserIdAndEmojiId)
-        } catch (_: FailedToGetResourcesException) {
+        if (reactionQueryService.reactionAlreadyExist(postId, userId, 0)) {
+            // delete
+            reactionQueryService.deleteByPostIdAndUserId(postId, userId)
+        } else {
+            val reaction = Reaction(reactionRepository.generateId(), 0, postId, userId)
+            reactionRepository.save(reaction)
+            apReactionService.reaction(reaction)
        }
-        val reaction = Reaction(reactionRepository.generateId(), 0, postId, userId)
-        reactionRepository.save(reaction)
-        apReactionService.reaction(reaction)
    }

    override suspend fun removeReaction(userId: Long, postId: Long) {
-        try {
-            val findByPostIdAndUserIdAndEmojiId =
-                reactionQueryService.findByPostIdAndUserIdAndEmojiId(postId, userId, 0)
-            reactionRepository.delete(findByPostIdAndUserIdAndEmojiId)
-            apReactionService.removeReaction(findByPostIdAndUserIdAndEmojiId)
-        } catch (e: FailedToGetResourcesException) {
-        }
+        reactionQueryService.deleteByPostIdAndUserId(postId, userId)
    }

    companion object {
--- a/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImplTest.kt
@ -1,62 +0,0 @@
-package dev.usbharu.hideout.activitypub.interfaces.api.outbox
-
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.InjectMocks
-import org.mockito.junit.jupiter.MockitoExtension
-import org.springframework.test.web.servlet.MockMvc
-import org.springframework.test.web.servlet.get
-import org.springframework.test.web.servlet.post
-import org.springframework.test.web.servlet.setup.MockMvcBuilders
-
-@ExtendWith(MockitoExtension::class)
-class OutboxControllerImplTest {
-
-    private lateinit var mockMvc: MockMvc
-
-    @InjectMocks
-    private lateinit var outboxController: OutboxControllerImpl
-
-    @BeforeEach
-    fun setUp() {
-        mockMvc =
-            MockMvcBuilders.standaloneSetup(outboxController).build()
-    }
-
-    @Test
-    fun `outbox GETに501を返す`() {
-        mockMvc
-            .get("/outbox")
-            .asyncDispatch()
-            .andDo { print() }
-            .andExpect { status { isNotImplemented() } }
-    }
-
-    @Test
-    fun `user-outbox GETに501を返す`() {
-        mockMvc
-            .get("/users/hoge/outbox")
-            .asyncDispatch()
-            .andDo { print() }
-            .andExpect { status { isNotImplemented() } }
-    }
-
-    @Test
-    fun `outbox POSTに501を返す`() {
-        mockMvc
-            .post("/outbox")
-            .asyncDispatch()
-            .andDo { print() }
-            .andExpect { status { isNotImplemented() } }
-    }
-
-    @Test
-    fun `user-outbox POSTに501を返す`() {
-        mockMvc
-            .post("/users/hoge/outbox")
-            .asyncDispatch()
-            .andDo { print() }
-            .andExpect { status { isNotImplemented() } }
-    }
-}
--- a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt
@ -1,79 +0,0 @@
-package dev.usbharu.hideout.activitypub.service.activity.create
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.activitypub.query.NoteQueryService
-import dev.usbharu.hideout.activitypub.service.objects.note.APNoteServiceImpl
-import dev.usbharu.hideout.application.config.ActivityPubConfig
-import dev.usbharu.hideout.application.config.ApplicationConfig
-import dev.usbharu.hideout.core.external.job.DeliverPostJob
-import dev.usbharu.hideout.core.query.FollowerQueryService
-import dev.usbharu.hideout.core.query.UserQueryService
-import dev.usbharu.hideout.core.service.job.JobQueueParentService
-import kotlinx.coroutines.test.runTest
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.InjectMocks
-import org.mockito.Mock
-import org.mockito.Spy
-import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.*
-import utils.PostBuilder
-import utils.UserBuilder
-import java.net.URL
-import java.time.Instant
-
-@ExtendWith(MockitoExtension::class)
-class ApSendCreateServiceImplTest {
-
-    @Mock
-    private lateinit var followerQueryService: FollowerQueryService
-
-    @Spy
-    private val objectMapper: ObjectMapper = ActivityPubConfig().objectMapper()
-
-    @Mock
-    private lateinit var jobQueueParentService: JobQueueParentService
-
-    @Mock
-    private lateinit var userQueryService: UserQueryService
-
-    @Mock
-    private lateinit var noteQueryService: NoteQueryService
-
-    @Spy
-    private val applicationConfig: ApplicationConfig = ApplicationConfig(URL("https://example.com"))
-
-    @InjectMocks
-    private lateinit var apSendCreateServiceImpl: ApSendCreateServiceImpl
-
-    @Test
-    fun `createNote 正常なPostでCreateのジョブを発行できる`() = runTest {
-        val post = PostBuilder.of()
-        val user = UserBuilder.localUserOf(id = post.userId)
-        val note = Note(
-            name = "Post",
-            id = post.apId,
-            attributedTo = user.url,
-            content = post.text,
-            published = Instant.ofEpochMilli(post.createdAt).toString(),
-            to = listOfNotNull(APNoteServiceImpl.public, user.followers),
-            sensitive = post.sensitive,
-            cc = listOfNotNull(APNoteServiceImpl.public, user.followers),
-            inReplyTo = null
-        )
-        val followers = listOf(
-            UserBuilder.remoteUserOf(),
-            UserBuilder.remoteUserOf(),
-            UserBuilder.remoteUserOf()
-        )
-
-        whenever(followerQueryService.findFollowersById(eq(post.userId))).doReturn(followers)
-        whenever(userQueryService.findById(eq(post.userId))).doReturn(user)
-        whenever(noteQueryService.findById(eq(post.id))).doReturn(note to post)
-
-        apSendCreateServiceImpl.createNote(post)
-
-        verify(jobQueueParentService, times(followers.size)).schedule(eq(DeliverPostJob), any())
-    }
-}
--- a/src/test/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImplTest.kt
@ -3,7 +3,6 @@ package dev.usbharu.hideout.core.service.reaction

 import dev.usbharu.hideout.activitypub.service.activity.like.APReactionService
 import dev.usbharu.hideout.application.service.id.TwitterSnowflakeIdGenerateService
-import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
 import dev.usbharu.hideout.core.domain.model.reaction.Reaction
 import dev.usbharu.hideout.core.domain.model.reaction.ReactionRepository
 import dev.usbharu.hideout.core.query.ReactionQueryService
@ -89,9 +88,7 @@ class ReactionServiceImplTest {
    @Test
    fun `sendReaction リアクションが存在しないとき保存して配送する`() = runTest {
        val post = PostBuilder.of()
-        whenever(reactionQueryService.findByPostIdAndUserIdAndEmojiId(eq(post.id), eq(post.userId), eq(0))).doThrow(
-            FailedToGetResourcesException::class
-        )
+        whenever(reactionQueryService.reactionAlreadyExist(eq(post.id), eq(post.userId), eq(0))).doReturn(false)
        val generateId = TwitterSnowflakeIdGenerateService.generateId()
        whenever(reactionRepository.generateId()).doReturn(generateId)

@ -104,28 +101,23 @@ class ReactionServiceImplTest {
    @Test
    fun `sendReaction リアクションが存在するときは削除して保存して配送する`() = runTest {
        val post = PostBuilder.of()
-        val id = TwitterSnowflakeIdGenerateService.generateId()
-        whenever(reactionQueryService.findByPostIdAndUserIdAndEmojiId(eq(post.id), eq(post.userId), eq(0))).doReturn(
-            Reaction(id, 0, post.id, post.userId)
-        )
+        whenever(reactionQueryService.reactionAlreadyExist(eq(post.id), eq(post.userId), eq(0))).doReturn(true)
        val generateId = TwitterSnowflakeIdGenerateService.generateId()
        whenever(reactionRepository.generateId()).doReturn(generateId)

        reactionServiceImpl.sendReaction("❤", post.userId, post.id)


-        verify(reactionRepository, times(1)).delete(eq(Reaction(id, 0, post.id, post.userId)))
+        verify(reactionRepository, times(1)).delete(eq(Reaction(generateId, 0, post.id, post.userId)))
        verify(reactionRepository, times(1)).save(eq(Reaction(generateId, 0, post.id, post.userId)))
-        verify(apReactionService, times(1)).removeReaction(eq(Reaction(id, 0, post.id, post.userId)))
+        verify(apReactionService, times(1)).removeReaction(eq(Reaction(generateId, 0, post.id, post.userId)))
        verify(apReactionService, times(1)).reaction(eq(Reaction(generateId, 0, post.id, post.userId)))
    }

    @Test
    fun `removeReaction リアクションが存在する場合削除して配送`() = runTest {
        val post = PostBuilder.of()
-        whenever(reactionQueryService.findByPostIdAndUserIdAndEmojiId(eq(post.id), eq(post.userId), eq(0))).doReturn(
-            Reaction(0, 0, post.id, post.userId)
-        )
+        whenever(reactionQueryService.reactionAlreadyExist(eq(post.id), eq(post.userId), eq(0))).doReturn(true)

        reactionServiceImpl.removeReaction(post.userId, post.id)