From d369c68d94ab6e249cade3a5cb7dbcb34b0dc383 Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Fri, 28 Apr 2023 13:56:46 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20User=E3=82=92=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../usbharu/hideout/domain/model/{ => hideout/entity}/User.kt  | 2 +-
 .../kotlin/dev/usbharu/hideout/repository/IUserRepository.kt   | 2 +-
 .../kotlin/dev/usbharu/hideout/repository/UserRepository.kt    | 3 +--
 .../hideout/service/activitypub/ActivityPubUserServiceImpl.kt  | 3 +--
 .../kotlin/dev/usbharu/hideout/service/impl/UserAuthService.kt | 2 +-
 .../kotlin/dev/usbharu/hideout/service/impl/UserService.kt     | 2 +-
 .../kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt    | 3 +--
 src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt  | 3 +--
 .../dev/usbharu/hideout/repository/UserRepositoryTest.kt       | 2 +-
 .../service/activitypub/ActivityPubFollowServiceImplTest.kt    | 3 +--
 .../service/activitypub/ActivityPubNoteServiceImplTest.kt      | 2 +-
 11 files changed, 11 insertions(+), 16 deletions(-)
 rename src/main/kotlin/dev/usbharu/hideout/domain/model/{ => hideout/entity}/User.kt (86%)

diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/User.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/hideout/entity/User.kt
similarity index 86%
rename from src/main/kotlin/dev/usbharu/hideout/domain/model/User.kt
rename to src/main/kotlin/dev/usbharu/hideout/domain/model/hideout/entity/User.kt
index 3f54f7bb..319d1f8c 100644
--- a/src/main/kotlin/dev/usbharu/hideout/domain/model/User.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/hideout/entity/User.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.domain.model
+package dev.usbharu.hideout.domain.model.hideout.entity
 
 import java.time.Instant
 
diff --git a/src/main/kotlin/dev/usbharu/hideout/repository/IUserRepository.kt b/src/main/kotlin/dev/usbharu/hideout/repository/IUserRepository.kt
index 58d56ba9..1f198526 100644
--- a/src/main/kotlin/dev/usbharu/hideout/repository/IUserRepository.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/repository/IUserRepository.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.repository
 
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 
 interface IUserRepository {
     suspend fun save(user: User): User
diff --git a/src/main/kotlin/dev/usbharu/hideout/repository/UserRepository.kt b/src/main/kotlin/dev/usbharu/hideout/repository/UserRepository.kt
index a1ff7791..8ab5cce7 100644
--- a/src/main/kotlin/dev/usbharu/hideout/repository/UserRepository.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/repository/UserRepository.kt
@@ -1,7 +1,6 @@
 package dev.usbharu.hideout.repository
 
-import dev.usbharu.hideout.domain.model.User
-import dev.usbharu.hideout.repository.UsersFollowers
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.service.IdGenerateService
 import kotlinx.coroutines.Dispatchers
 import org.jetbrains.exposed.dao.id.LongIdTable
diff --git a/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt
index 11e855c0..71e10238 100644
--- a/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt
@@ -2,7 +2,7 @@ package dev.usbharu.hideout.service.activitypub
 
 import com.fasterxml.jackson.module.kotlin.readValue
 import dev.usbharu.hideout.config.Config
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.domain.model.ap.Image
 import dev.usbharu.hideout.domain.model.ap.Key
 import dev.usbharu.hideout.domain.model.ap.Person
@@ -17,7 +17,6 @@ import io.ktor.client.statement.*
 import io.ktor.http.*
 import org.slf4j.LoggerFactory
 import java.time.Instant
-import java.time.LocalDateTime
 
 class ActivityPubUserServiceImpl(
     private val userService: UserService,
diff --git a/src/main/kotlin/dev/usbharu/hideout/service/impl/UserAuthService.kt b/src/main/kotlin/dev/usbharu/hideout/service/impl/UserAuthService.kt
index 0d217de1..cd2d6ccb 100644
--- a/src/main/kotlin/dev/usbharu/hideout/service/impl/UserAuthService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/service/impl/UserAuthService.kt
@@ -1,7 +1,7 @@
 package dev.usbharu.hideout.service.impl
 
 import dev.usbharu.hideout.config.Config
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.exception.UserNotFoundException
 import dev.usbharu.hideout.repository.IUserRepository
 import dev.usbharu.hideout.service.IUserAuthService
diff --git a/src/main/kotlin/dev/usbharu/hideout/service/impl/UserService.kt b/src/main/kotlin/dev/usbharu/hideout/service/impl/UserService.kt
index 09af8fc4..7c426341 100644
--- a/src/main/kotlin/dev/usbharu/hideout/service/impl/UserService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/service/impl/UserService.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.service.impl
 
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.exception.UserNotFoundException
 import dev.usbharu.hideout.repository.IUserRepository
 import java.lang.Integer.min
diff --git a/src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt b/src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt
index f110cf35..de740d9a 100644
--- a/src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.plugins
 
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.domain.model.ap.JsonLd
 import dev.usbharu.hideout.repository.IUserRepository
 import dev.usbharu.hideout.service.impl.toPem
@@ -11,7 +11,6 @@ import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Test
 import java.security.KeyPairGenerator
 import java.time.Instant
-import java.time.LocalDateTime
 
 class ActivityPubKtTest {
     @Test
diff --git a/src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt b/src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt
index 08a1bdac..331e7b5e 100644
--- a/src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt
@@ -1,12 +1,11 @@
 package dev.usbharu.hideout.plugins
 
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.repository.IUserRepository
 import dev.usbharu.hideout.service.impl.toPem
 import org.junit.jupiter.api.Test
 import java.security.KeyPairGenerator
 import java.time.Instant
-import java.time.LocalDateTime
 
 class KtorKeyMapTest {
 
diff --git a/src/test/kotlin/dev/usbharu/hideout/repository/UserRepositoryTest.kt b/src/test/kotlin/dev/usbharu/hideout/repository/UserRepositoryTest.kt
index a1c3bfeb..36bbcf4d 100644
--- a/src/test/kotlin/dev/usbharu/hideout/repository/UserRepositoryTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/repository/UserRepositoryTest.kt
@@ -2,7 +2,7 @@
 
 package dev.usbharu.hideout.repository
 
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.service.IdGenerateService
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
diff --git a/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImplTest.kt
index cb012e10..c50749f1 100644
--- a/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImplTest.kt
@@ -6,7 +6,7 @@ package dev.usbharu.hideout.service.activitypub
 import com.fasterxml.jackson.module.kotlin.readValue
 import dev.usbharu.hideout.config.Config
 import dev.usbharu.hideout.config.ConfigData
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.domain.model.ap.*
 import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
 import dev.usbharu.hideout.service.impl.UserService
@@ -24,7 +24,6 @@ import org.mockito.ArgumentMatchers.anyString
 import org.mockito.kotlin.*
 import utils.JsonObjectMapper
 import java.time.Instant
-import java.time.LocalDateTime
 
 class ActivityPubFollowServiceImplTest {
     @Test
diff --git a/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubNoteServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubNoteServiceImplTest.kt
index ec1fa5ee..a0a85f3c 100644
--- a/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubNoteServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubNoteServiceImplTest.kt
@@ -6,7 +6,7 @@ package dev.usbharu.hideout.service.activitypub
 import dev.usbharu.hideout.config.Config
 import dev.usbharu.hideout.config.ConfigData
 import dev.usbharu.hideout.domain.model.PostEntity
-import dev.usbharu.hideout.domain.model.User
+import dev.usbharu.hideout.domain.model.hideout.entity.User
 import dev.usbharu.hideout.domain.model.job.DeliverPostJob
 import dev.usbharu.hideout.service.impl.UserService
 import dev.usbharu.hideout.service.job.JobQueueParentService