refactor: 도메인에서 Entity 의존성 제거 및 Mapper 분리

Author: Marin-yeeunj

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/address/entity/UserAddressEntity.kt

@@ -11,7 +11,6 @@ import org.springframework.data.annotation.LastModifiedBy
 import org.springframework.data.annotation.LastModifiedDate
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
 import java.time.LocalDateTime
-import java.util.UUID
 
 @Entity
 @Table(name = "user_address")

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/address/mapper/UserAddressMapper.kt

@@ -0,0 +1,45 @@
+package com.nearpick.app.domain.address.mapper
+
+import com.nearpick.app.domain.address.entity.UserAddressEntity
+import com.nearpick.app.domain.address.service.UserAddress
+import org.springframework.stereotype.Component
+import java.util.UUID
+
+@Component
+class UserAddressMapper {
+    fun toEntity(domain: UserAddress): UserAddressEntity {
+        return UserAddressEntity(
+            id = domain.id ?: UUID.randomUUID().toString(),
+            userId = domain.userId,
+            name = domain.name,
+            receiverName = domain.receiverName,
+            phoneNumber = domain.phoneNumber,
+            fullAddress = domain.fullAddress,
+            addressDetail = domain.addressDetail,
+            province = domain.province,
+            district = domain.district,
+            neighborhood = domain.neighborhood,
+            street = domain.street,
+            buildingNumber = domain.buildingNumber,
+            isDefault = domain.isDefault ?: false
+        )
+    }
+
+    fun toDomain(entity: UserAddressEntity): UserAddress {
+        return UserAddress(
+            id = entity.id,
+            userId = entity.userId,
+            name = entity.name,
+            receiverName = entity.receiverName,
+            phoneNumber = entity.phoneNumber,
+            fullAddress = entity.fullAddress,
+            addressDetail = entity.addressDetail,
+            province = entity.province,
+            district = entity.district,
+            neighborhood = entity.neighborhood,
+            street = entity.street,
+            buildingNumber = entity.buildingNumber,
+            isDefault = entity.isDefault
+        )
+    }
+}

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/address/mapper/UserAddressResponseMapper.kt

@@ -0,0 +1,20 @@
+package com.nearpick.app.domain.address.mapper
+
+import com.nearpick.app.domain.address.dto.UserAddressResponse
+import com.nearpick.app.domain.address.service.UserAddress
+import org.springframework.stereotype.Component
+
+@Component
+class UserAddressResponseMapper {
+    fun toResponse(address: UserAddress): UserAddressResponse {
+        return UserAddressResponse(
+            id = address.id,
+            name = address.name,
+            receiverName = address.receiverName,
+            phoneNumber = address.phoneNumber,
+            fullAddress = address.fullAddress,
+            addressDetail = address.addressDetail,
+            isDefault = address.isDefault
+        )
+    }
+}

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/address/service/UserAddress.kt

@@ -2,15 +2,10 @@ package com.nearpick.app.domain.address.service
 
 import com.nearpick.app.common.exception.InvalidPhoneNumberException
 import com.nearpick.app.common.validator.Validator
-import com.nearpick.app.domain.address.dto.CreateUserAddressRequest
-import com.nearpick.app.domain.address.dto.UpdateUserAddressRequest
-import com.nearpick.app.domain.address.dto.UserAddressResponse
-import com.nearpick.app.domain.address.entity.UserAddressEntity
-import java.util.*
 
 
 class UserAddress(
-    val id: String?= null,
+    val id: String? = null,
     val userId: String,
     var name: String? = null,
     var receiverName: String? = null,
@@ -22,7 +17,7 @@ class UserAddress(
     val neighborhood: String? = null,
     val street: String? = null,
     val buildingNumber: String? = null,
-    var isDefault: Boolean? = false,
+    var isDefault: Boolean = false,
 ) {
     init {
         val num = phoneNumber
@@ -31,62 +26,18 @@ class UserAddress(
         }
     }
 
-    fun update(request: UpdateUserAddressRequest) {
-        this.name = request.name ?: this.name
-        this.receiverName = request.receiverName ?: this.receiverName
-        this.phoneNumber = request.phoneNumber ?: this.phoneNumber
-        this.addressDetail = request.addressDetail ?: this.addressDetail
-        this.isDefault = request.isDefault ?: this.isDefault
-    }
-
-    fun toEntity(): UserAddressEntity {
-        return UserAddressEntity(
-            id = id?: UUID.randomUUID().toString(),
-            userId = userId,
-            name = name,
-            receiverName = receiverName,
-            phoneNumber = phoneNumber,
-            fullAddress = fullAddress,
-            addressDetail = addressDetail,
-            province = province,
-            district = district,
-            neighborhood = neighborhood,
-            street = street,
-            buildingNumber = buildingNumber,
-            isDefault = isDefault ?: false
-        )
-    }
-
-    companion object {
-        fun from(userAddressEntity: UserAddressEntity): UserAddress {
-            return UserAddress(
-                id = userAddressEntity.id,
-                userId = userAddressEntity.userId,
-                name = userAddressEntity.name,
-                receiverName = userAddressEntity.receiverName,
-                phoneNumber = userAddressEntity.phoneNumber,
-                fullAddress = userAddressEntity.fullAddress,
-                addressDetail = userAddressEntity.addressDetail,
-                province = userAddressEntity.province,
-                district = userAddressEntity.district,
-                neighborhood = userAddressEntity.neighborhood,
-                street = userAddressEntity.street,
-                buildingNumber = userAddressEntity.buildingNumber,
-                isDefault = userAddressEntity.isDefault
-            )
-        }
-
-        fun toResponse(address: UserAddressEntity): UserAddressResponse {
-            return UserAddressResponse(
-                id = address.id,
-                name = address.name,
-                receiverName = address.receiverName,
-                phoneNumber = address.phoneNumber,
-                fullAddress = address.fullAddress,
-                addressDetail = address.addressDetail,
-                isDefault = address.isDefault
-            )
-        }
+    fun update(
+        name: String?,
+        receiverName: String?,
+        phoneNumber: String?,
+        addressDetail: String?,
+        isDefault: Boolean?
+    ) {
+        this.name = name ?: this.name
+        this.receiverName = receiverName ?: this.receiverName
+        this.phoneNumber = phoneNumber ?: this.phoneNumber
+        this.addressDetail = addressDetail ?: this.addressDetail
+        this.isDefault = isDefault ?: this.isDefault
     }
 }
 

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/address/service/UserAddressServiceImpl.kt

@@ -4,14 +4,18 @@ import com.nearpick.app.common.exception.UserAddressNotFoundException
 import com.nearpick.app.domain.address.dto.CreateUserAddressRequest
 import com.nearpick.app.domain.address.dto.UpdateUserAddressRequest
 import com.nearpick.app.domain.address.dto.UserAddressResponse
+import com.nearpick.app.domain.address.mapper.UserAddressMapper
+import com.nearpick.app.domain.address.mapper.UserAddressResponseMapper
 import com.nearpick.app.domain.address.repository.UserAddressRepository
 import org.springframework.transaction.annotation.Transactional
 import org.springframework.stereotype.Service
 
 @Service
 @Transactional(readOnly = false)
 open class UserAddressServiceImpl(
-    private val userAddressRepository: UserAddressRepository
+    private val userAddressRepository: UserAddressRepository,
+    private val userAddressMapper: UserAddressMapper,
+    private val userAddressResponseMapper: UserAddressResponseMapper,
 ) : UserAddressService {
 
 
@@ -32,29 +36,41 @@ open class UserAddressServiceImpl(
             isDefault = false
         )
 
-        return UserAddress.toResponse(userAddressRepository.save(userAddress.toEntity()))
+        val entity = userAddressMapper.toEntity(userAddress)
+        userAddressRepository.save(entity)
+
+        return userAddressResponseMapper.toResponse(userAddress)
     }
 
     @Transactional(readOnly = true)
     override fun findAllUserAddressByUserId(userId: String): List<UserAddressResponse> {
-        return userAddressRepository.findAllByUserId(userId).map { UserAddress.toResponse(it) }
+        return userAddressRepository.findAllByUserId(userId)
+            .map { userAddressResponseMapper.toResponse(userAddressMapper.toDomain(it)) }
     }
 
     override fun updateUserAddress(id: String, userId: String, request: UpdateUserAddressRequest): UserAddressResponse {
-        val userAddressEntity =
-            userAddressRepository.findByIdAndUserId(id, userId) ?: throw UserAddressNotFoundException(id, userId)
-        val userAddress = UserAddress.from(userAddressEntity)
+        val entity = userAddressRepository.findByIdAndUserId(id, userId)
+            ?: throw UserAddressNotFoundException(id, userId)
+
+        val userAddress = userAddressMapper.toDomain(entity)
 
-        userAddress.update(request)
+        userAddress.update(
+            request.name,
+            request.receiverName,
+            request.phoneNumber,
+            request.addressDetail,
+            request.isDefault
+        )
 
-        return UserAddress.toResponse(userAddressRepository.save(userAddress.toEntity()))
+        val updatedEntity = userAddressMapper.toEntity(userAddress)
+        userAddressRepository.save(updatedEntity)
+
+        return userAddressResponseMapper.toResponse(userAddress)
     }
 
     override fun deleteUserAddress(id: String, userId: String) {
-        val address = userAddressRepository.findByIdAndUserId(id, userId) ?: throw UserAddressNotFoundException(
-            id,
-            userId
-        )
+        val address = userAddressRepository.findByIdAndUserId(id, userId)
+            ?: throw UserAddressNotFoundException(id, userId)
 
         userAddressRepository.delete(address)
     }

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/brand/entity/BrandEntity.kt

@@ -1,8 +1,5 @@
 package com.nearpick.app.domain.brand.entity
 
-import com.nearpick.app.domain.brand.dto.BrandResponse
-import com.nearpick.app.domain.brand.dto.CreateBrandRequest
-import com.nearpick.app.domain.brand.dto.GetBrandDetailResponse
 import com.nearpick.app.domain.user.entity.UserEntity
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
@@ -18,7 +15,6 @@ import org.springframework.data.annotation.LastModifiedBy
 import org.springframework.data.annotation.LastModifiedDate
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
 import java.time.LocalDateTime
-import java.util.UUID
 
 @Entity
 @Table(name = "Brand")

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/brand/service/BrandServiceImpl.kt

@@ -3,20 +3,16 @@ package com.nearpick.app.domain.brand.service
 import com.nearpick.app.common.exception.BrandAlreadyExistsException
 import com.nearpick.app.domain.brand.dto.BrandResponse
 import com.nearpick.app.domain.brand.dto.CreateBrandRequest
-import com.nearpick.app.domain.brand.entity.BrandEntity
 import com.nearpick.app.domain.brand.repository.BrandRepository
 import com.nearpick.app.common.exception.BrandNotFoundException
-import com.nearpick.app.common.exception.UserNotFoundException
 import com.nearpick.app.domain.brand.dto.GetBrandDetailResponse
 import com.nearpick.app.domain.brand.dto.UpdateBrandRequest
 import com.nearpick.app.domain.brand.mapper.BrandMapper
 import com.nearpick.app.domain.brand.mapper.BrandResponseMapper
 import com.nearpick.app.domain.user.mapper.UserMapper
 import com.nearpick.app.domain.user.mapper.UserResponseMapper
-import com.nearpick.app.domain.user.repository.UserRepository
 import org.springframework.transaction.annotation.Transactional
 import org.springframework.stereotype.Service
-import kotlin.jvm.optionals.getOrElse
 
 @Service
 @Transactional(readOnly = false)
@@ -49,8 +45,7 @@ open class BrandServiceImpl(
         val entity = brandMapper.toEntity(brand)
         brandRepository.save(entity)
 
-        val savedBrand = brandMapper.toDomain(entity)
-        return brandResponseMapper.toResponse(savedBrand)
+        return brandResponseMapper.toResponse(brand)
     }
 
     @Transactional(readOnly = true)

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/product/entity/ProductEntity.kt

@@ -1,14 +1,9 @@
 package com.nearpick.app.domain.product.entity
 
 import com.nearpick.app.domain.brand.entity.BrandEntity
-import com.nearpick.app.domain.brand.service.Brand
-import com.nearpick.app.domain.product.dto.CreateProductRequest
-import com.nearpick.app.domain.product.dto.GetProductDetailResponse
-import com.nearpick.app.domain.product.dto.ProductResponse
 import com.nearpick.app.domain.product.enum.ProductStatus
 import com.nearpick.app.domain.product.enum.ProductType
 import com.nearpick.app.domain.user.entity.UserEntity
-import com.nearpick.app.domain.user.service.User
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
 import jakarta.persistence.EntityListeners
@@ -26,7 +21,6 @@ import org.springframework.data.annotation.LastModifiedDate
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
 import java.math.BigInteger
 import java.time.LocalDateTime
-import java.util.UUID
 
 @Entity
 @Table(name = "product")

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/product/repository/ProductRepository.kt

@@ -1,6 +1,5 @@
 package com.nearpick.app.domain.product.repository
 
-import com.nearpick.app.domain.brand.entity.BrandEntity
 import com.nearpick.app.domain.product.entity.ProductEntity
 import org.springframework.data.jpa.repository.JpaRepository
 

domain-nearpick/src/main/kotlin/com/nearpick/app/domain/product/service/ProductServiceImpl.kt

@@ -50,8 +50,7 @@ open class ProductServiceImpl(
         val entity = productMapper.toEntity(product)
         productRepository.save(entity)
 
-        val savedProduct = productMapper.toDomain(entity)
-        return productResponseMapper.toResponse(savedProduct)
+        return productResponseMapper.toResponse(product)
     }
 
     @Transactional(readOnly = true)
@@ -92,6 +91,7 @@ open class ProductServiceImpl(
             request.productType,
             request.reservationDeadline
         )
+
         val updatedEntity = productMapper.toEntity(product)
         productRepository.save(updatedEntity)