refactor: 서비스 계층 어플리케이션 레이어로 분리

soma-baekgu · Dltmd202 · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024
commit 9171d992aef565caa5ed0db2a6a0b0cd56474b23
diff --git a/api/src/main/kotlin/com/backgu/amaker/api/auth/controller/AuthApiController.kt b/api/src/main/kotlin/com/backgu/amaker/api/auth/controller/AuthApiController.kt
@@ -4,7 +4,7 @@ import com.backgu.amaker.api.auth.config.AuthConfig
 import com.backgu.amaker.api.auth.dto.response.JwtTokenResponse
 import com.backgu.amaker.api.auth.dto.response.OAuthUrlResponse
 import com.backgu.amaker.api.auth.service.AuthFacadeService
-import com.backgu.amaker.api.common.infra.ApiHandler
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.http.response.ApiResult
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/auth/dto/oauth/google/GoogleUserInfoDto.kt b/api/src/main/kotlin/com/backgu/amaker/api/auth/dto/oauth/google/GoogleUserInfoDto.kt
@@ -1,6 +1,6 @@
 package com.backgu.amaker.api.auth.dto.oauth.google
 
-import com.backgu.amaker.api.common.service.IdPublisher
+import com.backgu.amaker.common.id.IdPublisher
 import com.backgu.amaker.domain.user.User
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/auth/service/AuthFacadeService.kt b/api/src/main/kotlin/com/backgu/amaker/api/auth/service/AuthFacadeService.kt
@@ -2,8 +2,8 @@ package com.backgu.amaker.api.auth.service
 
 import com.backgu.amaker.api.auth.dto.JwtTokenDto
 import com.backgu.amaker.api.auth.dto.oauth.google.GoogleUserInfoDto
-import com.backgu.amaker.api.common.service.IdPublisher
-import com.backgu.amaker.api.user.service.UserService
+import com.backgu.amaker.application.user.service.UserService
+import com.backgu.amaker.common.id.IdPublisher
 import com.backgu.amaker.common.security.jwt.component.JwtComponent
 import com.backgu.amaker.domain.user.User
 import org.springframework.stereotype.Service

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/auth/service/AuthService.kt b/api/src/main/kotlin/com/backgu/amaker/api/auth/service/AuthService.kt
@@ -5,7 +5,7 @@ import com.backgu.amaker.api.auth.dto.oauth.google.GoogleOAuth2AccessTokenDto
 import com.backgu.amaker.api.auth.dto.oauth.google.GoogleUserInfoDto
 import com.backgu.amaker.api.auth.infra.GoogleApiClient
 import com.backgu.amaker.api.auth.infra.GoogleOAuthClient
-import com.backgu.amaker.api.common.exception.BusinessException
+import com.backgu.amaker.common.exception.BusinessException
 import com.backgu.amaker.common.status.StatusCode
 import org.springframework.stereotype.Service
 

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/chat/config/ChatServiceConfig.kt b/api/src/main/kotlin/com/backgu/amaker/api/chat/config/ChatServiceConfig.kt
@@ -0,0 +1,26 @@
+package com.backgu.amaker.api.chat.config
+
+import com.backgu.amaker.application.chat.service.ChatRoomService
+import com.backgu.amaker.application.chat.service.ChatRoomUserService
+import com.backgu.amaker.application.chat.service.ChatService
+import com.backgu.amaker.infra.jpa.chat.repository.ChatRepository
+import com.backgu.amaker.infra.jpa.chat.repository.ChatRoomRepository
+import com.backgu.amaker.infra.jpa.chat.repository.ChatRoomUserRepository
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class ChatServiceConfig(
+    val chatRepository: ChatRepository,
+    val chatRoomUserRepository: ChatRoomUserRepository,
+    val chatRoomRepository: ChatRoomRepository,
+) {
+    @Bean
+    fun chatService() = ChatService(chatRepository)
+
+    @Bean
+    fun chatRoomUserService() = ChatRoomUserService(chatRoomUserRepository)
+
+    @Bean
+    fun chatRoomService() = ChatRoomService(chatRoomRepository)
+}
diff --git a/api/src/main/kotlin/com/backgu/amaker/api/chat/controller/ChatController.kt b/api/src/main/kotlin/com/backgu/amaker/api/chat/controller/ChatController.kt
@@ -8,7 +8,7 @@ import com.backgu.amaker.api.chat.dto.request.FileChatCreateRequest
 import com.backgu.amaker.api.chat.dto.response.ChatListResponse
 import com.backgu.amaker.api.chat.dto.response.ChatWithUserResponse
 import com.backgu.amaker.api.chat.service.ChatFacadeService
