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

---
 .../usbharu/hideout/domain/model/UsersFollowers.kt  | 13 -------------
 .../usbharu/hideout/repository/UserRepository.kt    | 12 +++++++++++-
 .../hideout/repository/UserRepositoryTest.kt        |  1 -
 3 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 src/main/kotlin/dev/usbharu/hideout/domain/model/UsersFollowers.kt

diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/UsersFollowers.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/UsersFollowers.kt
deleted file mode 100644
index ede23ade..00000000
--- a/src/main/kotlin/dev/usbharu/hideout/domain/model/UsersFollowers.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package dev.usbharu.hideout.domain.model
-
-import dev.usbharu.hideout.repository.Users
-import org.jetbrains.exposed.dao.id.LongIdTable
-
-object UsersFollowers : LongIdTable("users_followers") {
-    val userId = long("user_id").references(Users.id).index()
-    val followerId = long("follower_id").references(Users.id)
-
-    init {
-        uniqueIndex(userId, followerId)
-    }
-}
diff --git a/src/main/kotlin/dev/usbharu/hideout/repository/UserRepository.kt b/src/main/kotlin/dev/usbharu/hideout/repository/UserRepository.kt
index ceb6db1b..a1ff7791 100644
--- a/src/main/kotlin/dev/usbharu/hideout/repository/UserRepository.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/repository/UserRepository.kt
@@ -1,9 +1,10 @@
 package dev.usbharu.hideout.repository
 
 import dev.usbharu.hideout.domain.model.User
-import dev.usbharu.hideout.domain.model.UsersFollowers
+import dev.usbharu.hideout.repository.UsersFollowers
 import dev.usbharu.hideout.service.IdGenerateService
 import kotlinx.coroutines.Dispatchers
+import org.jetbrains.exposed.dao.id.LongIdTable
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
@@ -229,3 +230,12 @@ fun ResultRow.toUser(): User {
         Instant.ofEpochMilli((this[Users.createdAt]))
     )
 }
+
+object UsersFollowers : LongIdTable("users_followers") {
+    val userId = long("user_id").references(Users.id).index()
+    val followerId = long("follower_id").references(Users.id)
+
+    init {
+        uniqueIndex(userId, followerId)
+    }
+}
diff --git a/src/test/kotlin/dev/usbharu/hideout/repository/UserRepositoryTest.kt b/src/test/kotlin/dev/usbharu/hideout/repository/UserRepositoryTest.kt
index 43dc236e..a1c3bfeb 100644
--- a/src/test/kotlin/dev/usbharu/hideout/repository/UserRepositoryTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/repository/UserRepositoryTest.kt
@@ -3,7 +3,6 @@
 package dev.usbharu.hideout.repository
 
 import dev.usbharu.hideout.domain.model.User
-import dev.usbharu.hideout.domain.model.UsersFollowers
 import dev.usbharu.hideout.service.IdGenerateService
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest