Merge pull request #105 from usbharu/feature/refactor

Feature/refactor

build.gradle.kts

@@ -66,7 +66,7 @@ tasks.create<GenerateTask>("openApiGenerateMastodonCompatibleApi", GenerateTask:
     typeMappings.put("org.springframework.core.io.Resource", "org.springframework.web.multipart.MultipartFile")
     schemaMappings.put(
         "StatusesRequest",
-        "dev.usbharu.hideout.domain.model.mastodon.StatusesRequest"
+        "dev.usbharu.hideout.mastodon.interfaces.api.status.StatusesRequest"
     )
     templateDir.set("$rootDir/templates")
 }

detekt.yml

@@ -47,6 +47,9 @@ style:
   UseRequire:
     active: false
 
+  VarCouldBeVal:
+    ignoreLateinitVar: true
+
 complexity:
   CognitiveComplexMethod:
     active: true

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedToGetActivityPubResourceException.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.exception.ap
+package dev.usbharu.hideout.activitypub.domain.exception
 
-import dev.usbharu.hideout.exception.FailedToGetResourcesException
+import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
 
 class FailedToGetActivityPubResourceException : FailedToGetResourcesException {
     constructor() : super()

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/IllegalActivityPubObjectException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception.ap
+package dev.usbharu.hideout.activitypub.domain.exception
 
 import java.io.Serial
 

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/JsonParseException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception
+package dev.usbharu.hideout.activitypub.domain.exception
 
 import java.io.Serial
 

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt

@@ -1,6 +1,8 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Accept : Object {
     @JsonDeserialize(using = ObjectDeserializer::class)

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt

@@ -1,6 +1,8 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Create : Object {
     @JsonDeserialize(using = ObjectDeserializer::class)

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt

@@ -1,4 +1,6 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
+
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Document : Object {
 

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt

@@ -1,4 +1,6 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
+
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Emoji : Object {
     var updated: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt

@@ -1,4 +1,6 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
+
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Follow : Object {
     var `object`: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt

@@ -1,4 +1,6 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
+
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Image : Object {
     private var mediaType: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect
 import com.fasterxml.jackson.annotation.JsonCreator

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt

@@ -1,4 +1,6 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
+
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Key : Object {
     var owner: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt

@@ -1,6 +1,8 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Like : Object {
     var `object`: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt

@@ -1,4 +1,6 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
+
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Note : Object {
     var attributedTo: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt

@@ -1,4 +1,6 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
+
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Person : Object {
     var preferredUsername: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt

@@ -1,6 +1,8 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 import java.time.Instant
 
 open class Undo : Object {

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.domain.model.wellknown
+package dev.usbharu.hideout.activitypub.domain.model.nodeinfo
 
 data class Nodeinfo(
     val links: List<Links>

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo2_0.kt

@@ -1,6 +1,6 @@
 @file:Suppress("ClassName")
 
-package dev.usbharu.hideout.domain.model.wellknown
+package dev.usbharu.hideout.activitypub.domain.model.nodeinfo
 
 @Suppress("ClassNaming")
 data class Nodeinfo2_0(

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt

@@ -1,9 +1,10 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
+import dev.usbharu.hideout.activitypub.domain.model.JsonLd
 
 open class Object : JsonLd {
     @JsonSerialize(using = TypeSerializer::class)

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt

@@ -1,10 +1,11 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.JsonDeserializer
 import com.fasterxml.jackson.databind.JsonNode
-import dev.usbharu.hideout.service.ap.ExtendedActivityVocabulary
+import dev.usbharu.hideout.activitypub.domain.model.*
+import dev.usbharu.hideout.activitypub.service.common.ExtendedActivityVocabulary
 
 class ObjectDeserializer : JsonDeserializer<Object>() {
     @Suppress("LongMethod", "CyclomaticComplexMethod")

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.domain.model.ap
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 open class ObjectValue : Object {
 

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/webfinger/WebFinger.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.domain.model.wellknown
+package dev.usbharu.hideout.activitypub.domain.model.webfinger
 
 data class WebFinger(val subject: String, val links: List<Link>) {
     data class Link(val rel: String, val type: String, val href: String)

src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt

@@ -1,11 +1,14 @@
-package dev.usbharu.hideout.query.activitypub
+package dev.usbharu.hideout.activitypub.infrastructure.exposedquery
 
-import dev.usbharu.hideout.domain.model.ap.Document
+import dev.usbharu.hideout.activitypub.domain.model.Document
-import dev.usbharu.hideout.domain.model.ap.Note
+import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.domain.model.hideout.entity.Post
+import dev.usbharu.hideout.activitypub.query.NoteQueryService
-import dev.usbharu.hideout.domain.model.hideout.entity.Visibility
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteServiceImpl.Companion.public
-import dev.usbharu.hideout.repository.*
+import dev.usbharu.hideout.application.infrastructure.exposed.QueryMapper
-import dev.usbharu.hideout.service.ap.APNoteServiceImpl.Companion.public
+import dev.usbharu.hideout.core.domain.model.post.Post
+import dev.usbharu.hideout.core.domain.model.post.PostRepository
+import dev.usbharu.hideout.core.domain.model.post.Visibility
+import dev.usbharu.hideout.core.infrastructure.exposedrepository.*
 import org.jetbrains.exposed.sql.Query
 import org.jetbrains.exposed.sql.ResultRow
 import org.jetbrains.exposed.sql.select
@@ -24,7 +27,7 @@ class NoteQueryServiceImpl(private val postRepository: PostRepository, private v
             .let { it.toNote() to postQueryMapper.map(it).first() }
     }
 
-    private suspend fun ResultRow.toNote(mediaList: List<dev.usbharu.hideout.domain.model.hideout.entity.Media>): Note {
+    private suspend fun ResultRow.toNote(mediaList: List<dev.usbharu.hideout.core.domain.model.media.Media>): Note {
         val replyId = this[Posts.replyId]
         val replyTo = if (replyId != null) {
             postRepository.findById(replyId).url

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPController.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.controller
+package dev.usbharu.hideout.activitypub.interfaces.api.actor
 
-import dev.usbharu.hideout.domain.model.ap.Person
+import dev.usbharu.hideout.activitypub.domain.model.Person
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt

@@ -1,7 +1,7 @@
-package dev.usbharu.hideout.controller
+package dev.usbharu.hideout.activitypub.interfaces.api.actor
 
-import dev.usbharu.hideout.domain.model.ap.Person
+import dev.usbharu.hideout.activitypub.domain.model.Person
-import dev.usbharu.hideout.service.ap.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.RestController

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/common/ActivityPubStringResponse.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.domain.model
+package dev.usbharu.hideout.activitypub.interfaces.api.common
 
-import dev.usbharu.hideout.domain.model.ap.JsonLd
+import dev.usbharu.hideout.activitypub.domain.model.JsonLd
 import dev.usbharu.hideout.util.HttpUtil.Activity
 import io.ktor.http.*
 
@@ -25,9 +25,7 @@ sealed class ActivityPubResponse(
         return result
     }
 
-    override fun toString(): String {
+    override fun toString(): String = "ActivityPubResponse(httpStatusCode=$httpStatusCode, contentType=$contentType)"
-        return "ActivityPubResponse(httpStatusCode=$httpStatusCode, contentType=$contentType)"
-    }
 }
 
 class ActivityPubStringResponse(
@@ -45,13 +43,9 @@ class ActivityPubStringResponse(
         return true
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode(): Int = message.hashCode()
-        return message.hashCode()
-    }
 
-    override fun toString(): String {
+    override fun toString(): String = "ActivityPubStringResponse(message='$message') ${super.toString()}"
-        return "ActivityPubStringResponse(message='$message') ${super.toString()}"
-    }
 }
 
 class ActivityPubObjectResponse(
@@ -68,11 +62,7 @@ class ActivityPubObjectResponse(
         return true
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode(): Int = message.hashCode()
-        return message.hashCode()
-    }
 
-    override fun toString(): String {
+    override fun toString(): String = "ActivityPubObjectResponse(message=$message) ${super.toString()}"
-        return "ActivityPubObjectResponse(message=$message) ${super.toString()}"
-    }
 }

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/hostmeta/HostMetaController.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.controller.wellknown
+package dev.usbharu.hideout.activitypub.interfaces.api.hostmeta
 
-import dev.usbharu.hideout.config.ApplicationConfig
+import dev.usbharu.hideout.application.config.ApplicationConfig
 import org.intellij.lang.annotations.Language
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxController.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.controller
+package dev.usbharu.hideout.activitypub.interfaces.api.inbox
 
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.controller
+package dev.usbharu.hideout.activitypub.interfaces.api.inbox
 
-import dev.usbharu.hideout.service.ap.APService
+import dev.usbharu.hideout.activitypub.service.common.APService
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/nodeinfo/NodeinfoController.kt

@@ -1,8 +1,8 @@
-package dev.usbharu.hideout.controller.wellknown
+package dev.usbharu.hideout.activitypub.interfaces.api.nodeinfo
 
-import dev.usbharu.hideout.config.ApplicationConfig
+import dev.usbharu.hideout.activitypub.domain.model.nodeinfo.Nodeinfo
-import dev.usbharu.hideout.domain.model.wellknown.Nodeinfo
+import dev.usbharu.hideout.activitypub.domain.model.nodeinfo.Nodeinfo2_0
-import dev.usbharu.hideout.domain.model.wellknown.Nodeinfo2_0
+import dev.usbharu.hideout.application.config.ApplicationConfig
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApController.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.controller
+package dev.usbharu.hideout.activitypub.interfaces.api.note
 
-import dev.usbharu.hideout.domain.model.ap.Note
+import dev.usbharu.hideout.activitypub.domain.model.Note
 import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.CurrentSecurityContext
 import org.springframework.security.core.context.SecurityContext

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt

@@ -1,8 +1,8 @@
-package dev.usbharu.hideout.controller
+package dev.usbharu.hideout.activitypub.interfaces.api.note
 
-import dev.usbharu.hideout.domain.model.ap.Note
+import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.service.api.NoteApApiService
+import dev.usbharu.hideout.activitypub.service.objects.note.NoteApApiService
-import dev.usbharu.hideout.service.signature.HttpSignatureUser
+import dev.usbharu.hideout.core.infrastructure.springframework.httpsignature.HttpSignatureUser
 import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.CurrentSecurityContext
 import org.springframework.security.core.context.SecurityContext

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxController.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.controller
+package dev.usbharu.hideout.activitypub.interfaces.api.outbox
 
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImpl.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.controller
+package dev.usbharu.hideout.activitypub.interfaces.api.outbox
 
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerController.kt

@@ -1,8 +1,8 @@
-package dev.usbharu.hideout.controller.wellknown
+package dev.usbharu.hideout.activitypub.interfaces.api.webfinger
 
-import dev.usbharu.hideout.config.ApplicationConfig
+import dev.usbharu.hideout.activitypub.domain.model.webfinger.WebFinger
-import dev.usbharu.hideout.domain.model.wellknown.WebFinger
+import dev.usbharu.hideout.activitypub.service.webfinger.WebFingerApiService
-import dev.usbharu.hideout.service.api.WebFingerApiService
+import dev.usbharu.hideout.application.config.ApplicationConfig
 import dev.usbharu.hideout.util.AcctUtil
 import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory

src/main/kotlin/dev/usbharu/hideout/activitypub/query/NoteQueryService.kt

@@ -0,0 +1,8 @@
+package dev.usbharu.hideout.activitypub.query
+
+import dev.usbharu.hideout.activitypub.domain.model.Note
+import dev.usbharu.hideout.core.domain.model.post.Post
+
+interface NoteQueryService {
+    suspend fun findById(id: Long): Pair<Note, Post>
+}

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APAcceptService.kt

@@ -1,14 +1,14 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.activity.accept
 
-import dev.usbharu.hideout.domain.model.ActivityPubResponse
+import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException
-import dev.usbharu.hideout.domain.model.ActivityPubStringResponse
+import dev.usbharu.hideout.activitypub.domain.model.Accept
-import dev.usbharu.hideout.domain.model.ap.Accept
+import dev.usbharu.hideout.activitypub.domain.model.Follow
-import dev.usbharu.hideout.domain.model.ap.Follow
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
-import dev.usbharu.hideout.exception.ap.IllegalActivityPubObjectException
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.query.FollowerQueryService
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.core.query.FollowerQueryService
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.core.query.UserQueryService
-import dev.usbharu.hideout.service.user.UserService
+import dev.usbharu.hideout.core.service.user.UserService
 import io.ktor.http.*
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateService.kt

@@ -1,11 +1,12 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.activity.create
 
-import dev.usbharu.hideout.domain.model.ActivityPubResponse
+import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException
-import dev.usbharu.hideout.domain.model.ActivityPubStringResponse
+import dev.usbharu.hideout.activitypub.domain.model.Create
-import dev.usbharu.hideout.domain.model.ap.Create
+import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.domain.model.ap.Note
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
-import dev.usbharu.hideout.exception.ap.IllegalActivityPubObjectException
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
+import dev.usbharu.hideout.application.external.Transaction
 import io.ktor.http.*
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobService.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.service.ap.job
+package dev.usbharu.hideout.activitypub.service.activity.follow
 
-import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
+import dev.usbharu.hideout.core.external.job.ReceiveFollowJob
 import kjob.core.job.JobProps
 
 interface APReceiveFollowJobService {

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobServiceImpl.kt

@@ -1,15 +1,15 @@
-package dev.usbharu.hideout.service.ap.job
+package dev.usbharu.hideout.activitypub.service.activity.follow
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import dev.usbharu.hideout.domain.model.ap.Accept
+import dev.usbharu.hideout.activitypub.domain.model.Accept
-import dev.usbharu.hideout.domain.model.ap.Follow
+import dev.usbharu.hideout.activitypub.domain.model.Follow
-import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
+import dev.usbharu.hideout.activitypub.service.common.APRequestService
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
-import dev.usbharu.hideout.service.ap.APRequestService
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.service.ap.APUserService
+import dev.usbharu.hideout.core.external.job.ReceiveFollowJob
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.core.query.UserQueryService
-import dev.usbharu.hideout.service.user.UserService
+import dev.usbharu.hideout.core.service.user.UserService
 import kjob.core.job.JobProps
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Qualifier

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt

@@ -1,11 +1,11 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.activity.follow
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.usbharu.hideout.domain.model.ActivityPubResponse
+import dev.usbharu.hideout.activitypub.domain.model.Follow
-import dev.usbharu.hideout.domain.model.ActivityPubStringResponse
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
-import dev.usbharu.hideout.domain.model.ap.Follow
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
+import dev.usbharu.hideout.core.external.job.ReceiveFollowJob
-import dev.usbharu.hideout.service.job.JobQueueParentService
+import dev.usbharu.hideout.core.service.job.JobQueueParentService
 import io.ktor.http.*
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Qualifier

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowService.kt

@@ -1,7 +1,8 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.activity.follow
 
-import dev.usbharu.hideout.domain.model.ap.Follow
+import dev.usbharu.hideout.activitypub.domain.model.Follow
-import dev.usbharu.hideout.domain.model.hideout.dto.SendFollowDto
+import dev.usbharu.hideout.activitypub.service.common.APRequestService
+import dev.usbharu.hideout.core.service.follow.SendFollowDto
 import org.springframework.stereotype.Service
 
 interface APSendFollowService {

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeService.kt

@@ -1,13 +1,15 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.activity.like
 
-import dev.usbharu.hideout.domain.model.ActivityPubResponse
+import dev.usbharu.hideout.activitypub.domain.exception.FailedToGetActivityPubResourceException
-import dev.usbharu.hideout.domain.model.ActivityPubStringResponse
+import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException
-import dev.usbharu.hideout.domain.model.ap.Like
+import dev.usbharu.hideout.activitypub.domain.model.Like
-import dev.usbharu.hideout.exception.ap.FailedToGetActivityPubResourceException
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
-import dev.usbharu.hideout.exception.ap.IllegalActivityPubObjectException
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.query.PostQueryService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
-import dev.usbharu.hideout.service.reaction.ReactionService
+import dev.usbharu.hideout.application.external.Transaction
+import dev.usbharu.hideout.core.query.PostQueryService
+import dev.usbharu.hideout.core.service.reaction.ReactionService
 import io.ktor.http.*
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt

@@ -1,13 +1,13 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.activity.like
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.usbharu.hideout.domain.model.hideout.entity.Reaction
+import dev.usbharu.hideout.core.domain.model.reaction.Reaction
-import dev.usbharu.hideout.domain.model.job.DeliverReactionJob
+import dev.usbharu.hideout.core.external.job.DeliverReactionJob
-import dev.usbharu.hideout.domain.model.job.DeliverRemoveReactionJob
+import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionJob
-import dev.usbharu.hideout.query.FollowerQueryService
+import dev.usbharu.hideout.core.query.FollowerQueryService
-import dev.usbharu.hideout.query.PostQueryService
+import dev.usbharu.hideout.core.query.PostQueryService
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.core.query.UserQueryService
-import dev.usbharu.hideout.service.job.JobQueueParentService
+import dev.usbharu.hideout.core.service.job.JobQueueParentService
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.stereotype.Service
 

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobService.kt

@@ -1,7 +1,7 @@
-package dev.usbharu.hideout.service.ap.job
+package dev.usbharu.hideout.activitypub.service.activity.like
 
-import dev.usbharu.hideout.domain.model.job.DeliverReactionJob
+import dev.usbharu.hideout.core.external.job.DeliverReactionJob
-import dev.usbharu.hideout.domain.model.job.DeliverRemoveReactionJob
+import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionJob
 import kjob.core.job.JobProps
 
 interface ApReactionJobService {

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobServiceImpl.kt

@@ -1,14 +1,14 @@
-package dev.usbharu.hideout.service.ap.job
+package dev.usbharu.hideout.activitypub.service.activity.like
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import dev.usbharu.hideout.config.ApplicationConfig
+import dev.usbharu.hideout.activitypub.domain.model.Like
-import dev.usbharu.hideout.domain.model.ap.Like
+import dev.usbharu.hideout.activitypub.domain.model.Undo
-import dev.usbharu.hideout.domain.model.ap.Undo
+import dev.usbharu.hideout.activitypub.service.common.APRequestService
-import dev.usbharu.hideout.domain.model.job.DeliverReactionJob
+import dev.usbharu.hideout.application.config.ApplicationConfig
-import dev.usbharu.hideout.domain.model.job.DeliverRemoveReactionJob
+import dev.usbharu.hideout.core.external.job.DeliverReactionJob
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionJob
-import dev.usbharu.hideout.service.ap.APRequestService
+import dev.usbharu.hideout.core.query.UserQueryService
 import kjob.core.job.JobProps
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.stereotype.Service

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoService.kt

@@ -1,12 +1,13 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.activity.undo
 
-import dev.usbharu.hideout.domain.model.ActivityPubResponse
+import dev.usbharu.hideout.activitypub.domain.model.Follow
-import dev.usbharu.hideout.domain.model.ActivityPubStringResponse
+import dev.usbharu.hideout.activitypub.domain.model.Undo
-import dev.usbharu.hideout.domain.model.ap.Follow
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
-import dev.usbharu.hideout.domain.model.ap.Undo
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.service.user.UserService
+import dev.usbharu.hideout.core.query.UserQueryService
+import dev.usbharu.hideout.core.service.user.UserService
 import io.ktor.http.*
 import org.springframework.stereotype.Service
 

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt

@@ -1,7 +1,7 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.domain.model.ap.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
-import dev.usbharu.hideout.domain.model.hideout.entity.User
+import dev.usbharu.hideout.core.domain.model.user.User
 
 interface APRequestService {
     suspend fun <R : Object> apGet(url: String, signer: User? = null, responseClass: Class<R>): R

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt

@@ -1,8 +1,8 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.common
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.usbharu.hideout.domain.model.ap.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
-import dev.usbharu.hideout.domain.model.hideout.entity.User
+import dev.usbharu.hideout.core.domain.model.user.User
 import dev.usbharu.hideout.util.Base64Util
 import dev.usbharu.hideout.util.HttpUtil.Activity
 import dev.usbharu.hideout.util.RsaUtil

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt

@@ -1,7 +1,7 @@
-package dev.usbharu.hideout.service.ap.resource
+package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.domain.model.ap.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
-import dev.usbharu.hideout.domain.model.hideout.entity.User
+import dev.usbharu.hideout.core.domain.model.user.User
 
 interface APResourceResolveService {
     suspend fun <T : Object> resolve(url: String, clazz: Class<T>, singer: User?): T

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt

@@ -1,9 +1,8 @@
-package dev.usbharu.hideout.service.ap.resource
+package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.domain.model.ap.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
-import dev.usbharu.hideout.domain.model.hideout.entity.User
+import dev.usbharu.hideout.core.domain.model.user.User
-import dev.usbharu.hideout.repository.UserRepository
+import dev.usbharu.hideout.core.domain.model.user.UserRepository
-import dev.usbharu.hideout.service.ap.APRequestService
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt

@@ -1,11 +1,16 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.common
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import dev.usbharu.hideout.domain.model.ActivityPubResponse
+import dev.usbharu.hideout.activitypub.domain.exception.JsonParseException
-import dev.usbharu.hideout.domain.model.ap.Follow
+import dev.usbharu.hideout.activitypub.domain.model.Follow
-import dev.usbharu.hideout.exception.JsonParseException
+import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
+import dev.usbharu.hideout.activitypub.service.activity.accept.APAcceptService
+import dev.usbharu.hideout.activitypub.service.activity.create.APCreateService
+import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowService
+import dev.usbharu.hideout.activitypub.service.activity.like.APLikeService
+import dev.usbharu.hideout.activitypub.service.activity.undo.APUndoService
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Qualifier

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobService.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.service.ap.job
+package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.domain.model.job.HideoutJob
+import dev.usbharu.hideout.core.external.job.HideoutJob
 import kjob.core.dsl.JobContextWithProps
 
 interface ApJobService {

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt

@@ -1,6 +1,9 @@
-package dev.usbharu.hideout.service.ap.job
+package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.domain.model.job.*
+import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowJobService
+import dev.usbharu.hideout.activitypub.service.activity.like.ApReactionJobService
+import dev.usbharu.hideout.activitypub.service.objects.note.ApNoteJobService
+import dev.usbharu.hideout.core.external.job.*
 import kjob.core.dsl.JobContextWithProps
 import kjob.core.job.JobProps
 import org.slf4j.LoggerFactory

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/CacheManager.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.service.ap.resource
+package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.domain.model.ap.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 interface CacheManager {
 

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/InMemoryCacheManager.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.service.ap.resource
+package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.domain.model.ap.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.util.LruCache
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt

@@ -1,23 +1,24 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.usbharu.hideout.domain.model.ap.Note
+import dev.usbharu.hideout.activitypub.domain.exception.FailedToGetActivityPubResourceException
-import dev.usbharu.hideout.domain.model.hideout.entity.Post
+import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException
-import dev.usbharu.hideout.domain.model.hideout.entity.Visibility
+import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.domain.model.job.DeliverPostJob
+import dev.usbharu.hideout.activitypub.service.common.APResourceResolveService
-import dev.usbharu.hideout.exception.FailedToGetResourcesException
+import dev.usbharu.hideout.activitypub.service.common.resolve
-import dev.usbharu.hideout.exception.ap.FailedToGetActivityPubResourceException
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
-import dev.usbharu.hideout.exception.ap.IllegalActivityPubObjectException
+import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
-import dev.usbharu.hideout.query.FollowerQueryService
+import dev.usbharu.hideout.core.domain.model.post.Post
-import dev.usbharu.hideout.query.MediaQueryService
+import dev.usbharu.hideout.core.domain.model.post.PostRepository
-import dev.usbharu.hideout.query.PostQueryService
+import dev.usbharu.hideout.core.domain.model.post.Visibility
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.core.external.job.DeliverPostJob
-import dev.usbharu.hideout.repository.PostRepository
+import dev.usbharu.hideout.core.query.FollowerQueryService
-import dev.usbharu.hideout.service.ap.resource.APResourceResolveService
+import dev.usbharu.hideout.core.query.MediaQueryService
-import dev.usbharu.hideout.service.ap.resource.resolve
+import dev.usbharu.hideout.core.query.PostQueryService
-import dev.usbharu.hideout.service.job.JobQueueParentService
+import dev.usbharu.hideout.core.query.UserQueryService
-import dev.usbharu.hideout.service.post.PostCreateInterceptor
+import dev.usbharu.hideout.core.service.job.JobQueueParentService
-import dev.usbharu.hideout.service.post.PostService
+import dev.usbharu.hideout.core.service.post.PostCreateInterceptor
+import dev.usbharu.hideout.core.service.post.PostService
 import io.ktor.client.plugins.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobService.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.service.ap.job
+package dev.usbharu.hideout.activitypub.service.objects.note
 
-import dev.usbharu.hideout.domain.model.job.DeliverPostJob
+import dev.usbharu.hideout.core.external.job.DeliverPostJob
 import kjob.core.job.JobProps
 
 interface ApNoteJobService {

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImpl.kt

@@ -1,17 +1,17 @@
-package dev.usbharu.hideout.service.ap.job
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import dev.usbharu.hideout.config.ApplicationConfig
+import dev.usbharu.hideout.activitypub.domain.model.Create
-import dev.usbharu.hideout.domain.model.ap.Create
+import dev.usbharu.hideout.activitypub.domain.model.Document
-import dev.usbharu.hideout.domain.model.ap.Document
+import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.domain.model.ap.Note
+import dev.usbharu.hideout.activitypub.service.common.APRequestService
-import dev.usbharu.hideout.domain.model.hideout.entity.Post
+import dev.usbharu.hideout.application.config.ApplicationConfig
-import dev.usbharu.hideout.domain.model.job.DeliverPostJob
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.core.domain.model.media.Media
-import dev.usbharu.hideout.service.ap.APNoteServiceImpl
+import dev.usbharu.hideout.core.domain.model.post.Post
-import dev.usbharu.hideout.service.ap.APRequestService
+import dev.usbharu.hideout.core.external.job.DeliverPostJob
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.core.query.UserQueryService
 import kjob.core.job.JobProps
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Qualifier
@@ -30,7 +30,7 @@ class ApNoteJobServiceImpl(
         val actor = props[DeliverPostJob.actor]
         val postEntity = objectMapper.readValue<Post>(props[DeliverPostJob.post])
         val mediaList =
-            objectMapper.readValue<List<dev.usbharu.hideout.domain.model.hideout.entity.Media>>(
+            objectMapper.readValue<List<Media>>(
                 props[DeliverPostJob.media]
             )
 

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt

@@ -0,0 +1,7 @@
+package dev.usbharu.hideout.activitypub.service.objects.note
+
+import dev.usbharu.hideout.activitypub.domain.model.Note
+
+interface NoteApApiService {
+    suspend fun getNote(postId: Long, userId: Long?): Note?
+}

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt

@@ -1,10 +1,10 @@
-package dev.usbharu.hideout.service.api
+package dev.usbharu.hideout.activitypub.service.objects.note
 
-import dev.usbharu.hideout.domain.model.ap.Note
+import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.domain.model.hideout.entity.Visibility
+import dev.usbharu.hideout.activitypub.query.NoteQueryService
-import dev.usbharu.hideout.query.FollowerQueryService
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.query.activitypub.NoteQueryService
+import dev.usbharu.hideout.core.domain.model.post.Visibility
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.core.query.FollowerQueryService
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt

@@ -1,18 +1,18 @@
-package dev.usbharu.hideout.service.ap
+package dev.usbharu.hideout.activitypub.service.objects.user
 
-import dev.usbharu.hideout.config.ApplicationConfig
+import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException
-import dev.usbharu.hideout.domain.model.ap.Image
+import dev.usbharu.hideout.activitypub.domain.model.Image
-import dev.usbharu.hideout.domain.model.ap.Key
+import dev.usbharu.hideout.activitypub.domain.model.Key
-import dev.usbharu.hideout.domain.model.ap.Person
+import dev.usbharu.hideout.activitypub.domain.model.Person
-import dev.usbharu.hideout.domain.model.hideout.dto.RemoteUserCreateDto
+import dev.usbharu.hideout.activitypub.service.common.APResourceResolveService
-import dev.usbharu.hideout.domain.model.hideout.entity.User
+import dev.usbharu.hideout.activitypub.service.common.resolve
-import dev.usbharu.hideout.exception.FailedToGetResourcesException
+import dev.usbharu.hideout.application.config.ApplicationConfig
-import dev.usbharu.hideout.exception.ap.IllegalActivityPubObjectException
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
-import dev.usbharu.hideout.service.ap.resource.APResourceResolveService
+import dev.usbharu.hideout.core.domain.model.user.User
-import dev.usbharu.hideout.service.ap.resource.resolve
+import dev.usbharu.hideout.core.query.UserQueryService
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.core.service.user.RemoteUserCreateDto
-import dev.usbharu.hideout.service.user.UserService
+import dev.usbharu.hideout.core.service.user.UserService
 import org.springframework.stereotype.Service
 
 interface APUserService {

src/main/kotlin/dev/usbharu/hideout/activitypub/service/webfinger/WebFingerApiService.kt

@@ -1,8 +1,8 @@
-package dev.usbharu.hideout.service.api
+package dev.usbharu.hideout.activitypub.service.webfinger
 
-import dev.usbharu.hideout.domain.model.hideout.entity.User
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.core.domain.model.user.User
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.core.query.UserQueryService
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/dev/usbharu/hideout/application/SpringApplication.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout
+package dev.usbharu.hideout.application
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan

src/main/kotlin/dev/usbharu/hideout/application/config/ActivityPubConfig.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.config
+package dev.usbharu.hideout.application.config
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.DeserializationFeature

src/main/kotlin/dev/usbharu/hideout/application/config/AwsConfig.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.config
+package dev.usbharu.hideout.application.config
 
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration

src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.config
+package dev.usbharu.hideout.application.config
 
 import io.ktor.client.*
 import io.ktor.client.engine.cio.*

src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt

@@ -1,9 +1,9 @@
-package dev.usbharu.hideout
+package dev.usbharu.hideout.application.config
 
-import dev.usbharu.hideout.domain.model.job.HideoutJob
+import dev.usbharu.hideout.activitypub.service.common.ApJobService
-import dev.usbharu.hideout.service.ap.job.ApJobService
+import dev.usbharu.hideout.core.external.job.HideoutJob
-import dev.usbharu.hideout.service.job.JobQueueParentService
+import dev.usbharu.hideout.core.service.job.JobQueueParentService
-import dev.usbharu.hideout.service.job.JobQueueWorkerService
+import dev.usbharu.hideout.core.service.job.JobQueueWorkerService
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.boot.ApplicationArguments

src/main/kotlin/dev/usbharu/hideout/application/config/MdcXrequestIdFilter.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.config
 
 import jakarta.servlet.Filter
 import jakarta.servlet.FilterChain

src/main/kotlin/dev/usbharu/hideout/application/config/MvcConfigurer.kt

@@ -1,5 +1,6 @@
-package dev.usbharu.hideout.config
+package dev.usbharu.hideout.application.config
 
+import dev.usbharu.hideout.generate.JsonOrFormModelMethodProcessor
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.converter.HttpMessageConverter

src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.config
+package dev.usbharu.hideout.application.config
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.nimbusds.jose.jwk.JWKSet
@@ -6,12 +6,12 @@ import com.nimbusds.jose.jwk.RSAKey
 import com.nimbusds.jose.jwk.source.ImmutableJWKSet
 import com.nimbusds.jose.jwk.source.JWKSource
 import com.nimbusds.jose.proc.SecurityContext
-import dev.usbharu.hideout.domain.model.UserDetailsImpl
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.query.UserQueryService
+import dev.usbharu.hideout.core.infrastructure.springframework.httpsignature.HttpSignatureFilter
-import dev.usbharu.hideout.service.core.Transaction
+import dev.usbharu.hideout.core.infrastructure.springframework.httpsignature.HttpSignatureUserDetailsService
-import dev.usbharu.hideout.service.signature.HttpSignatureFilter
+import dev.usbharu.hideout.core.infrastructure.springframework.httpsignature.HttpSignatureVerifierComposite
-import dev.usbharu.hideout.service.signature.HttpSignatureUserDetailsService
+import dev.usbharu.hideout.core.infrastructure.springframework.oauth2.UserDetailsImpl
-import dev.usbharu.hideout.service.signature.HttpSignatureVerifierComposite
+import dev.usbharu.hideout.core.query.UserQueryService
 import dev.usbharu.hideout.util.RsaUtil
 import dev.usbharu.httpsignature.sign.RsaSha256HttpSignatureSigner
 import dev.usbharu.httpsignature.verify.DefaultSignatureHeaderParser

src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.config
+package dev.usbharu.hideout.application.config
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.context.properties.ConfigurationProperties

src/main/kotlin/dev/usbharu/hideout/application/external/Transaction.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.external
 
 import org.springframework.stereotype.Service
 

src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedTransaction.kt

@@ -1,5 +1,6 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.infrastructure.exposed
 
+import dev.usbharu.hideout.application.external.Transaction
 import kotlinx.coroutines.slf4j.MDCContext
 import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
 import org.springframework.stereotype.Service

src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/QueryMapper.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.repository
+package dev.usbharu.hideout.application.infrastructure.exposed
 
 import org.jetbrains.exposed.sql.Query
 

src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ResultRowMapper.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.repository
+package dev.usbharu.hideout.application.infrastructure.exposed
 
 import org.jetbrains.exposed.sql.ResultRow
 

src/main/kotlin/dev/usbharu/hideout/application/service/id/IdGenerateService.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.service.id
 
 import org.springframework.stereotype.Service
 

src/main/kotlin/dev/usbharu/hideout/application/service/id/SnowflakeIdGenerateService.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.service.id
 
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex

src/main/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateService.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.service.id
 
 import org.springframework.context.annotation.Primary
 import org.springframework.stereotype.Service

src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaService.kt

@@ -1,7 +1,7 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.service.init
 
-import dev.usbharu.hideout.domain.model.hideout.entity.Jwt
+import dev.usbharu.hideout.core.domain.model.meta.Jwt
-import dev.usbharu.hideout.domain.model.hideout.entity.Meta
+import dev.usbharu.hideout.core.domain.model.meta.Meta
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImpl.kt

@@ -1,9 +1,10 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.service.init
 
-import dev.usbharu.hideout.domain.model.hideout.entity.Jwt
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.domain.model.hideout.entity.Meta
+import dev.usbharu.hideout.core.domain.exception.NotInitException
-import dev.usbharu.hideout.exception.NotInitException
+import dev.usbharu.hideout.core.domain.model.meta.Jwt
-import dev.usbharu.hideout.repository.MetaRepository
+import dev.usbharu.hideout.core.domain.model.meta.Meta
+import dev.usbharu.hideout.core.domain.model.meta.MetaRepository
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseService.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.service.init
 
 import org.springframework.stereotype.Service
 

src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImpl.kt

@@ -1,8 +1,9 @@
-package dev.usbharu.hideout.service.core
+package dev.usbharu.hideout.application.service.init
 
-import dev.usbharu.hideout.domain.model.hideout.entity.Jwt
+import dev.usbharu.hideout.application.external.Transaction
-import dev.usbharu.hideout.domain.model.hideout.entity.Meta
+import dev.usbharu.hideout.core.domain.model.meta.Jwt
-import dev.usbharu.hideout.repository.MetaRepository
+import dev.usbharu.hideout.core.domain.model.meta.Meta
+import dev.usbharu.hideout.core.domain.model.meta.MetaRepository
 import dev.usbharu.hideout.util.ServerUtil
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/FailedToGetResourcesException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception
+package dev.usbharu.hideout.core.domain.exception
 
 import java.io.Serial
 

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HttpSignatureVerifyException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception
+package dev.usbharu.hideout.core.domain.exception
 
 import java.io.Serial
 import javax.naming.AuthenticationException

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/NotInitException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception
+package dev.usbharu.hideout.core.domain.exception
 
 import java.io.Serial
 

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/UserNotFoundException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception
+package dev.usbharu.hideout.core.domain.exception
 
 import java.io.Serial
 

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaConvertException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception.media
+package dev.usbharu.hideout.core.domain.exception.media
 
 open class MediaConvertException : MediaException {
     constructor() : super()

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception.media
+package dev.usbharu.hideout.core.domain.exception.media
 
 abstract class MediaException : RuntimeException {
     constructor() : super()

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception.media
+package dev.usbharu.hideout.core.domain.exception.media
 
 open class MediaFileSizeException : MediaException {
     constructor() : super()

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeIsZeroException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception.media
+package dev.usbharu.hideout.core.domain.exception.media
 
 class MediaFileSizeIsZeroException : MediaFileSizeException {
     constructor() : super()

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaSaveException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception.media
+package dev.usbharu.hideout.core.domain.exception.media
 
 open class MediaSaveException : MediaException {
     constructor() : super()

src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/UnsupportedMediaException.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.exception.media
+package dev.usbharu.hideout.core.domain.exception.media
 
 class UnsupportedMediaException : MediaException {
     constructor() : super()

src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/Media.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.domain.model.hideout.entity
+package dev.usbharu.hideout.core.domain.model.media
 
-import dev.usbharu.hideout.domain.model.hideout.dto.FileType
+import dev.usbharu.hideout.core.service.media.FileType
 
 data class Media(
     val id: Long,

src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/MediaRepository.kt

@@ -1,6 +1,4 @@
-package dev.usbharu.hideout.repository
+package dev.usbharu.hideout.core.domain.model.media
-
-import dev.usbharu.hideout.domain.model.hideout.entity.Media
 
 interface MediaRepository {
     suspend fun generateId(): Long

src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Jwt.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.domain.model.hideout.entity
+package dev.usbharu.hideout.core.domain.model.meta
 
 import java.util.*
 

src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Meta.kt

@@ -0,0 +1,3 @@
+package dev.usbharu.hideout.core.domain.model.meta
+
+data class Meta(val version: String, val jwt: Jwt)

src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/MetaRepository.kt

@@ -1,6 +1,5 @@
-package dev.usbharu.hideout.repository
+package dev.usbharu.hideout.core.domain.model.meta
 
-import dev.usbharu.hideout.domain.model.hideout.entity.Meta
 import org.springframework.stereotype.Repository
 
 @Repository

src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.domain.model.hideout.entity
+package dev.usbharu.hideout.core.domain.model.post
 
-import dev.usbharu.hideout.config.CharacterLimit
+import dev.usbharu.hideout.application.config.CharacterLimit
 import org.springframework.stereotype.Component
 
 data class Post private constructor(