-import com.backgu.amaker.api.common.infra.ApiHandler
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.http.response.ApiResult
 import com.backgu.amaker.common.security.jwt.authentication.JwtAuthentication
 import com.backgu.amaker.domain.chat.ChatType

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/chat/controller/ChatRoomController.kt b/api/src/main/kotlin/com/backgu/amaker/api/chat/controller/ChatRoomController.kt
@@ -5,7 +5,7 @@ import com.backgu.amaker.api.chat.dto.response.BriefChatRoomResponse
 import com.backgu.amaker.api.chat.dto.response.ChatRoomResponse
 import com.backgu.amaker.api.chat.dto.response.ChatRoomsViewResponse
 import com.backgu.amaker.api.chat.service.ChatRoomFacadeService
-import com.backgu.amaker.api.common.infra.ApiHandler
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.http.response.ApiResult
 import com.backgu.amaker.common.security.jwt.authentication.JwtAuthentication
 import jakarta.validation.Valid

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/chat/service/ChatFacadeService.kt b/api/src/main/kotlin/com/backgu/amaker/api/chat/service/ChatFacadeService.kt
@@ -6,11 +6,15 @@ import com.backgu.amaker.api.chat.dto.ChatQuery
 import com.backgu.amaker.api.chat.dto.ChatWithUserDto
 import com.backgu.amaker.api.chat.dto.DefaultChatWithUserDto
 import com.backgu.amaker.api.chat.dto.EventChatWithUserDto
-import com.backgu.amaker.api.common.exception.BusinessException
+import com.backgu.amaker.api.chat.service.query.ChatQueryService
 import com.backgu.amaker.api.event.dto.EventWithUserDto
-import com.backgu.amaker.api.event.service.EventAssignedUserService
-import com.backgu.amaker.api.event.service.EventService
-import com.backgu.amaker.api.user.service.UserService
+import com.backgu.amaker.application.chat.service.ChatRoomService
+import com.backgu.amaker.application.chat.service.ChatRoomUserService
+import com.backgu.amaker.application.chat.service.ChatService
+import com.backgu.amaker.application.event.service.EventAssignedUserService
+import com.backgu.amaker.application.event.service.EventService
+import com.backgu.amaker.application.user.service.UserService
+import com.backgu.amaker.common.exception.BusinessException
 import com.backgu.amaker.common.status.StatusCode
 import com.backgu.amaker.domain.chat.Chat
 import com.backgu.amaker.domain.chat.ChatRoom
