From b6746fe88692631b457997fc3cf23d6ce9f6c835 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sun, 26 Nov 2023 15:47:40 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20tmp=E3=81=8B=E3=82=89=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E3=81=AA=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=81=AB=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create}/CreateActivityProcessor.kt | 6 +++--- .../{tmp => common}/AbstractActivityPubProcessor.kt | 2 +- .../{tmp => common}/ActivityPubProcessContext.kt | 2 +- .../service/{tmp => common}/ActivityPubProcessor.kt | 3 +-- .../activitypub/service/common/ApJobServiceImpl.kt | 2 +- .../service/{tmp => inbox}/InboxJobProcessor.kt | 10 +++++++--- 6 files changed, 14 insertions(+), 11 deletions(-) rename src/main/kotlin/dev/usbharu/hideout/activitypub/service/{tmp/impl => activity/create}/CreateActivityProcessor.kt (79%) rename src/main/kotlin/dev/usbharu/hideout/activitypub/service/{tmp => common}/AbstractActivityPubProcessor.kt (96%) rename src/main/kotlin/dev/usbharu/hideout/activitypub/service/{tmp => common}/ActivityPubProcessContext.kt (88%) rename src/main/kotlin/dev/usbharu/hideout/activitypub/service/{tmp => common}/ActivityPubProcessor.kt (68%) rename src/main/kotlin/dev/usbharu/hideout/activitypub/service/{tmp => inbox}/InboxJobProcessor.kt (92%) diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/impl/CreateActivityProcessor.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt similarity index 79% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/impl/CreateActivityProcessor.kt rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt index 60918d01..5d057b3f 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/impl/CreateActivityProcessor.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt @@ -1,11 +1,11 @@ -package dev.usbharu.hideout.activitypub.service.tmp.impl +package dev.usbharu.hideout.activitypub.service.activity.create import dev.usbharu.hideout.activitypub.domain.model.Create import dev.usbharu.hideout.activitypub.domain.model.Note +import dev.usbharu.hideout.activitypub.service.common.AbstractActivityPubProcessor +import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessContext import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService -import dev.usbharu.hideout.activitypub.service.tmp.AbstractActivityPubProcessor -import dev.usbharu.hideout.activitypub.service.tmp.ActivityPubProcessContext import dev.usbharu.hideout.application.external.Transaction import org.springframework.stereotype.Service diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/AbstractActivityPubProcessor.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt similarity index 96% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/AbstractActivityPubProcessor.kt rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt index c5d927c9..8cddae81 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/AbstractActivityPubProcessor.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt @@ -1,4 +1,4 @@ -package dev.usbharu.hideout.activitypub.service.tmp +package dev.usbharu.hideout.activitypub.service.common import dev.usbharu.hideout.activitypub.domain.exception.ActivityPubProcessException import dev.usbharu.hideout.activitypub.domain.exception.FailedProcessException diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/ActivityPubProcessContext.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt similarity index 88% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/ActivityPubProcessContext.kt rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt index 6f45fd20..60a17bb4 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/ActivityPubProcessContext.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt @@ -1,4 +1,4 @@ -package dev.usbharu.hideout.activitypub.service.tmp +package dev.usbharu.hideout.activitypub.service.common import com.fasterxml.jackson.databind.JsonNode import dev.usbharu.hideout.activitypub.domain.model.objects.Object diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/ActivityPubProcessor.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt similarity index 68% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/ActivityPubProcessor.kt rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt index 350f1aea..4bc16f25 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/ActivityPubProcessor.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt @@ -1,7 +1,6 @@ -package dev.usbharu.hideout.activitypub.service.tmp +package dev.usbharu.hideout.activitypub.service.common import dev.usbharu.hideout.activitypub.domain.model.objects.Object -import dev.usbharu.hideout.activitypub.service.common.ActivityType interface ActivityPubProcessor { suspend fun process(activity: ActivityPubProcessContext) diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt index 150e93a3..64505017 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt @@ -3,8 +3,8 @@ package dev.usbharu.hideout.activitypub.service.common import com.fasterxml.jackson.databind.ObjectMapper import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowJobService import dev.usbharu.hideout.activitypub.service.activity.like.ApReactionJobService +import dev.usbharu.hideout.activitypub.service.inbox.InboxJobProcessor import dev.usbharu.hideout.activitypub.service.objects.note.ApNoteJobService -import dev.usbharu.hideout.activitypub.service.tmp.InboxJobProcessor import dev.usbharu.hideout.core.external.job.* import kjob.core.dsl.JobContextWithProps import kjob.core.job.JobProps diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/InboxJobProcessor.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt similarity index 92% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/InboxJobProcessor.kt rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt index 3cc5d0fc..71614aca 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/InboxJobProcessor.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt @@ -1,10 +1,13 @@ -package dev.usbharu.hideout.activitypub.service.tmp +package dev.usbharu.hideout.activitypub.service.inbox import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import dev.usbharu.hideout.activitypub.domain.model.objects.Object +import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessContext +import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessor import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.hideout.activitypub.service.objects.user.APUserService +import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException import dev.usbharu.hideout.core.external.job.InboxJob import dev.usbharu.hideout.core.external.job.InboxJobParam @@ -28,7 +31,8 @@ class InboxJobProcessor( private val signatureHeaderParser: SignatureHeaderParser, private val signatureVerifier: HttpSignatureVerifier, private val userQueryService: UserQueryService, - private val apUserService: APUserService + private val apUserService: APUserService, + private val transaction: Transaction ) : JobProcessor { suspend fun process(props: JobProps) { @@ -92,7 +96,7 @@ class InboxJobProcessor( } } - override suspend fun process(param: InboxJobParam) { + override suspend fun process(param: InboxJobParam) = transaction.transaction { val jsonNode = objectMapper.readTree(param.json) logger.info("START Process inbox. type: {}", param.type)