@@ -30,6 +34,7 @@ class ChatFacadeService(
     private val chatService: ChatService,
     private val userService: UserService,
     private val eventService: EventService,
+    private val chatQueryService: ChatQueryService,
     private val eventAssignedUserService: EventAssignedUserService,
 ) {
     @Transactional
@@ -54,7 +59,7 @@ class ChatFacadeService(
         chatQuery: ChatQuery,
     ): ChatListDto {
         markMostRecentChatAsRead(chatQuery.chatRoomId, userId)
-        val chatList = chatService.findPreviousChatList(chatQuery.chatRoomId, chatQuery.cursor, chatQuery.size)
+        val chatList = chatQueryService.findPreviousChatList(chatQuery.chatRoomId, chatQuery.cursor, chatQuery.size)
 
         val eventMap =
             eventService.findEventByIdsToMap(chatList.filter { ChatType.isEventChat(it.chatType) }.map { it.id })
@@ -73,7 +78,7 @@ class ChatFacadeService(
         chatQuery: ChatQuery,
     ): ChatListDto {
         markMostRecentChatAsRead(chatQuery.chatRoomId, userId)
-        val chatList = chatService.findAfterChatList(chatQuery.chatRoomId, chatQuery.cursor, chatQuery.size)
+        val chatList = chatQueryService.findAfterChatList(chatQuery.chatRoomId, chatQuery.cursor, chatQuery.size)
 
         val eventMap =
             eventService.findEventByIdsToMap(chatList.filter { ChatType.isEventChat(it.chatType) }.map { it.id })
@@ -92,7 +97,7 @@ class ChatFacadeService(
         chatRoomId: Long,
     ): ChatWithUserDto<*> {
         val chatRoomUser = markMostRecentChatAsRead(chatRoomId, userId)
-        val chat = chatService.getOneWithUser(chatRoomUser.lastReadChatId)
+        val chat = chatQueryService.getOneWithUser(chatRoomUser.lastReadChatId)
 
         if (!ChatType.isEventChat(chat.chatType)) return chat
 

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/chat/service/ChatRoomFacadeService.kt b/api/src/main/kotlin/com/backgu/amaker/api/chat/service/ChatRoomFacadeService.kt
@@ -5,9 +5,12 @@ import com.backgu.amaker.api.chat.dto.ChatRoomCreateDto
 import com.backgu.amaker.api.chat.dto.ChatRoomDto
 import com.backgu.amaker.api.chat.dto.ChatRoomWithUserDto
 import com.backgu.amaker.api.chat.dto.ChatRoomsViewDto
-import com.backgu.amaker.api.user.service.UserService
-import com.backgu.amaker.api.workspace.service.WorkspaceService
-import com.backgu.amaker.api.workspace.service.WorkspaceUserService
+import com.backgu.amaker.application.chat.service.ChatRoomService
+import com.backgu.amaker.application.chat.service.ChatRoomUserService
+import com.backgu.amaker.application.chat.service.ChatService
+import com.backgu.amaker.application.user.service.UserService
+import com.backgu.amaker.application.workspace.WorkspaceService
+import com.backgu.amaker.application.workspace.WorkspaceUserService
 import com.backgu.amaker.domain.chat.Chat
 import com.backgu.amaker.domain.chat.ChatRoom
 import com.backgu.amaker.domain.chat.ChatRoomUser

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/chat/service/query/ChatQueryService.kt b/api/src/main/kotlin/com/backgu/amaker/api/chat/service/query/ChatQueryService.kt
@@ -0,0 +1,37 @@
+package com.backgu.amaker.api.chat.service.query
+
+import com.backgu.amaker.api.chat.dto.DefaultChatWithUserDto
+import com.backgu.amaker.common.exception.BusinessException
+import com.backgu.amaker.common.status.StatusCode
+import com.backgu.amaker.infra.jpa.chat.repository.ChatRepository
+import org.springframework.stereotype.Service
+
+@Service
+class ChatQueryService(
+    private val chatRepository: ChatRepository,
+) {
+    fun findPreviousChatList(
+        chatRoomId: Long,
+        cursor: Long,
+        size: Int,
+    ): List<DefaultChatWithUserDto> =
+        chatRepository
+            .findTopByChatRoomIdLittleThanCursorLimitCountWithUser(chatRoomId, cursor, size)
+            .asReversed()
+            .map { DefaultChatWithUserDto.of(it) }
+
+    fun findAfterChatList(
+        chatRoomId: Long,
+        cursor: Long,
+        size: Int,
+    ): List<DefaultChatWithUserDto> =
+        chatRepository
+            .findTopByChatRoomIdGreaterThanCursorLimitCountWithUser(chatRoomId, cursor, size)
+            .map { DefaultChatWithUserDto.of(it) }
+
+    fun getOneWithUser(chatId: Long?): DefaultChatWithUserDto =
+        DefaultChatWithUserDto.of(
+            chatId?.let { chatRepository.findByIdWithUser(it) }
+                ?: throw BusinessException(StatusCode.CHAT_NOT_FOUND),
+        )
+}
diff --git a/api/src/main/kotlin/com/backgu/amaker/api/common/config/CommonAppConfig.kt b/api/src/main/kotlin/com/backgu/amaker/api/common/config/CommonAppConfig.kt
@@ -0,0 +1,27 @@
+package com.backgu.amaker.api.common.config
+
+import com.backgu.amaker.common.clock.ClockHolder
+import com.backgu.amaker.common.http.ApiHandler
+import com.backgu.amaker.common.id.IdPublisher
+import com.backgu.amaker.infra.common.clock.SystemClockHolder
+import com.backgu.amaker.infra.common.id.UUIDIdPublisher
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class CommonAppConfig {
+    @Bean
+    fun clockHolder(): ClockHolder = SystemClockHolder()
+
+    @Bean
+    fun idPublisher(): IdPublisher = UUIDIdPublisher()
+
+    @Bean
+    fun apiHandler(
+        request: HttpServletRequest,
+        response: HttpServletResponse,
+        clockHolder: ClockHolder,
+    ): ApiHandler = ApiHandler(request, response, clockHolder)
+}
diff --git a/api/src/main/kotlin/com/backgu/amaker/api/common/exception/GlobalExceptionHandler.kt b/api/src/main/kotlin/com/backgu/amaker/api/common/exception/GlobalExceptionHandler.kt
@@ -1,6 +1,7 @@
 package com.backgu.amaker.api.common.exception
 
-import com.backgu.amaker.api.common.infra.ApiHandler
+import com.backgu.amaker.common.exception.BusinessException
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.http.response.ApiError
 import com.backgu.amaker.common.status.StatusCode
 import io.github.oshai.kotlinlogging.KotlinLogging

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/event/config/EventServiceConfig.kt b/api/src/main/kotlin/com/backgu/amaker/api/event/config/EventServiceConfig.kt
@@ -0,0 +1,29 @@
+package com.backgu.amaker.api.event.config
+
+import com.backgu.amaker.application.event.service.EventAssignedUserService
+import com.backgu.amaker.application.event.service.EventService
+import com.backgu.amaker.application.event.service.ReplyCommentService
+import com.backgu.amaker.application.event.service.ReplyEventService
+import com.backgu.amaker.infra.jpa.event.repository.EventAssignedUserRepository
+import com.backgu.amaker.infra.jpa.event.repository.EventRepository
+import com.backgu.amaker.infra.jpa.event.repository.ReplyCommentRepository
+import com.backgu.amaker.infra.jpa.event.repository.ReplyEventRepository
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class EventServiceConfig {
+    @Bean
+    fun replyEventService(replyEventRepository: ReplyEventRepository): ReplyEventService = ReplyEventService(replyEventRepository)
+
+    @Bean
+    fun eventAssignedUserService(eventAssignedUserRepository: EventAssignedUserRepository): EventAssignedUserService =
+        EventAssignedUserService(eventAssignedUserRepository)
+
+    @Bean
+    fun replyCommentService(replyCommentRepository: ReplyCommentRepository): ReplyCommentService =
+        ReplyCommentService(replyCommentRepository)
+
+    @Bean
+    fun eventService(eventRepository: EventRepository): EventService = EventService(eventRepository)
+}
diff --git a/api/src/main/kotlin/com/backgu/amaker/api/event/controller/EventCommentController.kt b/api/src/main/kotlin/com/backgu/amaker/api/event/controller/EventCommentController.kt
@@ -1,11 +1,11 @@
 package com.backgu.amaker.api.event.controller
 
-import com.backgu.amaker.api.common.infra.ApiHandler
 import com.backgu.amaker.api.event.dto.query.ReplyQueryRequest
 import com.backgu.amaker.api.event.dto.request.ReplyCommentCreateRequest
 import com.backgu.amaker.api.event.dto.response.ReplyCommentWithUserResponse
 import com.backgu.amaker.api.event.dto.response.ReplyCommentsViewResponse
 import com.backgu.amaker.api.event.service.EventCommentFacadeService
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.http.response.ApiResult
 import com.backgu.amaker.common.http.response.PageResponse
 import com.backgu.amaker.common.security.jwt.authentication.JwtAuthentication

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/event/controller/EventController.kt b/api/src/main/kotlin/com/backgu/amaker/api/event/controller/EventController.kt
@@ -1,9 +1,9 @@
 package com.backgu.amaker.api.event.controller
 
-import com.backgu.amaker.api.common.infra.ApiHandler
 import com.backgu.amaker.api.event.dto.request.ReplyEventCreateRequest
 import com.backgu.amaker.api.event.dto.response.ReplyEventDetailResponse
 import com.backgu.amaker.api.event.service.EventFacadeService
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.http.response.ApiResult
 import com.backgu.amaker.common.security.jwt.authentication.JwtAuthentication
 import jakarta.validation.Valid

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/event/service/EventCommentFacadeService.kt b/api/src/main/kotlin/com/backgu/amaker/api/event/service/EventCommentFacadeService.kt
@@ -1,13 +1,16 @@
 package com.backgu.amaker.api.event.service
 
-import com.backgu.amaker.api.chat.service.ChatRoomService
-import com.backgu.amaker.api.chat.service.ChatService
-import com.backgu.amaker.api.common.exception.BusinessException
 import com.backgu.amaker.api.event.dto.ReplyCommentCreateDto
 import com.backgu.amaker.api.event.dto.ReplyCommentDto
 import com.backgu.amaker.api.event.dto.ReplyCommentWithUserDto
-import com.backgu.amaker.api.user.service.UserService
-import com.backgu.amaker.api.workspace.service.WorkspaceUserService
+import com.backgu.amaker.application.chat.service.ChatRoomService
+import com.backgu.amaker.application.chat.service.ChatService
+import com.backgu.amaker.application.event.service.EventAssignedUserService
+import com.backgu.amaker.application.event.service.ReplyCommentService
+import com.backgu.amaker.application.event.service.ReplyEventService
+import com.backgu.amaker.application.user.service.UserService
+import com.backgu.amaker.application.workspace.WorkspaceUserService
+import com.backgu.amaker.common.exception.BusinessException
 import com.backgu.amaker.common.status.StatusCode
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/event/service/EventFacadeService.kt b/api/src/main/kotlin/com/backgu/amaker/api/event/service/EventFacadeService.kt
@@ -1,14 +1,16 @@
 package com.backgu.amaker.api.event.service
 
-import com.backgu.amaker.api.chat.service.ChatRoomService
-import com.backgu.amaker.api.chat.service.ChatRoomUserService
-import com.backgu.amaker.api.chat.service.ChatService
-import com.backgu.amaker.api.common.exception.BusinessException
 import com.backgu.amaker.api.event.dto.ReplyEventCreateDto
 import com.backgu.amaker.api.event.dto.ReplyEventDetailDto
 import com.backgu.amaker.api.event.dto.ReplyEventDto
 import com.backgu.amaker.api.user.dto.UserDto
-import com.backgu.amaker.api.user.service.UserService
+import com.backgu.amaker.application.chat.service.ChatRoomService
+import com.backgu.amaker.application.chat.service.ChatRoomUserService
+import com.backgu.amaker.application.chat.service.ChatService
+import com.backgu.amaker.application.event.service.EventAssignedUserService
+import com.backgu.amaker.application.event.service.ReplyEventService
+import com.backgu.amaker.application.user.service.UserService
+import com.backgu.amaker.common.exception.BusinessException
 import com.backgu.amaker.common.status.StatusCode
 import com.backgu.amaker.domain.chat.Chat
 import com.backgu.amaker.domain.chat.ChatType

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/file/controller/FileController.kt b/api/src/main/kotlin/com/backgu/amaker/api/file/controller/FileController.kt
@@ -1,7 +1,7 @@
 package com.backgu.amaker.api.file.controller
 
-import com.backgu.amaker.api.common.infra.ApiHandler
 import com.backgu.amaker.api.file.service.FileFacadeService
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.http.response.ApiResult
 import com.backgu.amaker.common.security.jwt.authentication.JwtAuthentication
 import org.springframework.http.ResponseEntity

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/file/service/FileFacadeService.kt b/api/src/main/kotlin/com/backgu/amaker/api/file/service/FileFacadeService.kt
@@ -1,6 +1,6 @@
 package com.backgu.amaker.api.file.service
 
-import com.backgu.amaker.api.common.service.IdPublisher
+import com.backgu.amaker.common.id.IdPublisher
 import org.springframework.stereotype.Service
 
 @Service

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/security/config/JwtSecurityConfig.kt b/api/src/main/kotlin/com/backgu/amaker/api/security/config/JwtSecurityConfig.kt
@@ -1,7 +1,7 @@
 package com.backgu.amaker.api.security.config
 
-import com.backgu.amaker.api.common.infra.ApiHandler
 import com.backgu.amaker.api.security.handler.AuthAccessDeniedHandler
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.security.jwt.component.JwtComponent
 import com.backgu.amaker.common.security.jwt.utils.JwtAuthenticationTokenExtractor
 import com.backgu.amaker.common.security.jwt.web.JwtAuthenticationTokenFilter

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/security/handler/AuthAccessDeniedHandler.kt b/api/src/main/kotlin/com/backgu/amaker/api/security/handler/AuthAccessDeniedHandler.kt
@@ -1,6 +1,6 @@
 package com.backgu.amaker.api.security.handler
 
-import com.backgu.amaker.api.common.infra.ApiHandler
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.status.StatusCode
 import com.fasterxml.jackson.databind.ObjectMapper
 import jakarta.servlet.http.HttpServletRequest

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/security/handler/AuthEntryPoint.kt b/api/src/main/kotlin/com/backgu/amaker/api/security/handler/AuthEntryPoint.kt
@@ -1,6 +1,6 @@
 package com.backgu.amaker.api.security.handler
 
-import com.backgu.amaker.api.common.infra.ApiHandler
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.status.StatusCode
 import com.fasterxml.jackson.databind.ObjectMapper
 import jakarta.servlet.http.HttpServletRequest

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/security/jwt/JwtAuthenticationProvider.kt b/api/src/main/kotlin/com/backgu/amaker/api/security/jwt/JwtAuthenticationProvider.kt
@@ -1,6 +1,6 @@
 package com.backgu.amaker.api.security.jwt
 
-import com.backgu.amaker.api.user.service.UserService
+import com.backgu.amaker.application.user.service.UserService
 import com.backgu.amaker.common.security.jwt.authentication.JwtAuthentication
 import com.backgu.amaker.common.security.jwt.authentication.JwtAuthenticationToken
 import com.backgu.amaker.domain.user.User

diff --git a/api/src/main/kotlin/com/backgu/amaker/api/user/config/UserServiceConfig.kt b/api/src/main/kotlin/com/backgu/amaker/api/user/config/UserServiceConfig.kt
@@ -0,0 +1,12 @@
+package com.backgu.amaker.api.user.config
+
+import com.backgu.amaker.application.user.service.UserService
+import com.backgu.amaker.infra.jpa.user.reposotory.UserRepository
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class UserServiceConfig {
+    @Bean
+    fun userService(userRepository: UserRepository): UserService = UserService(userRepository)
+}
diff --git a/api/src/main/kotlin/com/backgu/amaker/api/user/controller/UserController.kt b/api/src/main/kotlin/com/backgu/amaker/api/user/controller/UserController.kt
@@ -1,9 +1,9 @@
 package com.backgu.amaker.api.user.controller
 
-import com.backgu.amaker.api.common.infra.ApiHandler
 import com.backgu.amaker.api.user.dto.request.EmailExistsRequest
 import com.backgu.amaker.api.user.dto.response.EmailExistsResponse
 import com.backgu.amaker.api.user.service.UserFacadeService
+import com.backgu.amaker.common.http.ApiHandler
 import com.backgu.amaker.common.http.response.ApiResult
 import jakarta.validation.Valid
 import org.springframework.http.ResponseEntity