diff --git a/src/main/kotlin/com/study/core/DokiApplication.kt b/src/main/kotlin/com/doki/DokiApplication.kt similarity index 91% rename from src/main/kotlin/com/study/core/DokiApplication.kt rename to src/main/kotlin/com/doki/DokiApplication.kt index 21760fe..b30b16d 100644 --- a/src/main/kotlin/com/study/core/DokiApplication.kt +++ b/src/main/kotlin/com/doki/DokiApplication.kt @@ -1,4 +1,4 @@ -package com.study.core +package com.doki import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication diff --git a/src/main/kotlin/com/study/core/HealthCheckController.kt b/src/main/kotlin/com/doki/HealthCheckController.kt similarity index 93% rename from src/main/kotlin/com/study/core/HealthCheckController.kt rename to src/main/kotlin/com/doki/HealthCheckController.kt index 7b0da0e..eb7e9d4 100644 --- a/src/main/kotlin/com/study/core/HealthCheckController.kt +++ b/src/main/kotlin/com/doki/HealthCheckController.kt @@ -1,4 +1,4 @@ -package com.study.core +package com.doki import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.GetMapping diff --git a/src/main/kotlin/com/study/core/global/BaseEntity.kt b/src/main/kotlin/com/doki/global/BaseEntity.kt similarity index 96% rename from src/main/kotlin/com/study/core/global/BaseEntity.kt rename to src/main/kotlin/com/doki/global/BaseEntity.kt index 2865a3b..d298f27 100644 --- a/src/main/kotlin/com/study/core/global/BaseEntity.kt +++ b/src/main/kotlin/com/doki/global/BaseEntity.kt @@ -1,4 +1,4 @@ -package com.study.core.global +package com.doki.global import jakarta.persistence.Column import jakarta.persistence.EntityListeners diff --git a/src/main/kotlin/com/study/core/global/config/AsyncConfig.kt b/src/main/kotlin/com/doki/global/config/AsyncConfig.kt similarity index 94% rename from src/main/kotlin/com/study/core/global/config/AsyncConfig.kt rename to src/main/kotlin/com/doki/global/config/AsyncConfig.kt index 2117792..3748d00 100644 --- a/src/main/kotlin/com/study/core/global/config/AsyncConfig.kt +++ b/src/main/kotlin/com/doki/global/config/AsyncConfig.kt @@ -1,4 +1,4 @@ -package com.study.core.global.config +package com.doki.global.config import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/src/main/kotlin/com/study/core/global/config/JasyptConfig.kt b/src/main/kotlin/com/doki/global/config/JasyptConfig.kt similarity index 96% rename from src/main/kotlin/com/study/core/global/config/JasyptConfig.kt rename to src/main/kotlin/com/doki/global/config/JasyptConfig.kt index 26aff1a..ddbd599 100644 --- a/src/main/kotlin/com/study/core/global/config/JasyptConfig.kt +++ b/src/main/kotlin/com/doki/global/config/JasyptConfig.kt @@ -1,4 +1,4 @@ -package com.study.core.global.config +package com.doki.global.config import org.jasypt.encryption.StringEncryptor import org.jasypt.encryption.pbe.PooledPBEStringEncryptor diff --git a/src/main/kotlin/com/study/core/global/config/PersistenceConfig.kt b/src/main/kotlin/com/doki/global/config/PersistenceConfig.kt similarity index 88% rename from src/main/kotlin/com/study/core/global/config/PersistenceConfig.kt rename to src/main/kotlin/com/doki/global/config/PersistenceConfig.kt index 4bef835..a7518c5 100644 --- a/src/main/kotlin/com/study/core/global/config/PersistenceConfig.kt +++ b/src/main/kotlin/com/doki/global/config/PersistenceConfig.kt @@ -1,4 +1,4 @@ -package com.study.core.global.config +package com.doki.global.config import org.springframework.context.annotation.Configuration import org.springframework.data.jpa.repository.config.EnableJpaAuditing diff --git a/src/main/kotlin/com/study/core/global/config/QuerydslConfig.kt b/src/main/kotlin/com/doki/global/config/QuerydslConfig.kt similarity index 90% rename from src/main/kotlin/com/study/core/global/config/QuerydslConfig.kt rename to src/main/kotlin/com/doki/global/config/QuerydslConfig.kt index 4365802..f28e8b8 100644 --- a/src/main/kotlin/com/study/core/global/config/QuerydslConfig.kt +++ b/src/main/kotlin/com/doki/global/config/QuerydslConfig.kt @@ -1,4 +1,4 @@ -package com.study.core.global.config +package com.doki.global.config import com.querydsl.jpa.impl.JPAQueryFactory import jakarta.persistence.EntityManager diff --git a/src/main/kotlin/com/study/core/global/config/SecurityConfig.kt b/src/main/kotlin/com/doki/global/config/SecurityConfig.kt similarity index 91% rename from src/main/kotlin/com/study/core/global/config/SecurityConfig.kt rename to src/main/kotlin/com/doki/global/config/SecurityConfig.kt index 7406014..021800f 100644 --- a/src/main/kotlin/com/study/core/global/config/SecurityConfig.kt +++ b/src/main/kotlin/com/doki/global/config/SecurityConfig.kt @@ -1,9 +1,9 @@ -package com.study.core.global.config; +package com.doki.global.config; -import com.study.core.auth.oauth.CustomOAuth2UserService -import com.study.core.auth.oauth.OAuth2SuccessHandler -import com.study.core.global.security.JwtFilter -import com.study.core.global.security.JwtProvider +import com.doki.user.auth.oauth.CustomOAuth2UserService +import com.doki.user.auth.oauth.OAuth2SuccessHandler +import com.doki.global.security.JwtFilter +import com.doki.global.security.JwtProvider import org.springframework.boot.autoconfigure.security.servlet.PathRequest import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/src/main/kotlin/com/study/core/global/config/WebClientConfig.kt b/src/main/kotlin/com/doki/global/config/WebClientConfig.kt similarity index 96% rename from src/main/kotlin/com/study/core/global/config/WebClientConfig.kt rename to src/main/kotlin/com/doki/global/config/WebClientConfig.kt index 7cbd9d3..765486e 100644 --- a/src/main/kotlin/com/study/core/global/config/WebClientConfig.kt +++ b/src/main/kotlin/com/doki/global/config/WebClientConfig.kt @@ -1,4 +1,4 @@ -package com.study.core.global.config +package com.doki.global.config import io.netty.channel.ChannelOption import org.springframework.context.annotation.Bean diff --git a/src/main/kotlin/com/study/core/global/config/WebMvcConfig.kt b/src/main/kotlin/com/doki/global/config/WebMvcConfig.kt similarity index 82% rename from src/main/kotlin/com/study/core/global/config/WebMvcConfig.kt rename to src/main/kotlin/com/doki/global/config/WebMvcConfig.kt index e1abc15..b7f7eb6 100644 --- a/src/main/kotlin/com/study/core/global/config/WebMvcConfig.kt +++ b/src/main/kotlin/com/doki/global/config/WebMvcConfig.kt @@ -1,6 +1,6 @@ -package com.study.core.global.config +package com.doki.global.config -import com.study.core.global.resolver.LoginUserArgumentResolver +import com.doki.global.resolver.LoginUserArgumentResolver import org.springframework.context.annotation.Configuration import org.springframework.web.method.support.HandlerMethodArgumentResolver import org.springframework.web.servlet.config.annotation.WebMvcConfigurer diff --git a/src/main/kotlin/com/study/core/global/exceptions/CustomException.kt b/src/main/kotlin/com/doki/global/exceptions/CustomException.kt similarity index 86% rename from src/main/kotlin/com/study/core/global/exceptions/CustomException.kt rename to src/main/kotlin/com/doki/global/exceptions/CustomException.kt index 6f448fd..c9c6a09 100644 --- a/src/main/kotlin/com/study/core/global/exceptions/CustomException.kt +++ b/src/main/kotlin/com/doki/global/exceptions/CustomException.kt @@ -1,4 +1,4 @@ -package com.study.core.global.exceptions +package com.doki.global.exceptions open class CustomException( private val customExceptionType: CustomExceptionType, diff --git a/src/main/kotlin/com/study/core/global/exceptions/CustomExceptionType.kt b/src/main/kotlin/com/doki/global/exceptions/CustomExceptionType.kt similarity index 89% rename from src/main/kotlin/com/study/core/global/exceptions/CustomExceptionType.kt rename to src/main/kotlin/com/doki/global/exceptions/CustomExceptionType.kt index d7b287e..29f24af 100644 --- a/src/main/kotlin/com/study/core/global/exceptions/CustomExceptionType.kt +++ b/src/main/kotlin/com/doki/global/exceptions/CustomExceptionType.kt @@ -1,4 +1,4 @@ -package com.study.core.global.exceptions +package com.doki.global.exceptions /** * errorCode: front-end 에서 식별할 수 있는 고유 에러 코드 (ex: ALREADY_EXISTS_CATEGORY - error enum.name 이용) diff --git a/src/main/kotlin/com/study/core/global/exceptions/ExceptionResponse.kt b/src/main/kotlin/com/doki/global/exceptions/ExceptionResponse.kt similarity index 72% rename from src/main/kotlin/com/study/core/global/exceptions/ExceptionResponse.kt rename to src/main/kotlin/com/doki/global/exceptions/ExceptionResponse.kt index 0fdbfa6..45a3524 100644 --- a/src/main/kotlin/com/study/core/global/exceptions/ExceptionResponse.kt +++ b/src/main/kotlin/com/doki/global/exceptions/ExceptionResponse.kt @@ -1,4 +1,4 @@ -package com.study.core.global.exceptions +package com.doki.global.exceptions data class ExceptionResponse( val name: String, diff --git a/src/main/kotlin/com/study/core/global/exceptions/GlobalExceptionAdvice.kt b/src/main/kotlin/com/doki/global/exceptions/GlobalExceptionAdvice.kt similarity index 99% rename from src/main/kotlin/com/study/core/global/exceptions/GlobalExceptionAdvice.kt rename to src/main/kotlin/com/doki/global/exceptions/GlobalExceptionAdvice.kt index cb13f9d..1279fac 100644 --- a/src/main/kotlin/com/study/core/global/exceptions/GlobalExceptionAdvice.kt +++ b/src/main/kotlin/com/doki/global/exceptions/GlobalExceptionAdvice.kt @@ -1,5 +1,5 @@ // src/main/kotlin/com/study/core/global/exceptions/GlobalExceptionAdvice.kt -package com.study.core.global.exceptions +package com.doki.global.exceptions import com.fasterxml.jackson.databind.JsonMappingException import jakarta.servlet.http.HttpServletRequest diff --git a/src/main/kotlin/com/study/core/global/exceptions/auth/AuthExceptionType.kt b/src/main/kotlin/com/doki/global/exceptions/auth/AuthExceptionType.kt similarity index 86% rename from src/main/kotlin/com/study/core/global/exceptions/auth/AuthExceptionType.kt rename to src/main/kotlin/com/doki/global/exceptions/auth/AuthExceptionType.kt index 5003ed8..eb87e89 100644 --- a/src/main/kotlin/com/study/core/global/exceptions/auth/AuthExceptionType.kt +++ b/src/main/kotlin/com/doki/global/exceptions/auth/AuthExceptionType.kt @@ -1,6 +1,6 @@ -package com.study.core.global.exceptions.auth +package com.doki.global.exceptions.auth -import com.study.core.global.exceptions.CustomExceptionType +import com.doki.global.exceptions.CustomExceptionType enum class AuthExceptionType( override val errorCode: String, diff --git a/src/main/kotlin/com/study/core/global/resolver/LoginUser.kt b/src/main/kotlin/com/doki/global/resolver/LoginUser.kt similarity index 73% rename from src/main/kotlin/com/study/core/global/resolver/LoginUser.kt rename to src/main/kotlin/com/doki/global/resolver/LoginUser.kt index a79beb7..73d604e 100644 --- a/src/main/kotlin/com/study/core/global/resolver/LoginUser.kt +++ b/src/main/kotlin/com/doki/global/resolver/LoginUser.kt @@ -1,4 +1,4 @@ -package com.study.core.global.resolver +package com.doki.global.resolver @Target(AnnotationTarget.VALUE_PARAMETER) @Retention(AnnotationRetention.RUNTIME) diff --git a/src/main/kotlin/com/study/core/global/resolver/LoginUserArgumentResolver.kt b/src/main/kotlin/com/doki/global/resolver/LoginUserArgumentResolver.kt similarity index 89% rename from src/main/kotlin/com/study/core/global/resolver/LoginUserArgumentResolver.kt rename to src/main/kotlin/com/doki/global/resolver/LoginUserArgumentResolver.kt index 1bbb9c0..f314016 100644 --- a/src/main/kotlin/com/study/core/global/resolver/LoginUserArgumentResolver.kt +++ b/src/main/kotlin/com/doki/global/resolver/LoginUserArgumentResolver.kt @@ -1,7 +1,7 @@ -package com.study.core.global.resolver +package com.doki.global.resolver -import com.study.core.global.exceptions.CustomException -import com.study.core.global.exceptions.auth.AuthExceptionType +import com.doki.global.exceptions.CustomException +import com.doki.global.exceptions.auth.AuthExceptionType import org.springframework.core.MethodParameter import org.springframework.security.core.context.SecurityContextHolder import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/study/core/global/security/JwtFilter.kt b/src/main/kotlin/com/doki/global/security/JwtFilter.kt similarity index 95% rename from src/main/kotlin/com/study/core/global/security/JwtFilter.kt rename to src/main/kotlin/com/doki/global/security/JwtFilter.kt index 06d2317..61cbb34 100644 --- a/src/main/kotlin/com/study/core/global/security/JwtFilter.kt +++ b/src/main/kotlin/com/doki/global/security/JwtFilter.kt @@ -1,4 +1,4 @@ -package com.study.core.global.security +package com.doki.global.security import jakarta.servlet.FilterChain import jakarta.servlet.http.HttpServletRequest diff --git a/src/main/kotlin/com/study/core/global/security/JwtProvider.kt b/src/main/kotlin/com/doki/global/security/JwtProvider.kt similarity index 95% rename from src/main/kotlin/com/study/core/global/security/JwtProvider.kt rename to src/main/kotlin/com/doki/global/security/JwtProvider.kt index ebbe0ef..dc3d632 100644 --- a/src/main/kotlin/com/study/core/global/security/JwtProvider.kt +++ b/src/main/kotlin/com/doki/global/security/JwtProvider.kt @@ -1,7 +1,7 @@ -package com.study.core.global.security +package com.doki.global.security -import com.study.core.auth.infrastructure.dto.response.TokenResponse -import com.study.core.global.enums.UserRole +import com.doki.user.auth.infrastructure.dto.response.TokenResponse +import com.doki.user.domain.vo.UserRole import io.jsonwebtoken.* import io.jsonwebtoken.io.Decoders import io.jsonwebtoken.security.Keys @@ -20,7 +20,7 @@ import java.util.Date class JwtProvider( @Value("\${jwt.secret}") private val secretKey: String, - @Value("\${jwt.log-token:false}") + @Value("\${jwt.log-token:true}") private val logToken: Boolean ){ diff --git a/src/main/kotlin/com/study/core/image/application/ImageEventListener.kt b/src/main/kotlin/com/doki/image/application/ImageEventListener.kt similarity index 77% rename from src/main/kotlin/com/study/core/image/application/ImageEventListener.kt rename to src/main/kotlin/com/doki/image/application/ImageEventListener.kt index c11e0ec..1e9987d 100644 --- a/src/main/kotlin/com/study/core/image/application/ImageEventListener.kt +++ b/src/main/kotlin/com/doki/image/application/ImageEventListener.kt @@ -1,10 +1,10 @@ -package com.study.core.image.application +package com.doki.image.application -import com.study.core.image.application.event.ImageCreateEvent -import com.study.core.image.application.event.ImageDeleteEvent -import com.study.core.image.domain.domainservice.ImageStorage -import com.study.core.image.domain.Image -import com.study.core.image.domain.ImageRepository +import com.doki.image.application.event.ImageCreateEvent +import com.doki.image.application.event.ImageDeleteEvent +import com.doki.image.domain.domainservice.ImageStorage +import com.doki.image.domain.Image +import com.doki.image.domain.ImageRepository import org.springframework.context.event.EventListener import org.springframework.scheduling.annotation.Async import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/study/core/image/application/ImageEventPublisher.kt b/src/main/kotlin/com/doki/image/application/ImageEventPublisher.kt similarity index 84% rename from src/main/kotlin/com/study/core/image/application/ImageEventPublisher.kt rename to src/main/kotlin/com/doki/image/application/ImageEventPublisher.kt index 0157081..8725da1 100644 --- a/src/main/kotlin/com/study/core/image/application/ImageEventPublisher.kt +++ b/src/main/kotlin/com/doki/image/application/ImageEventPublisher.kt @@ -1,8 +1,8 @@ -package com.study.core.image.application +package com.doki.image.application -import com.study.core.image.application.event.ImageCreateEvent -import com.study.core.image.application.event.ImageDeleteEvent -import com.study.core.image.domain.vo.ImageAggregateType +import com.doki.image.application.event.ImageCreateEvent +import com.doki.image.application.event.ImageDeleteEvent +import com.doki.image.domain.vo.ImageAggregateType import org.springframework.context.ApplicationEventPublisher import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/study/core/image/application/event/ImageCreateEvent.kt b/src/main/kotlin/com/doki/image/application/event/ImageCreateEvent.kt similarity index 64% rename from src/main/kotlin/com/study/core/image/application/event/ImageCreateEvent.kt rename to src/main/kotlin/com/doki/image/application/event/ImageCreateEvent.kt index ae6b5f6..d335128 100644 --- a/src/main/kotlin/com/study/core/image/application/event/ImageCreateEvent.kt +++ b/src/main/kotlin/com/doki/image/application/event/ImageCreateEvent.kt @@ -1,6 +1,6 @@ -package com.study.core.image.application.event +package com.doki.image.application.event -import com.study.core.image.domain.vo.ImageAggregateType +import com.doki.image.domain.vo.ImageAggregateType data class ImageCreateEvent( val aggregateType: ImageAggregateType, diff --git a/src/main/kotlin/com/doki/image/application/event/ImageDeleteEvent.kt b/src/main/kotlin/com/doki/image/application/event/ImageDeleteEvent.kt new file mode 100644 index 0000000..087b33d --- /dev/null +++ b/src/main/kotlin/com/doki/image/application/event/ImageDeleteEvent.kt @@ -0,0 +1,8 @@ +package com.doki.image.application.event + +import com.doki.image.domain.vo.ImageAggregateType + +data class ImageDeleteEvent( + val aggregateType: ImageAggregateType, + val aggregateId: Long, +) diff --git a/src/main/kotlin/com/study/core/image/domain/Image.kt b/src/main/kotlin/com/doki/image/domain/Image.kt similarity index 95% rename from src/main/kotlin/com/study/core/image/domain/Image.kt rename to src/main/kotlin/com/doki/image/domain/Image.kt index 6b9060c..0e95192 100644 --- a/src/main/kotlin/com/study/core/image/domain/Image.kt +++ b/src/main/kotlin/com/doki/image/domain/Image.kt @@ -1,8 +1,8 @@ -package com.study.core.image.domain +package com.doki.image.domain -import com.study.core.image.domain.domainservice.ImageStorage -import com.study.core.global.BaseEntity -import com.study.core.image.domain.vo.ImageAggregateType +import com.doki.image.domain.domainservice.ImageStorage +import com.doki.global.BaseEntity +import com.doki.image.domain.vo.ImageAggregateType import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.EnumType diff --git a/src/main/kotlin/com/study/core/image/domain/ImageRepository.kt b/src/main/kotlin/com/doki/image/domain/ImageRepository.kt similarity index 81% rename from src/main/kotlin/com/study/core/image/domain/ImageRepository.kt rename to src/main/kotlin/com/doki/image/domain/ImageRepository.kt index 2fc747c..3e7b9fe 100644 --- a/src/main/kotlin/com/study/core/image/domain/ImageRepository.kt +++ b/src/main/kotlin/com/doki/image/domain/ImageRepository.kt @@ -1,6 +1,6 @@ -package com.study.core.image.domain +package com.doki.image.domain -import com.study.core.image.domain.vo.ImageAggregateType +import com.doki.image.domain.vo.ImageAggregateType interface ImageRepository { diff --git a/src/main/kotlin/com/study/core/image/domain/domainservice/ImageStorage.kt b/src/main/kotlin/com/doki/image/domain/domainservice/ImageStorage.kt similarity index 77% rename from src/main/kotlin/com/study/core/image/domain/domainservice/ImageStorage.kt rename to src/main/kotlin/com/doki/image/domain/domainservice/ImageStorage.kt index 5e17309..4dbe394 100644 --- a/src/main/kotlin/com/study/core/image/domain/domainservice/ImageStorage.kt +++ b/src/main/kotlin/com/doki/image/domain/domainservice/ImageStorage.kt @@ -1,4 +1,4 @@ -package com.study.core.image.domain.domainservice +package com.doki.image.domain.domainservice interface ImageStorage { fun store(uniqueFilename: String, content: ByteArray): StoredImage diff --git a/src/main/kotlin/com/study/core/image/domain/vo/ImageAggregateType.kt b/src/main/kotlin/com/doki/image/domain/vo/ImageAggregateType.kt similarity index 69% rename from src/main/kotlin/com/study/core/image/domain/vo/ImageAggregateType.kt rename to src/main/kotlin/com/doki/image/domain/vo/ImageAggregateType.kt index 4dfdf77..ad47936 100644 --- a/src/main/kotlin/com/study/core/image/domain/vo/ImageAggregateType.kt +++ b/src/main/kotlin/com/doki/image/domain/vo/ImageAggregateType.kt @@ -1,4 +1,4 @@ -package com.study.core.image.domain.vo +package com.doki.image.domain.vo enum class ImageAggregateType { PACKAGE, diff --git a/src/main/kotlin/com/study/core/image/infrastructure/persistence/ImageJpaRepository.kt b/src/main/kotlin/com/doki/image/infrastructure/persistence/ImageJpaRepository.kt similarity index 77% rename from src/main/kotlin/com/study/core/image/infrastructure/persistence/ImageJpaRepository.kt rename to src/main/kotlin/com/doki/image/infrastructure/persistence/ImageJpaRepository.kt index 12f5732..81f3277 100644 --- a/src/main/kotlin/com/study/core/image/infrastructure/persistence/ImageJpaRepository.kt +++ b/src/main/kotlin/com/doki/image/infrastructure/persistence/ImageJpaRepository.kt @@ -1,7 +1,7 @@ -package com.study.core.image.infrastructure.persistence +package com.doki.image.infrastructure.persistence -import com.study.core.image.domain.Image -import com.study.core.image.domain.vo.ImageAggregateType +import com.doki.image.domain.Image +import com.doki.image.domain.vo.ImageAggregateType import org.springframework.data.jpa.repository.JpaRepository interface ImageJpaRepository : JpaRepository { diff --git a/src/main/kotlin/com/study/core/image/infrastructure/persistence/ImageRepositoryImpl.kt b/src/main/kotlin/com/doki/image/infrastructure/persistence/ImageRepositoryImpl.kt similarity index 83% rename from src/main/kotlin/com/study/core/image/infrastructure/persistence/ImageRepositoryImpl.kt rename to src/main/kotlin/com/doki/image/infrastructure/persistence/ImageRepositoryImpl.kt index 1791b47..1feed32 100644 --- a/src/main/kotlin/com/study/core/image/infrastructure/persistence/ImageRepositoryImpl.kt +++ b/src/main/kotlin/com/doki/image/infrastructure/persistence/ImageRepositoryImpl.kt @@ -1,8 +1,8 @@ -package com.study.core.image.infrastructure.persistence +package com.doki.image.infrastructure.persistence -import com.study.core.image.domain.Image -import com.study.core.image.domain.vo.ImageAggregateType -import com.study.core.image.domain.ImageRepository +import com.doki.image.domain.Image +import com.doki.image.domain.vo.ImageAggregateType +import com.doki.image.domain.ImageRepository import org.springframework.stereotype.Repository @Repository diff --git a/src/main/kotlin/com/study/core/image/infrastructure/storage/LocalImageStorage.kt b/src/main/kotlin/com/doki/image/infrastructure/storage/LocalImageStorage.kt similarity index 89% rename from src/main/kotlin/com/study/core/image/infrastructure/storage/LocalImageStorage.kt rename to src/main/kotlin/com/doki/image/infrastructure/storage/LocalImageStorage.kt index c2262b5..46a6868 100644 --- a/src/main/kotlin/com/study/core/image/infrastructure/storage/LocalImageStorage.kt +++ b/src/main/kotlin/com/doki/image/infrastructure/storage/LocalImageStorage.kt @@ -1,7 +1,7 @@ -package com.study.core.image.infrastructure.storage +package com.doki.image.infrastructure.storage -import com.study.core.image.domain.domainservice.ImageStorage -import com.study.core.image.domain.domainservice.StoredImage +import com.doki.image.domain.domainservice.ImageStorage +import com.doki.image.domain.domainservice.StoredImage import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Primary import org.springframework.context.annotation.Profile diff --git a/src/main/kotlin/com/study/core/image/infrastructure/storage/MockCloudImageStorage.kt b/src/main/kotlin/com/doki/image/infrastructure/storage/MockCloudImageStorage.kt similarity index 80% rename from src/main/kotlin/com/study/core/image/infrastructure/storage/MockCloudImageStorage.kt rename to src/main/kotlin/com/doki/image/infrastructure/storage/MockCloudImageStorage.kt index 687202b..0a3d775 100644 --- a/src/main/kotlin/com/study/core/image/infrastructure/storage/MockCloudImageStorage.kt +++ b/src/main/kotlin/com/doki/image/infrastructure/storage/MockCloudImageStorage.kt @@ -1,7 +1,7 @@ -package com.study.core.image.infrastructure.storage +package com.doki.image.infrastructure.storage -import com.study.core.image.domain.domainservice.ImageStorage -import com.study.core.image.domain.domainservice.StoredImage +import com.doki.image.domain.domainservice.ImageStorage +import com.doki.image.domain.domainservice.StoredImage import org.springframework.context.annotation.Primary import org.springframework.context.annotation.Profile import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/study/core/productpackage/application/PackageCommandService.kt b/src/main/kotlin/com/doki/productpackage/application/PackageCommandService.kt similarity index 76% rename from src/main/kotlin/com/study/core/productpackage/application/PackageCommandService.kt rename to src/main/kotlin/com/doki/productpackage/application/PackageCommandService.kt index d1833cd..7fc1053 100644 --- a/src/main/kotlin/com/study/core/productpackage/application/PackageCommandService.kt +++ b/src/main/kotlin/com/doki/productpackage/application/PackageCommandService.kt @@ -1,10 +1,10 @@ -package com.study.core.productpackage.application +package com.doki.productpackage.application -import com.study.core.product.domain.Product -import com.study.core.product.domain.ProductRepository -import com.study.core.productpackage.application.dto.CreatePackageCommand -import com.study.core.productpackage.domain.Package -import com.study.core.productpackage.infrastructure.PackageCommandRepository +import com.doki.productpackage.product.domain.Product +import com.doki.productpackage.product.domain.ProductRepository +import com.doki.productpackage.application.dto.CreatePackageCommand +import com.doki.productpackage.domain.Package +import com.doki.productpackage.infrastructure.PackageCommandRepository import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/src/main/kotlin/com/study/core/productpackage/application/PackageQueryService.kt b/src/main/kotlin/com/doki/productpackage/application/PackageQueryService.kt similarity index 71% rename from src/main/kotlin/com/study/core/productpackage/application/PackageQueryService.kt rename to src/main/kotlin/com/doki/productpackage/application/PackageQueryService.kt index 9c794dd..21f24b9 100644 --- a/src/main/kotlin/com/study/core/productpackage/application/PackageQueryService.kt +++ b/src/main/kotlin/com/doki/productpackage/application/PackageQueryService.kt @@ -1,8 +1,8 @@ -package com.study.core.productpackage.application +package com.doki.productpackage.application -import com.study.core.productpackage.domain.PackageRepository -import com.study.core.productpackage.domain.dto.PackagePagingQueryResponse -import com.study.core.productpackage.domain.dto.PackageSpecificResponse +import com.doki.productpackage.domain.PackageRepository +import com.doki.productpackage.domain.dto.PackagePagingQueryResponse +import com.doki.productpackage.domain.dto.PackageSpecificResponse import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/src/main/kotlin/com/study/core/productpackage/application/dto/CreatePackageCommand.kt b/src/main/kotlin/com/doki/productpackage/application/dto/CreatePackageCommand.kt similarity index 91% rename from src/main/kotlin/com/study/core/productpackage/application/dto/CreatePackageCommand.kt rename to src/main/kotlin/com/doki/productpackage/application/dto/CreatePackageCommand.kt index e1f4115..331dda9 100644 --- a/src/main/kotlin/com/study/core/productpackage/application/dto/CreatePackageCommand.kt +++ b/src/main/kotlin/com/doki/productpackage/application/dto/CreatePackageCommand.kt @@ -1,4 +1,4 @@ -package com.study.core.productpackage.application.dto +package com.doki.productpackage.application.dto import java.time.LocalDate diff --git a/src/main/kotlin/com/study/core/productpackage/domain/Package.kt b/src/main/kotlin/com/doki/productpackage/domain/Package.kt similarity index 95% rename from src/main/kotlin/com/study/core/productpackage/domain/Package.kt rename to src/main/kotlin/com/doki/productpackage/domain/Package.kt index cc3658f..8854c3d 100644 --- a/src/main/kotlin/com/study/core/productpackage/domain/Package.kt +++ b/src/main/kotlin/com/doki/productpackage/domain/Package.kt @@ -1,8 +1,8 @@ -package com.study.core.productpackage.domain +package com.doki.productpackage.domain -import com.study.core.global.BaseEntity -import com.study.core.product.domain.Product -import com.study.core.reservation.domain.ReservationSlot +import com.doki.global.BaseEntity +import com.doki.productpackage.product.domain.Product +import com.doki.productpackage.reservation.domain.ReservationSlot import jakarta.persistence.CascadeType import jakarta.persistence.Column import jakarta.persistence.Entity diff --git a/src/main/kotlin/com/study/core/productpackage/domain/PackageProduct.kt b/src/main/kotlin/com/doki/productpackage/domain/PackageProduct.kt similarity index 84% rename from src/main/kotlin/com/study/core/productpackage/domain/PackageProduct.kt rename to src/main/kotlin/com/doki/productpackage/domain/PackageProduct.kt index e94f6d0..679a4cb 100644 --- a/src/main/kotlin/com/study/core/productpackage/domain/PackageProduct.kt +++ b/src/main/kotlin/com/doki/productpackage/domain/PackageProduct.kt @@ -1,8 +1,7 @@ -package com.study.core.productpackage.domain +package com.doki.productpackage.domain -import com.study.core.global.BaseEntity -import com.study.core.product.domain.Product -import jakarta.persistence.Column +import com.doki.global.BaseEntity +import com.doki.productpackage.product.domain.Product import jakarta.persistence.Entity import jakarta.persistence.FetchType import jakarta.persistence.GeneratedValue diff --git a/src/main/kotlin/com/study/core/productpackage/domain/PackageRepository.kt b/src/main/kotlin/com/doki/productpackage/domain/PackageRepository.kt similarity index 62% rename from src/main/kotlin/com/study/core/productpackage/domain/PackageRepository.kt rename to src/main/kotlin/com/doki/productpackage/domain/PackageRepository.kt index 8d516ee..dcf47e6 100644 --- a/src/main/kotlin/com/study/core/productpackage/domain/PackageRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/domain/PackageRepository.kt @@ -1,7 +1,7 @@ -package com.study.core.productpackage.domain +package com.doki.productpackage.domain -import com.study.core.productpackage.domain.dto.PackagePagingQueryResponse -import com.study.core.productpackage.domain.dto.PackageSpecificResponse +import com.doki.productpackage.domain.dto.PackagePagingQueryResponse +import com.doki.productpackage.domain.dto.PackageSpecificResponse interface PackageRepository { diff --git a/src/main/kotlin/com/study/core/productpackage/domain/PackageTag.kt b/src/main/kotlin/com/doki/productpackage/domain/PackageTag.kt similarity index 91% rename from src/main/kotlin/com/study/core/productpackage/domain/PackageTag.kt rename to src/main/kotlin/com/doki/productpackage/domain/PackageTag.kt index 7a0fd08..758cf25 100644 --- a/src/main/kotlin/com/study/core/productpackage/domain/PackageTag.kt +++ b/src/main/kotlin/com/doki/productpackage/domain/PackageTag.kt @@ -1,6 +1,6 @@ -package com.study.core.productpackage.domain +package com.doki.productpackage.domain -import com.study.core.global.BaseEntity +import com.doki.global.BaseEntity import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.FetchType diff --git a/src/main/kotlin/com/study/core/productpackage/domain/dto/PackagePagingQueryResponse.kt b/src/main/kotlin/com/doki/productpackage/domain/dto/PackagePagingQueryResponse.kt similarity index 55% rename from src/main/kotlin/com/study/core/productpackage/domain/dto/PackagePagingQueryResponse.kt rename to src/main/kotlin/com/doki/productpackage/domain/dto/PackagePagingQueryResponse.kt index cadd075..3174173 100644 --- a/src/main/kotlin/com/study/core/productpackage/domain/dto/PackagePagingQueryResponse.kt +++ b/src/main/kotlin/com/doki/productpackage/domain/dto/PackagePagingQueryResponse.kt @@ -1,4 +1,4 @@ -package com.study.core.productpackage.domain.dto +package com.doki.productpackage.domain.dto data class PackagePagingQueryResponse( val id: Long, diff --git a/src/main/kotlin/com/study/core/productpackage/domain/dto/PackageSpecificResponse.kt b/src/main/kotlin/com/doki/productpackage/domain/dto/PackageSpecificResponse.kt similarity index 53% rename from src/main/kotlin/com/study/core/productpackage/domain/dto/PackageSpecificResponse.kt rename to src/main/kotlin/com/doki/productpackage/domain/dto/PackageSpecificResponse.kt index 664079a..d3d7bbc 100644 --- a/src/main/kotlin/com/study/core/productpackage/domain/dto/PackageSpecificResponse.kt +++ b/src/main/kotlin/com/doki/productpackage/domain/dto/PackageSpecificResponse.kt @@ -1,4 +1,4 @@ -package com.study.core.productpackage.domain.dto +package com.doki.productpackage.domain.dto data class PackageSpecificResponse( val id: Long, diff --git a/src/main/kotlin/com/study/core/productpackage/infrastructure/PackageCommandRepository.kt b/src/main/kotlin/com/doki/productpackage/infrastructure/PackageCommandRepository.kt similarity index 84% rename from src/main/kotlin/com/study/core/productpackage/infrastructure/PackageCommandRepository.kt rename to src/main/kotlin/com/doki/productpackage/infrastructure/PackageCommandRepository.kt index 575b5e8..0095388 100644 --- a/src/main/kotlin/com/study/core/productpackage/infrastructure/PackageCommandRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/infrastructure/PackageCommandRepository.kt @@ -1,6 +1,6 @@ -package com.study.core.productpackage.infrastructure +package com.doki.productpackage.infrastructure -import com.study.core.productpackage.domain.Package +import com.doki.productpackage.domain.Package import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Repository diff --git a/src/main/kotlin/com/study/core/productpackage/infrastructure/PackageJpaRepository.kt b/src/main/kotlin/com/doki/productpackage/infrastructure/PackageJpaRepository.kt similarity index 54% rename from src/main/kotlin/com/study/core/productpackage/infrastructure/PackageJpaRepository.kt rename to src/main/kotlin/com/doki/productpackage/infrastructure/PackageJpaRepository.kt index 8d68bd4..3ab549b 100644 --- a/src/main/kotlin/com/study/core/productpackage/infrastructure/PackageJpaRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/infrastructure/PackageJpaRepository.kt @@ -1,6 +1,6 @@ -package com.study.core.productpackage.infrastructure +package com.doki.productpackage.infrastructure -import com.study.core.productpackage.domain.Package +import com.doki.productpackage.domain.Package import org.springframework.data.jpa.repository.JpaRepository interface PackageJpaRepository : JpaRepository diff --git a/src/main/kotlin/com/study/core/productpackage/infrastructure/PackageQueryRepository.kt b/src/main/kotlin/com/doki/productpackage/infrastructure/PackageQueryRepository.kt similarity index 59% rename from src/main/kotlin/com/study/core/productpackage/infrastructure/PackageQueryRepository.kt rename to src/main/kotlin/com/doki/productpackage/infrastructure/PackageQueryRepository.kt index eb4af03..d97942b 100644 --- a/src/main/kotlin/com/study/core/productpackage/infrastructure/PackageQueryRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/infrastructure/PackageQueryRepository.kt @@ -1,7 +1,7 @@ -package com.study.core.productpackage.infrastructure +package com.doki.productpackage.infrastructure -import com.study.core.productpackage.domain.dto.PackagePagingQueryResponse -import com.study.core.productpackage.domain.dto.PackageSpecificResponse +import com.doki.productpackage.domain.dto.PackagePagingQueryResponse +import com.doki.productpackage.domain.dto.PackageSpecificResponse import org.springframework.stereotype.Repository @Repository diff --git a/src/main/kotlin/com/study/core/productpackage/infrastructure/PackageRepositoryImpl.kt b/src/main/kotlin/com/doki/productpackage/infrastructure/PackageRepositoryImpl.kt similarity index 73% rename from src/main/kotlin/com/study/core/productpackage/infrastructure/PackageRepositoryImpl.kt rename to src/main/kotlin/com/doki/productpackage/infrastructure/PackageRepositoryImpl.kt index b0a6ca1..c9be66c 100644 --- a/src/main/kotlin/com/study/core/productpackage/infrastructure/PackageRepositoryImpl.kt +++ b/src/main/kotlin/com/doki/productpackage/infrastructure/PackageRepositoryImpl.kt @@ -1,9 +1,9 @@ -package com.study.core.productpackage.infrastructure +package com.doki.productpackage.infrastructure -import com.study.core.productpackage.domain.Package -import com.study.core.productpackage.domain.PackageRepository -import com.study.core.productpackage.domain.dto.PackagePagingQueryResponse -import com.study.core.productpackage.domain.dto.PackageSpecificResponse +import com.doki.productpackage.domain.Package +import com.doki.productpackage.domain.PackageRepository +import com.doki.productpackage.domain.dto.PackagePagingQueryResponse +import com.doki.productpackage.domain.dto.PackageSpecificResponse import org.springframework.stereotype.Repository @Repository diff --git a/src/main/kotlin/com/study/core/product/application/ProductService.kt b/src/main/kotlin/com/doki/productpackage/product/application/ProductService.kt similarity index 54% rename from src/main/kotlin/com/study/core/product/application/ProductService.kt rename to src/main/kotlin/com/doki/productpackage/product/application/ProductService.kt index 0125399..9b1cbc9 100644 --- a/src/main/kotlin/com/study/core/product/application/ProductService.kt +++ b/src/main/kotlin/com/doki/productpackage/product/application/ProductService.kt @@ -1,6 +1,6 @@ -package com.study.core.product.application +package com.doki.productpackage.product.application -import com.study.core.product.domain.ProductRepository +import com.doki.productpackage.product.domain.ProductRepository import org.springframework.stereotype.Service @Service diff --git a/src/main/kotlin/com/study/core/product/domain/Product.kt b/src/main/kotlin/com/doki/productpackage/product/domain/Product.kt similarity index 89% rename from src/main/kotlin/com/study/core/product/domain/Product.kt rename to src/main/kotlin/com/doki/productpackage/product/domain/Product.kt index 105adcb..bc4ea19 100644 --- a/src/main/kotlin/com/study/core/product/domain/Product.kt +++ b/src/main/kotlin/com/doki/productpackage/product/domain/Product.kt @@ -1,6 +1,6 @@ -package com.study.core.product.domain +package com.doki.productpackage.product.domain -import com.study.core.global.BaseEntity +import com.doki.global.BaseEntity import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.GeneratedValue diff --git a/src/main/kotlin/com/study/core/product/domain/ProductRepository.kt b/src/main/kotlin/com/doki/productpackage/product/domain/ProductRepository.kt similarity index 66% rename from src/main/kotlin/com/study/core/product/domain/ProductRepository.kt rename to src/main/kotlin/com/doki/productpackage/product/domain/ProductRepository.kt index ad081b9..c26a4a4 100644 --- a/src/main/kotlin/com/study/core/product/domain/ProductRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/product/domain/ProductRepository.kt @@ -1,4 +1,4 @@ -package com.study.core.product.domain +package com.doki.productpackage.product.domain interface ProductRepository { diff --git a/src/main/kotlin/com/study/core/product/infrastructure/ProductJpaRepository.kt b/src/main/kotlin/com/doki/productpackage/product/infrastructure/ProductJpaRepository.kt similarity index 63% rename from src/main/kotlin/com/study/core/product/infrastructure/ProductJpaRepository.kt rename to src/main/kotlin/com/doki/productpackage/product/infrastructure/ProductJpaRepository.kt index 4c1dbab..ce3afd4 100644 --- a/src/main/kotlin/com/study/core/product/infrastructure/ProductJpaRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/product/infrastructure/ProductJpaRepository.kt @@ -1,6 +1,6 @@ -package com.study.core.product.infrastructure +package com.doki.productpackage.product.infrastructure -import com.study.core.product.domain.Product +import com.doki.productpackage.product.domain.Product import org.springframework.data.repository.CrudRepository interface ProductJpaRepository : CrudRepository { diff --git a/src/main/kotlin/com/study/core/product/infrastructure/ProductRepositoryImpl.kt b/src/main/kotlin/com/doki/productpackage/product/infrastructure/ProductRepositoryImpl.kt similarity index 64% rename from src/main/kotlin/com/study/core/product/infrastructure/ProductRepositoryImpl.kt rename to src/main/kotlin/com/doki/productpackage/product/infrastructure/ProductRepositoryImpl.kt index 3fc5a2f..3a274b3 100644 --- a/src/main/kotlin/com/study/core/product/infrastructure/ProductRepositoryImpl.kt +++ b/src/main/kotlin/com/doki/productpackage/product/infrastructure/ProductRepositoryImpl.kt @@ -1,7 +1,7 @@ -package com.study.core.product.infrastructure +package com.doki.productpackage.product.infrastructure -import com.study.core.product.domain.Product -import com.study.core.product.domain.ProductRepository +import com.doki.productpackage.product.domain.Product +import com.doki.productpackage.product.domain.ProductRepository import org.springframework.stereotype.Repository @Repository diff --git a/src/main/kotlin/com/study/core/product/ui/ProductApi.kt b/src/main/kotlin/com/doki/productpackage/product/ui/ProductApi.kt similarity index 70% rename from src/main/kotlin/com/study/core/product/ui/ProductApi.kt rename to src/main/kotlin/com/doki/productpackage/product/ui/ProductApi.kt index f8badce..5a1cf90 100644 --- a/src/main/kotlin/com/study/core/product/ui/ProductApi.kt +++ b/src/main/kotlin/com/doki/productpackage/product/ui/ProductApi.kt @@ -1,4 +1,4 @@ -package com.study.core.product.ui +package com.doki.productpackage.product.ui // TODO : 스웨거 문서 관련 기재 (명세 확정 이후 작업 예정) interface ProductApi { diff --git a/src/main/kotlin/com/study/core/product/ui/ProductController.kt b/src/main/kotlin/com/doki/productpackage/product/ui/ProductController.kt similarity index 70% rename from src/main/kotlin/com/study/core/product/ui/ProductController.kt rename to src/main/kotlin/com/doki/productpackage/product/ui/ProductController.kt index 8a741d7..f6819f5 100644 --- a/src/main/kotlin/com/study/core/product/ui/ProductController.kt +++ b/src/main/kotlin/com/doki/productpackage/product/ui/ProductController.kt @@ -1,6 +1,6 @@ -package com.study.core.product.ui +package com.doki.productpackage.product.ui -import com.study.core.product.application.ProductService +import com.doki.productpackage.product.application.ProductService import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController diff --git a/src/main/kotlin/com/study/core/reservation/application/ReservationCommandService.kt b/src/main/kotlin/com/doki/productpackage/reservation/application/ReservationCommandService.kt similarity index 80% rename from src/main/kotlin/com/study/core/reservation/application/ReservationCommandService.kt rename to src/main/kotlin/com/doki/productpackage/reservation/application/ReservationCommandService.kt index c636471..9001406 100644 --- a/src/main/kotlin/com/study/core/reservation/application/ReservationCommandService.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/application/ReservationCommandService.kt @@ -1,9 +1,9 @@ -package com.study.core.reservation.application +package com.doki.productpackage.reservation.application -import com.study.core.reservation.application.dto.CreateReservationCommand -import com.study.core.reservation.domain.Reservation -import com.study.core.reservation.domain.ReservationRepository -import com.study.core.reservation.domain.ReservationSlotRepository +import com.doki.productpackage.reservation.application.dto.CreateReservationCommand +import com.doki.productpackage.reservation.domain.Reservation +import com.doki.productpackage.reservation.domain.ReservationRepository +import com.doki.productpackage.reservation.domain.ReservationSlotRepository import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/src/main/kotlin/com/study/core/reservation/application/dto/CreateReservationCommand.kt b/src/main/kotlin/com/doki/productpackage/reservation/application/dto/CreateReservationCommand.kt similarity index 82% rename from src/main/kotlin/com/study/core/reservation/application/dto/CreateReservationCommand.kt rename to src/main/kotlin/com/doki/productpackage/reservation/application/dto/CreateReservationCommand.kt index a19255f..6fa1d5a 100644 --- a/src/main/kotlin/com/study/core/reservation/application/dto/CreateReservationCommand.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/application/dto/CreateReservationCommand.kt @@ -1,4 +1,4 @@ -package com.study.core.reservation.application.dto +package com.doki.productpackage.reservation.application.dto import java.math.BigDecimal diff --git a/src/main/kotlin/com/study/core/reservation/domain/Reservation.kt b/src/main/kotlin/com/doki/productpackage/reservation/domain/Reservation.kt similarity index 97% rename from src/main/kotlin/com/study/core/reservation/domain/Reservation.kt rename to src/main/kotlin/com/doki/productpackage/reservation/domain/Reservation.kt index c59bfee..260bdd0 100644 --- a/src/main/kotlin/com/study/core/reservation/domain/Reservation.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/domain/Reservation.kt @@ -1,6 +1,6 @@ -package com.study.core.reservation.domain +package com.doki.productpackage.reservation.domain -import com.study.core.global.BaseEntity +import com.doki.global.BaseEntity import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.EnumType diff --git a/src/main/kotlin/com/study/core/reservation/domain/ReservationRepository.kt b/src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationRepository.kt similarity index 71% rename from src/main/kotlin/com/study/core/reservation/domain/ReservationRepository.kt rename to src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationRepository.kt index 1a35820..7725488 100644 --- a/src/main/kotlin/com/study/core/reservation/domain/ReservationRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationRepository.kt @@ -1,4 +1,4 @@ -package com.study.core.reservation.domain +package com.doki.productpackage.reservation.domain interface ReservationRepository { fun save(reservation: Reservation): Reservation diff --git a/src/main/kotlin/com/study/core/reservation/domain/ReservationSlot.kt b/src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationSlot.kt similarity index 94% rename from src/main/kotlin/com/study/core/reservation/domain/ReservationSlot.kt rename to src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationSlot.kt index c3bbd98..d07590a 100644 --- a/src/main/kotlin/com/study/core/reservation/domain/ReservationSlot.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationSlot.kt @@ -1,7 +1,7 @@ -package com.study.core.reservation.domain +package com.doki.productpackage.reservation.domain -import com.study.core.global.BaseEntity -import com.study.core.productpackage.domain.Package +import com.doki.global.BaseEntity +import com.doki.productpackage.domain.Package import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.FetchType diff --git a/src/main/kotlin/com/study/core/reservation/domain/ReservationSlotRepository.kt b/src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationSlotRepository.kt similarity index 74% rename from src/main/kotlin/com/study/core/reservation/domain/ReservationSlotRepository.kt rename to src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationSlotRepository.kt index 9376e43..316fa1e 100644 --- a/src/main/kotlin/com/study/core/reservation/domain/ReservationSlotRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationSlotRepository.kt @@ -1,4 +1,4 @@ -package com.study.core.reservation.domain +package com.doki.productpackage.reservation.domain interface ReservationSlotRepository { fun findById(slotId: Long): ReservationSlot? diff --git a/src/main/kotlin/com/study/core/reservation/domain/ReservationStatus.kt b/src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationStatus.kt similarity index 62% rename from src/main/kotlin/com/study/core/reservation/domain/ReservationStatus.kt rename to src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationStatus.kt index 85e8932..e5e3428 100644 --- a/src/main/kotlin/com/study/core/reservation/domain/ReservationStatus.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/domain/ReservationStatus.kt @@ -1,4 +1,4 @@ -package com.study.core.reservation.domain +package com.doki.productpackage.reservation.domain enum class ReservationStatus { PREBOOK, diff --git a/src/main/kotlin/com/study/core/reservation/infrastructure/ReservationJpaRepository.kt b/src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationJpaRepository.kt similarity index 52% rename from src/main/kotlin/com/study/core/reservation/infrastructure/ReservationJpaRepository.kt rename to src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationJpaRepository.kt index d804983..6dbbceb 100644 --- a/src/main/kotlin/com/study/core/reservation/infrastructure/ReservationJpaRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationJpaRepository.kt @@ -1,6 +1,6 @@ -package com.study.core.reservation.infrastructure +package com.doki.productpackage.reservation.infrastructure -import com.study.core.reservation.domain.Reservation +import com.doki.productpackage.reservation.domain.Reservation import org.springframework.data.jpa.repository.JpaRepository interface ReservationJpaRepository : JpaRepository diff --git a/src/main/kotlin/com/study/core/reservation/infrastructure/ReservationRepositoryImpl.kt b/src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationRepositoryImpl.kt similarity index 70% rename from src/main/kotlin/com/study/core/reservation/infrastructure/ReservationRepositoryImpl.kt rename to src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationRepositoryImpl.kt index 33e76fc..42623af 100644 --- a/src/main/kotlin/com/study/core/reservation/infrastructure/ReservationRepositoryImpl.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationRepositoryImpl.kt @@ -1,7 +1,7 @@ -package com.study.core.reservation.infrastructure +package com.doki.productpackage.reservation.infrastructure -import com.study.core.reservation.domain.Reservation -import com.study.core.reservation.domain.ReservationRepository +import com.doki.productpackage.reservation.domain.Reservation +import com.doki.productpackage.reservation.domain.ReservationRepository import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Repository diff --git a/src/main/kotlin/com/study/core/reservation/infrastructure/ReservationSlotJpaRepository.kt b/src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationSlotJpaRepository.kt similarity index 80% rename from src/main/kotlin/com/study/core/reservation/infrastructure/ReservationSlotJpaRepository.kt rename to src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationSlotJpaRepository.kt index 872fd25..7528c26 100644 --- a/src/main/kotlin/com/study/core/reservation/infrastructure/ReservationSlotJpaRepository.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationSlotJpaRepository.kt @@ -1,6 +1,6 @@ -package com.study.core.reservation.infrastructure +package com.doki.productpackage.reservation.infrastructure -import com.study.core.reservation.domain.ReservationSlot +import com.doki.productpackage.reservation.domain.ReservationSlot import jakarta.persistence.LockModeType import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Lock diff --git a/src/main/kotlin/com/study/core/reservation/infrastructure/ReservationSlotRepositoryImpl.kt b/src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationSlotRepositoryImpl.kt similarity index 72% rename from src/main/kotlin/com/study/core/reservation/infrastructure/ReservationSlotRepositoryImpl.kt rename to src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationSlotRepositoryImpl.kt index d2e5a64..fe8af21 100644 --- a/src/main/kotlin/com/study/core/reservation/infrastructure/ReservationSlotRepositoryImpl.kt +++ b/src/main/kotlin/com/doki/productpackage/reservation/infrastructure/ReservationSlotRepositoryImpl.kt @@ -1,7 +1,7 @@ -package com.study.core.reservation.infrastructure +package com.doki.productpackage.reservation.infrastructure -import com.study.core.reservation.domain.ReservationSlot -import com.study.core.reservation.domain.ReservationSlotRepository +import com.doki.productpackage.reservation.domain.ReservationSlot +import com.doki.productpackage.reservation.domain.ReservationSlotRepository import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Repository diff --git a/src/main/kotlin/com/study/core/productpackage/ui/PackageApi.kt b/src/main/kotlin/com/doki/productpackage/ui/PackageApi.kt similarity index 69% rename from src/main/kotlin/com/study/core/productpackage/ui/PackageApi.kt rename to src/main/kotlin/com/doki/productpackage/ui/PackageApi.kt index 717b4d8..ec5908a 100644 --- a/src/main/kotlin/com/study/core/productpackage/ui/PackageApi.kt +++ b/src/main/kotlin/com/doki/productpackage/ui/PackageApi.kt @@ -1,4 +1,4 @@ -package com.study.core.productpackage.ui +package com.doki.productpackage.ui // TODO : 명세 확정 후 스웨거 관련 코드 기재 작업 interface PackageApi { diff --git a/src/main/kotlin/com/study/core/productpackage/ui/PackageController.kt b/src/main/kotlin/com/doki/productpackage/ui/PackageController.kt similarity index 59% rename from src/main/kotlin/com/study/core/productpackage/ui/PackageController.kt rename to src/main/kotlin/com/doki/productpackage/ui/PackageController.kt index d486842..690edc0 100644 --- a/src/main/kotlin/com/study/core/productpackage/ui/PackageController.kt +++ b/src/main/kotlin/com/doki/productpackage/ui/PackageController.kt @@ -1,8 +1,7 @@ -package com.study.core.productpackage.ui +package com.doki.productpackage.ui -import com.study.core.product.ui.ProductApi -import com.study.core.productpackage.application.PackageCommandService -import com.study.core.productpackage.application.PackageQueryService +import com.doki.productpackage.application.PackageCommandService +import com.doki.productpackage.application.PackageQueryService import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController diff --git a/src/main/kotlin/com/study/core/review/application/PackageReviewCommandService.kt b/src/main/kotlin/com/doki/review/application/PackageReviewCommandService.kt similarity index 82% rename from src/main/kotlin/com/study/core/review/application/PackageReviewCommandService.kt rename to src/main/kotlin/com/doki/review/application/PackageReviewCommandService.kt index 8290cee..4542801 100644 --- a/src/main/kotlin/com/study/core/review/application/PackageReviewCommandService.kt +++ b/src/main/kotlin/com/doki/review/application/PackageReviewCommandService.kt @@ -1,15 +1,15 @@ -package com.study.core.review.application +package com.doki.review.application -import com.study.core.image.application.ImageEventPublisher -import com.study.core.image.domain.vo.ImageAggregateType -import com.study.core.productpackage.domain.Package -import com.study.core.productpackage.domain.PackageRepository -import com.study.core.review.application.dto.CreatePackageReviewCommand -import com.study.core.review.application.dto.ReviewImageFile -import com.study.core.review.application.dto.UpdatePackageReviewCommand -import com.study.core.review.domain.PackageReview -import com.study.core.review.domain.PackageReviewRepository -import com.study.core.review.domain.ReviewRating +import com.doki.image.application.ImageEventPublisher +import com.doki.image.domain.vo.ImageAggregateType +import com.doki.productpackage.domain.Package +import com.doki.productpackage.domain.PackageRepository +import com.doki.review.application.dto.CreatePackageReviewCommand +import com.doki.review.application.dto.ReviewImageFile +import com.doki.review.application.dto.UpdatePackageReviewCommand +import com.doki.review.domain.PackageReview +import com.doki.review.domain.PackageReviewRepository +import com.doki.review.domain.ReviewRating import jakarta.persistence.EntityNotFoundException import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/src/main/kotlin/com/study/core/review/application/PackageReviewQueryService.kt b/src/main/kotlin/com/doki/review/application/PackageReviewQueryService.kt similarity index 76% rename from src/main/kotlin/com/study/core/review/application/PackageReviewQueryService.kt rename to src/main/kotlin/com/doki/review/application/PackageReviewQueryService.kt index f1f0d91..6dd6be6 100644 --- a/src/main/kotlin/com/study/core/review/application/PackageReviewQueryService.kt +++ b/src/main/kotlin/com/doki/review/application/PackageReviewQueryService.kt @@ -1,10 +1,10 @@ -package com.study.core.review.application +package com.doki.review.application -import com.study.core.image.domain.ImageRepository -import com.study.core.image.domain.vo.ImageAggregateType -import com.study.core.review.application.dto.PackageReviewResponse -import com.study.core.review.domain.PackageReview -import com.study.core.review.domain.PackageReviewRepository +import com.doki.image.domain.ImageRepository +import com.doki.image.domain.vo.ImageAggregateType +import com.doki.review.application.dto.PackageReviewResponse +import com.doki.review.domain.PackageReview +import com.doki.review.domain.PackageReviewRepository import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/src/main/kotlin/com/study/core/review/application/dto/CreatePackageReviewCommand.kt b/src/main/kotlin/com/doki/review/application/dto/CreatePackageReviewCommand.kt similarity index 74% rename from src/main/kotlin/com/study/core/review/application/dto/CreatePackageReviewCommand.kt rename to src/main/kotlin/com/doki/review/application/dto/CreatePackageReviewCommand.kt index ee05bd0..b4ce41e 100644 --- a/src/main/kotlin/com/study/core/review/application/dto/CreatePackageReviewCommand.kt +++ b/src/main/kotlin/com/doki/review/application/dto/CreatePackageReviewCommand.kt @@ -1,4 +1,4 @@ -package com.study.core.review.application.dto +package com.doki.review.application.dto data class CreatePackageReviewCommand( val packageId: Long, diff --git a/src/main/kotlin/com/study/core/review/application/dto/PackageReviewImageResponse.kt b/src/main/kotlin/com/doki/review/application/dto/PackageReviewImageResponse.kt similarity index 90% rename from src/main/kotlin/com/study/core/review/application/dto/PackageReviewImageResponse.kt rename to src/main/kotlin/com/doki/review/application/dto/PackageReviewImageResponse.kt index 0846825..8aebe1a 100644 --- a/src/main/kotlin/com/study/core/review/application/dto/PackageReviewImageResponse.kt +++ b/src/main/kotlin/com/doki/review/application/dto/PackageReviewImageResponse.kt @@ -1,6 +1,6 @@ -package com.study.core.review.application.dto +package com.doki.review.application.dto -import com.study.core.image.domain.Image +import com.doki.image.domain.Image import io.swagger.v3.oas.annotations.media.Schema @Schema(description = "패키지 리뷰 이미지 응답 DTO") diff --git a/src/main/kotlin/com/study/core/review/application/dto/PackageReviewResponse.kt b/src/main/kotlin/com/doki/review/application/dto/PackageReviewResponse.kt similarity index 89% rename from src/main/kotlin/com/study/core/review/application/dto/PackageReviewResponse.kt rename to src/main/kotlin/com/doki/review/application/dto/PackageReviewResponse.kt index a3e333c..843beaf 100644 --- a/src/main/kotlin/com/study/core/review/application/dto/PackageReviewResponse.kt +++ b/src/main/kotlin/com/doki/review/application/dto/PackageReviewResponse.kt @@ -1,6 +1,6 @@ -package com.study.core.review.application.dto +package com.doki.review.application.dto -import com.study.core.review.domain.PackageReview +import com.doki.review.domain.PackageReview import io.swagger.v3.oas.annotations.media.Schema import java.time.LocalDateTime @@ -23,7 +23,7 @@ data class PackageReviewResponse( ) { companion object { - fun from(packageReview: PackageReview, images: List = emptyList()): PackageReviewResponse { + fun from(packageReview: PackageReview, images: List = emptyList()): PackageReviewResponse { val createdAt = packageReview.createdAt ?: LocalDateTime.now() return PackageReviewResponse( reviewId = packageReview.id, diff --git a/src/main/kotlin/com/study/core/review/application/dto/ReviewImageFile.kt b/src/main/kotlin/com/doki/review/application/dto/ReviewImageFile.kt similarity index 71% rename from src/main/kotlin/com/study/core/review/application/dto/ReviewImageFile.kt rename to src/main/kotlin/com/doki/review/application/dto/ReviewImageFile.kt index e60bef5..b2b755f 100644 --- a/src/main/kotlin/com/study/core/review/application/dto/ReviewImageFile.kt +++ b/src/main/kotlin/com/doki/review/application/dto/ReviewImageFile.kt @@ -1,4 +1,4 @@ -package com.study.core.review.application.dto +package com.doki.review.application.dto data class ReviewImageFile( val originalFilename: String, diff --git a/src/main/kotlin/com/study/core/review/application/dto/UpdatePackageReviewCommand.kt b/src/main/kotlin/com/doki/review/application/dto/UpdatePackageReviewCommand.kt similarity index 77% rename from src/main/kotlin/com/study/core/review/application/dto/UpdatePackageReviewCommand.kt rename to src/main/kotlin/com/doki/review/application/dto/UpdatePackageReviewCommand.kt index bf4400e..6db102a 100644 --- a/src/main/kotlin/com/study/core/review/application/dto/UpdatePackageReviewCommand.kt +++ b/src/main/kotlin/com/doki/review/application/dto/UpdatePackageReviewCommand.kt @@ -1,4 +1,4 @@ -package com.study.core.review.application.dto +package com.doki.review.application.dto data class UpdatePackageReviewCommand( val packageId: Long, diff --git a/src/main/kotlin/com/study/core/review/domain/PackageReview.kt b/src/main/kotlin/com/doki/review/domain/PackageReview.kt similarity index 94% rename from src/main/kotlin/com/study/core/review/domain/PackageReview.kt rename to src/main/kotlin/com/doki/review/domain/PackageReview.kt index 1931d5b..b10c704 100644 --- a/src/main/kotlin/com/study/core/review/domain/PackageReview.kt +++ b/src/main/kotlin/com/doki/review/domain/PackageReview.kt @@ -1,7 +1,7 @@ -package com.study.core.review.domain +package com.doki.review.domain -import com.study.core.global.BaseEntity -import com.study.core.productpackage.domain.Package +import com.doki.global.BaseEntity +import com.doki.productpackage.domain.Package import jakarta.persistence.Column import jakarta.persistence.Embedded import jakarta.persistence.Entity diff --git a/src/main/kotlin/com/study/core/review/domain/PackageReviewRepository.kt b/src/main/kotlin/com/doki/review/domain/PackageReviewRepository.kt similarity index 89% rename from src/main/kotlin/com/study/core/review/domain/PackageReviewRepository.kt rename to src/main/kotlin/com/doki/review/domain/PackageReviewRepository.kt index 638e383..bcfbdab 100644 --- a/src/main/kotlin/com/study/core/review/domain/PackageReviewRepository.kt +++ b/src/main/kotlin/com/doki/review/domain/PackageReviewRepository.kt @@ -1,4 +1,4 @@ -package com.study.core.review.domain +package com.doki.review.domain interface PackageReviewRepository { diff --git a/src/main/kotlin/com/study/core/review/domain/ReviewRating.kt b/src/main/kotlin/com/doki/review/domain/ReviewRating.kt similarity index 92% rename from src/main/kotlin/com/study/core/review/domain/ReviewRating.kt rename to src/main/kotlin/com/doki/review/domain/ReviewRating.kt index ff8fce6..6d34922 100644 --- a/src/main/kotlin/com/study/core/review/domain/ReviewRating.kt +++ b/src/main/kotlin/com/doki/review/domain/ReviewRating.kt @@ -1,4 +1,4 @@ -package com.study.core.review.domain +package com.doki.review.domain import jakarta.persistence.Column import jakarta.persistence.Embeddable diff --git a/src/main/kotlin/com/doki/review/infrastructure/PackageReviewJpaRepository.kt b/src/main/kotlin/com/doki/review/infrastructure/PackageReviewJpaRepository.kt new file mode 100644 index 0000000..c4f9e7e --- /dev/null +++ b/src/main/kotlin/com/doki/review/infrastructure/PackageReviewJpaRepository.kt @@ -0,0 +1,10 @@ +package com.doki.review.infrastructure + +import org.springframework.data.jpa.repository.JpaRepository + +interface PackageReviewJpaRepository : JpaRepository { + + fun findAllByPkgId(packageId: Long): List + + fun findByPkgIdAndUserId(packageId: Long, userId: Long): com.doki.review.domain.PackageReview? +} diff --git a/src/main/kotlin/com/study/core/review/infrastructure/PackageReviewRepositoryImpl.kt b/src/main/kotlin/com/doki/review/infrastructure/PackageReviewRepositoryImpl.kt similarity index 50% rename from src/main/kotlin/com/study/core/review/infrastructure/PackageReviewRepositoryImpl.kt rename to src/main/kotlin/com/doki/review/infrastructure/PackageReviewRepositoryImpl.kt index fef04a7..1c31f83 100644 --- a/src/main/kotlin/com/study/core/review/infrastructure/PackageReviewRepositoryImpl.kt +++ b/src/main/kotlin/com/doki/review/infrastructure/PackageReviewRepositoryImpl.kt @@ -1,6 +1,6 @@ -package com.study.core.review.infrastructure +package com.doki.review.infrastructure -import com.study.core.review.domain.PackageReviewRepository +import com.doki.review.domain.PackageReviewRepository import org.springframework.stereotype.Repository @Repository @@ -8,18 +8,18 @@ class PackageReviewRepositoryImpl( private val packageReviewJpaRepository: PackageReviewJpaRepository ) : PackageReviewRepository { - override fun save(review: com.study.core.review.domain.PackageReview): com.study.core.review.domain.PackageReview = + override fun save(review: com.doki.review.domain.PackageReview): com.doki.review.domain.PackageReview = packageReviewJpaRepository.save(review) - override fun findById(reviewId: Long): com.study.core.review.domain.PackageReview? = + override fun findById(reviewId: Long): com.doki.review.domain.PackageReview? = packageReviewJpaRepository.findById(reviewId).orElse(null) - override fun findByPackageId(packageId: Long): List = + override fun findByPackageId(packageId: Long): List = packageReviewJpaRepository.findAllByPkgId(packageId) - override fun findByPackageIdAndUserId(packageId: Long, userId: Long): com.study.core.review.domain.PackageReview? = + override fun findByPackageIdAndUserId(packageId: Long, userId: Long): com.doki.review.domain.PackageReview? = packageReviewJpaRepository.findByPkgIdAndUserId(packageId, userId) - override fun delete(review: com.study.core.review.domain.PackageReview) = + override fun delete(review: com.doki.review.domain.PackageReview) = packageReviewJpaRepository.delete(review) } diff --git a/src/main/kotlin/com/study/core/review/ui/PackageReviewApi.kt b/src/main/kotlin/com/doki/review/ui/PackageReviewApi.kt similarity index 94% rename from src/main/kotlin/com/study/core/review/ui/PackageReviewApi.kt rename to src/main/kotlin/com/doki/review/ui/PackageReviewApi.kt index b852412..9186d1c 100644 --- a/src/main/kotlin/com/study/core/review/ui/PackageReviewApi.kt +++ b/src/main/kotlin/com/doki/review/ui/PackageReviewApi.kt @@ -1,8 +1,8 @@ -package com.study.core.review.ui +package com.doki.review.ui -import com.study.core.review.application.dto.PackageReviewResponse -import com.study.core.review.ui.request.CreatePackageReviewRequest -import com.study.core.review.ui.request.UpdatePackageReviewRequest +import com.doki.review.application.dto.PackageReviewResponse +import com.doki.review.ui.request.CreatePackageReviewRequest +import com.doki.review.ui.request.UpdatePackageReviewRequest import io.swagger.v3.oas.annotations.media.ArraySchema import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/com/study/core/review/ui/PackageReviewController.kt b/src/main/kotlin/com/doki/review/ui/PackageReviewController.kt similarity index 86% rename from src/main/kotlin/com/study/core/review/ui/PackageReviewController.kt rename to src/main/kotlin/com/doki/review/ui/PackageReviewController.kt index 93b976c..72f1251 100644 --- a/src/main/kotlin/com/study/core/review/ui/PackageReviewController.kt +++ b/src/main/kotlin/com/doki/review/ui/PackageReviewController.kt @@ -1,13 +1,13 @@ -package com.study.core.review.ui +package com.doki.review.ui -import com.study.core.review.application.PackageReviewCommandService -import com.study.core.review.application.PackageReviewQueryService -import com.study.core.review.application.dto.CreatePackageReviewCommand -import com.study.core.review.application.dto.PackageReviewResponse -import com.study.core.review.application.dto.ReviewImageFile -import com.study.core.review.application.dto.UpdatePackageReviewCommand -import com.study.core.review.ui.request.CreatePackageReviewRequest -import com.study.core.review.ui.request.UpdatePackageReviewRequest +import com.doki.review.application.PackageReviewCommandService +import com.doki.review.application.PackageReviewQueryService +import com.doki.review.application.dto.CreatePackageReviewCommand +import com.doki.review.application.dto.PackageReviewResponse +import com.doki.review.application.dto.ReviewImageFile +import com.doki.review.application.dto.UpdatePackageReviewCommand +import com.doki.review.ui.request.CreatePackageReviewRequest +import com.doki.review.ui.request.UpdatePackageReviewRequest import jakarta.validation.Valid import org.springframework.http.HttpStatus import org.springframework.http.MediaType diff --git a/src/main/kotlin/com/study/core/review/ui/request/CreatePackageReviewRequest.kt b/src/main/kotlin/com/doki/review/ui/request/CreatePackageReviewRequest.kt similarity index 94% rename from src/main/kotlin/com/study/core/review/ui/request/CreatePackageReviewRequest.kt rename to src/main/kotlin/com/doki/review/ui/request/CreatePackageReviewRequest.kt index 2f71a49..6690c17 100644 --- a/src/main/kotlin/com/study/core/review/ui/request/CreatePackageReviewRequest.kt +++ b/src/main/kotlin/com/doki/review/ui/request/CreatePackageReviewRequest.kt @@ -1,4 +1,4 @@ -package com.study.core.review.ui.request +package com.doki.review.ui.request import jakarta.validation.constraints.Max import jakarta.validation.constraints.Min diff --git a/src/main/kotlin/com/study/core/review/ui/request/UpdatePackageReviewRequest.kt b/src/main/kotlin/com/doki/review/ui/request/UpdatePackageReviewRequest.kt similarity index 94% rename from src/main/kotlin/com/study/core/review/ui/request/UpdatePackageReviewRequest.kt rename to src/main/kotlin/com/doki/review/ui/request/UpdatePackageReviewRequest.kt index 720c068..39a8c25 100644 --- a/src/main/kotlin/com/study/core/review/ui/request/UpdatePackageReviewRequest.kt +++ b/src/main/kotlin/com/doki/review/ui/request/UpdatePackageReviewRequest.kt @@ -1,4 +1,4 @@ -package com.study.core.review.ui.request +package com.doki.review.ui.request import jakarta.validation.constraints.Max import jakarta.validation.constraints.Min diff --git a/src/main/kotlin/com/study/core/user/application/UserService.kt b/src/main/kotlin/com/doki/user/application/UserService.kt similarity index 57% rename from src/main/kotlin/com/study/core/user/application/UserService.kt rename to src/main/kotlin/com/doki/user/application/UserService.kt index 14a5c2a..a806584 100644 --- a/src/main/kotlin/com/study/core/user/application/UserService.kt +++ b/src/main/kotlin/com/doki/user/application/UserService.kt @@ -1,9 +1,9 @@ -package com.study.core.user.application +package com.doki.user.application -import com.study.core.global.exceptions.CustomException -import com.study.core.global.exceptions.auth.AuthExceptionType -import com.study.core.user.domain.dto.GetUserLoginInfoResponse -import com.study.core.user.infrastructure.UserRepository +import com.doki.global.exceptions.CustomException +import com.doki.global.exceptions.auth.AuthExceptionType +import com.doki.user.application.dto.GetUserLoginInfoResponse +import com.doki.user.infrastructure.UserRepository import org.springframework.stereotype.Service @Service diff --git a/src/main/kotlin/com/study/core/user/dto/GetUserLoginInfoResponse.kt b/src/main/kotlin/com/doki/user/application/dto/GetUserLoginInfoResponse.kt similarity index 85% rename from src/main/kotlin/com/study/core/user/dto/GetUserLoginInfoResponse.kt rename to src/main/kotlin/com/doki/user/application/dto/GetUserLoginInfoResponse.kt index 7ceb2a4..4fe12f1 100644 --- a/src/main/kotlin/com/study/core/user/dto/GetUserLoginInfoResponse.kt +++ b/src/main/kotlin/com/doki/user/application/dto/GetUserLoginInfoResponse.kt @@ -1,6 +1,6 @@ -package com.study.core.user.dto +package com.doki.user.application.dto -import com.study.core.user.domain.User +import com.doki.user.domain.User import java.time.LocalDateTime data class GetUserLoginInfoResponse( diff --git a/src/main/kotlin/com/study/core/auth/application/AuthService.kt b/src/main/kotlin/com/doki/user/auth/application/AuthService.kt similarity index 80% rename from src/main/kotlin/com/study/core/auth/application/AuthService.kt rename to src/main/kotlin/com/doki/user/auth/application/AuthService.kt index f231128..380d097 100644 --- a/src/main/kotlin/com/study/core/auth/application/AuthService.kt +++ b/src/main/kotlin/com/doki/user/auth/application/AuthService.kt @@ -1,16 +1,16 @@ -package com.study.core.auth.application +package com.doki.user.auth.application -import com.study.core.auth.infrastructure.dto.response.AccessTokenResponse -import com.study.core.auth.infrastructure.dto.response.TokenResponse -import com.study.core.auth.infrastructure.support.RefreshTokenCookieSupporter -import com.study.core.global.enums.AuthProvider -import com.study.core.global.exceptions.CustomException -import com.study.core.global.exceptions.auth.AuthExceptionType -import com.study.core.global.security.JwtProvider -import com.study.core.user.domain.User -import com.study.core.user.domain.UserOAuth -import com.study.core.user.infrastructure.UserOAuthRepository -import com.study.core.user.infrastructure.UserRepository +import com.doki.user.auth.infrastructure.dto.response.AccessTokenResponse +import com.doki.user.auth.infrastructure.dto.response.TokenResponse +import com.doki.user.auth.infrastructure.support.RefreshTokenCookieSupporter +import com.doki.user.auth.domain.vo.AuthProvider +import com.doki.global.exceptions.CustomException +import com.doki.global.exceptions.auth.AuthExceptionType +import com.doki.global.security.JwtProvider +import com.doki.user.domain.User +import com.doki.user.auth.domain.UserOAuth +import com.doki.user.infrastructure.UserOAuthRepository +import com.doki.user.infrastructure.UserRepository import jakarta.servlet.http.HttpServletResponse import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/src/main/kotlin/com/study/core/auth/application/oauth/GoogleUserInfo.kt b/src/main/kotlin/com/doki/user/auth/application/oauth/GoogleUserInfo.kt similarity index 91% rename from src/main/kotlin/com/study/core/auth/application/oauth/GoogleUserInfo.kt rename to src/main/kotlin/com/doki/user/auth/application/oauth/GoogleUserInfo.kt index c80707e..012d954 100644 --- a/src/main/kotlin/com/study/core/auth/application/oauth/GoogleUserInfo.kt +++ b/src/main/kotlin/com/doki/user/auth/application/oauth/GoogleUserInfo.kt @@ -1,4 +1,4 @@ -package com.study.core.auth.application.oauth +package com.doki.user.auth.application.oauth class GoogleUserInfo( private val attributes: Map diff --git a/src/main/kotlin/com/study/core/auth/application/oauth/OAuth2UserInfo.kt b/src/main/kotlin/com/doki/user/auth/application/oauth/OAuth2UserInfo.kt similarity index 81% rename from src/main/kotlin/com/study/core/auth/application/oauth/OAuth2UserInfo.kt rename to src/main/kotlin/com/doki/user/auth/application/oauth/OAuth2UserInfo.kt index a126ed5..c02521e 100644 --- a/src/main/kotlin/com/study/core/auth/application/oauth/OAuth2UserInfo.kt +++ b/src/main/kotlin/com/doki/user/auth/application/oauth/OAuth2UserInfo.kt @@ -1,6 +1,6 @@ -package com.study.core.auth.application.oauth +package com.doki.user.auth.application.oauth -import com.study.core.global.enums.AuthProvider +import com.doki.user.auth.domain.vo.AuthProvider interface OAuth2UserInfo { val id : String diff --git a/src/main/kotlin/com/study/core/user/domain/UserOAuth.kt b/src/main/kotlin/com/doki/user/auth/domain/UserOAuth.kt similarity index 91% rename from src/main/kotlin/com/study/core/user/domain/UserOAuth.kt rename to src/main/kotlin/com/doki/user/auth/domain/UserOAuth.kt index fa386cf..e9ca3cc 100644 --- a/src/main/kotlin/com/study/core/user/domain/UserOAuth.kt +++ b/src/main/kotlin/com/doki/user/auth/domain/UserOAuth.kt @@ -1,6 +1,6 @@ -package com.study.core.user.domain +package com.doki.user.auth.domain -import com.study.core.global.enums.AuthProvider +import com.doki.user.auth.domain.vo.AuthProvider import jakarta.persistence.* @Entity diff --git a/src/main/kotlin/com/study/core/global/enums/AuthProvider.kt b/src/main/kotlin/com/doki/user/auth/domain/vo/AuthProvider.kt similarity index 68% rename from src/main/kotlin/com/study/core/global/enums/AuthProvider.kt rename to src/main/kotlin/com/doki/user/auth/domain/vo/AuthProvider.kt index 2e855ed..c02f0d1 100644 --- a/src/main/kotlin/com/study/core/global/enums/AuthProvider.kt +++ b/src/main/kotlin/com/doki/user/auth/domain/vo/AuthProvider.kt @@ -1,4 +1,4 @@ -package com.study.core.global.enums +package com.doki.user.auth.domain.vo enum class AuthProvider { GOOGLE diff --git a/src/main/kotlin/com/study/core/auth/infrastructure/dto/response/AccessTokenResponse.kt b/src/main/kotlin/com/doki/user/auth/infrastructure/dto/response/AccessTokenResponse.kt similarity index 69% rename from src/main/kotlin/com/study/core/auth/infrastructure/dto/response/AccessTokenResponse.kt rename to src/main/kotlin/com/doki/user/auth/infrastructure/dto/response/AccessTokenResponse.kt index 02309da..e2e2df3 100644 --- a/src/main/kotlin/com/study/core/auth/infrastructure/dto/response/AccessTokenResponse.kt +++ b/src/main/kotlin/com/doki/user/auth/infrastructure/dto/response/AccessTokenResponse.kt @@ -1,4 +1,4 @@ -package com.study.core.auth.infrastructure.dto.response +package com.doki.user.auth.infrastructure.dto.response data class AccessTokenResponse( val grantType: String, diff --git a/src/main/kotlin/com/study/core/auth/infrastructure/dto/response/TokenResponse.kt b/src/main/kotlin/com/doki/user/auth/infrastructure/dto/response/TokenResponse.kt similarity index 77% rename from src/main/kotlin/com/study/core/auth/infrastructure/dto/response/TokenResponse.kt rename to src/main/kotlin/com/doki/user/auth/infrastructure/dto/response/TokenResponse.kt index 3595655..adb0901 100644 --- a/src/main/kotlin/com/study/core/auth/infrastructure/dto/response/TokenResponse.kt +++ b/src/main/kotlin/com/doki/user/auth/infrastructure/dto/response/TokenResponse.kt @@ -1,4 +1,4 @@ -package com.study.core.auth.infrastructure.dto.response +package com.doki.user.auth.infrastructure.dto.response data class TokenResponse( val grantType: String, diff --git a/src/main/kotlin/com/study/core/auth/infrastructure/support/RefreshTokenCookieSupporter.kt b/src/main/kotlin/com/doki/user/auth/infrastructure/support/RefreshTokenCookieSupporter.kt similarity index 90% rename from src/main/kotlin/com/study/core/auth/infrastructure/support/RefreshTokenCookieSupporter.kt rename to src/main/kotlin/com/doki/user/auth/infrastructure/support/RefreshTokenCookieSupporter.kt index 5c25971..ae13533 100644 --- a/src/main/kotlin/com/study/core/auth/infrastructure/support/RefreshTokenCookieSupporter.kt +++ b/src/main/kotlin/com/doki/user/auth/infrastructure/support/RefreshTokenCookieSupporter.kt @@ -1,6 +1,5 @@ -package com.study.core.auth.infrastructure.support +package com.doki.user.auth.infrastructure.support -import com.study.core.auth.infrastructure.dto.response.TokenResponse import jakarta.servlet.http.HttpServletResponse import org.springframework.http.HttpHeaders import org.springframework.http.ResponseCookie diff --git a/src/main/kotlin/com/study/core/auth/oauth/CustomOAuth2User.kt b/src/main/kotlin/com/doki/user/auth/oauth/CustomOAuth2User.kt similarity index 73% rename from src/main/kotlin/com/study/core/auth/oauth/CustomOAuth2User.kt rename to src/main/kotlin/com/doki/user/auth/oauth/CustomOAuth2User.kt index 5b73be0..e601c97 100644 --- a/src/main/kotlin/com/study/core/auth/oauth/CustomOAuth2User.kt +++ b/src/main/kotlin/com/doki/user/auth/oauth/CustomOAuth2User.kt @@ -1,7 +1,7 @@ -package com.study.core.auth.oauth +package com.doki.user.auth.oauth -import com.study.core.auth.application.oauth.OAuth2UserInfo -import com.study.core.global.enums.AuthProvider +import com.doki.user.auth.application.oauth.OAuth2UserInfo +import com.doki.user.auth.domain.vo.AuthProvider import org.springframework.security.oauth2.core.user.OAuth2User class CustomOAuth2User( diff --git a/src/main/kotlin/com/study/core/auth/oauth/CustomOAuth2UserService.kt b/src/main/kotlin/com/doki/user/auth/oauth/CustomOAuth2UserService.kt similarity index 83% rename from src/main/kotlin/com/study/core/auth/oauth/CustomOAuth2UserService.kt rename to src/main/kotlin/com/doki/user/auth/oauth/CustomOAuth2UserService.kt index 9f67c44..3e545af 100644 --- a/src/main/kotlin/com/study/core/auth/oauth/CustomOAuth2UserService.kt +++ b/src/main/kotlin/com/doki/user/auth/oauth/CustomOAuth2UserService.kt @@ -1,7 +1,7 @@ -package com.study.core.auth.oauth +package com.doki.user.auth.oauth -import com.study.core.auth.application.oauth.OAuth2UserInfo -import com.study.core.global.enums.AuthProvider +import com.doki.user.auth.application.oauth.OAuth2UserInfo +import com.doki.user.auth.domain.vo.AuthProvider import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest import org.springframework.security.oauth2.core.user.OAuth2User diff --git a/src/main/kotlin/com/study/core/auth/oauth/OAuth2SuccessHandler.kt b/src/main/kotlin/com/doki/user/auth/oauth/OAuth2SuccessHandler.kt similarity index 88% rename from src/main/kotlin/com/study/core/auth/oauth/OAuth2SuccessHandler.kt rename to src/main/kotlin/com/doki/user/auth/oauth/OAuth2SuccessHandler.kt index 2c23f97..024af17 100644 --- a/src/main/kotlin/com/study/core/auth/oauth/OAuth2SuccessHandler.kt +++ b/src/main/kotlin/com/doki/user/auth/oauth/OAuth2SuccessHandler.kt @@ -1,7 +1,7 @@ -package com.study.core.auth.oauth +package com.doki.user.auth.oauth -import com.study.core.auth.application.AuthService -import com.study.core.auth.infrastructure.support.RefreshTokenCookieSupporter +import com.doki.user.auth.application.AuthService +import com.doki.user.auth.infrastructure.support.RefreshTokenCookieSupporter import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse import org.springframework.beans.factory.annotation.Value diff --git a/src/main/kotlin/com/study/core/auth/ui/AuthController.kt b/src/main/kotlin/com/doki/user/auth/ui/AuthController.kt similarity index 88% rename from src/main/kotlin/com/study/core/auth/ui/AuthController.kt rename to src/main/kotlin/com/doki/user/auth/ui/AuthController.kt index 17b9908..9fd35e2 100644 --- a/src/main/kotlin/com/study/core/auth/ui/AuthController.kt +++ b/src/main/kotlin/com/doki/user/auth/ui/AuthController.kt @@ -1,7 +1,7 @@ -package com.study.core.auth.ui +package com.doki.user.auth.ui -import com.study.core.auth.application.AuthService -import com.study.core.auth.infrastructure.dto.response.AccessTokenResponse +import com.doki.user.auth.application.AuthService +import com.doki.user.auth.infrastructure.dto.response.AccessTokenResponse import jakarta.servlet.http.HttpServletResponse import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.CookieValue diff --git a/src/main/kotlin/com/study/core/user/domain/User.kt b/src/main/kotlin/com/doki/user/domain/User.kt similarity index 89% rename from src/main/kotlin/com/study/core/user/domain/User.kt rename to src/main/kotlin/com/doki/user/domain/User.kt index 7533086..6122252 100644 --- a/src/main/kotlin/com/study/core/user/domain/User.kt +++ b/src/main/kotlin/com/doki/user/domain/User.kt @@ -1,6 +1,6 @@ -package com.study.core.user.domain +package com.doki.user.domain -import com.study.core.global.enums.UserRole +import com.doki.user.domain.vo.UserRole import jakarta.persistence.* import java.time.LocalDateTime diff --git a/src/main/kotlin/com/study/core/global/enums/UserRole.kt b/src/main/kotlin/com/doki/user/domain/vo/UserRole.kt similarity index 75% rename from src/main/kotlin/com/study/core/global/enums/UserRole.kt rename to src/main/kotlin/com/doki/user/domain/vo/UserRole.kt index 4855f1e..8acb8ed 100644 --- a/src/main/kotlin/com/study/core/global/enums/UserRole.kt +++ b/src/main/kotlin/com/doki/user/domain/vo/UserRole.kt @@ -1,4 +1,4 @@ -package com.study.core.global.enums +package com.doki.user.domain.vo enum class UserRole { USER // 회원 diff --git a/src/main/kotlin/com/study/core/user/domain/dto/GetUserLoginInfoResponse.kt b/src/main/kotlin/com/doki/user/dto/GetUserLoginInfoResponse.kt similarity index 83% rename from src/main/kotlin/com/study/core/user/domain/dto/GetUserLoginInfoResponse.kt rename to src/main/kotlin/com/doki/user/dto/GetUserLoginInfoResponse.kt index 29ffe4a..6f921d2 100644 --- a/src/main/kotlin/com/study/core/user/domain/dto/GetUserLoginInfoResponse.kt +++ b/src/main/kotlin/com/doki/user/dto/GetUserLoginInfoResponse.kt @@ -1,6 +1,6 @@ -package com.study.core.user.domain.dto +package com.doki.user.dto -import com.study.core.user.domain.User +import com.doki.user.domain.User import java.time.LocalDateTime data class GetUserLoginInfoResponse( diff --git a/src/main/kotlin/com/study/core/user/infrastructure/UserOAuthRepository.kt b/src/main/kotlin/com/doki/user/infrastructure/UserOAuthRepository.kt similarity index 67% rename from src/main/kotlin/com/study/core/user/infrastructure/UserOAuthRepository.kt rename to src/main/kotlin/com/doki/user/infrastructure/UserOAuthRepository.kt index 0279655..ea8cc90 100644 --- a/src/main/kotlin/com/study/core/user/infrastructure/UserOAuthRepository.kt +++ b/src/main/kotlin/com/doki/user/infrastructure/UserOAuthRepository.kt @@ -1,7 +1,7 @@ -package com.study.core.user.infrastructure +package com.doki.user.infrastructure -import com.study.core.global.enums.AuthProvider -import com.study.core.user.domain.UserOAuth +import com.doki.user.auth.domain.vo.AuthProvider +import com.doki.user.auth.domain.UserOAuth import org.springframework.data.jpa.repository.JpaRepository interface UserOAuthRepository : JpaRepository { diff --git a/src/main/kotlin/com/study/core/user/infrastructure/UserRepository.kt b/src/main/kotlin/com/doki/user/infrastructure/UserRepository.kt similarity index 66% rename from src/main/kotlin/com/study/core/user/infrastructure/UserRepository.kt rename to src/main/kotlin/com/doki/user/infrastructure/UserRepository.kt index 724f0b3..9d241ac 100644 --- a/src/main/kotlin/com/study/core/user/infrastructure/UserRepository.kt +++ b/src/main/kotlin/com/doki/user/infrastructure/UserRepository.kt @@ -1,6 +1,6 @@ -package com.study.core.user.infrastructure +package com.doki.user.infrastructure -import com.study.core.user.domain.User +import com.doki.user.domain.User import org.springframework.data.jpa.repository.JpaRepository interface UserRepository : JpaRepository { diff --git a/src/main/kotlin/com/study/core/user/ui/UserController.kt b/src/main/kotlin/com/doki/user/ui/UserController.kt similarity index 73% rename from src/main/kotlin/com/study/core/user/ui/UserController.kt rename to src/main/kotlin/com/doki/user/ui/UserController.kt index e31bfea..6b5f28a 100644 --- a/src/main/kotlin/com/study/core/user/ui/UserController.kt +++ b/src/main/kotlin/com/doki/user/ui/UserController.kt @@ -1,8 +1,8 @@ -package com.study.core.user.ui +package com.doki.user.ui -import com.study.core.global.resolver.LoginUser -import com.study.core.user.domain.dto.GetUserLoginInfoResponse -import com.study.core.user.application.UserService +import com.doki.global.resolver.LoginUser +import com.doki.user.application.dto.GetUserLoginInfoResponse +import com.doki.user.application.UserService import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/src/main/kotlin/com/study/core/image/application/event/ImageDeleteEvent.kt b/src/main/kotlin/com/study/core/image/application/event/ImageDeleteEvent.kt deleted file mode 100644 index e3da6a6..0000000 --- a/src/main/kotlin/com/study/core/image/application/event/ImageDeleteEvent.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.study.core.image.application.event - -import com.study.core.image.domain.vo.ImageAggregateType - -data class ImageDeleteEvent( - val aggregateType: ImageAggregateType, - val aggregateId: Long, -) diff --git a/src/main/kotlin/com/study/core/review/infrastructure/PackageReviewJpaRepository.kt b/src/main/kotlin/com/study/core/review/infrastructure/PackageReviewJpaRepository.kt deleted file mode 100644 index c748d4b..0000000 --- a/src/main/kotlin/com/study/core/review/infrastructure/PackageReviewJpaRepository.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.study.core.review.infrastructure - -import com.study.core.review.domain.PackageReview -import org.springframework.data.jpa.repository.JpaRepository - -interface PackageReviewJpaRepository : JpaRepository { - - fun findAllByPkgId(packageId: Long): List - - fun findByPkgIdAndUserId(packageId: Long, userId: Long): com.study.core.review.domain.PackageReview? -} diff --git a/src/test/kotlin/com/study/core/DokiApplicationTests.kt b/src/test/kotlin/com/doki/DokiApplicationTests.kt similarity index 92% rename from src/test/kotlin/com/study/core/DokiApplicationTests.kt rename to src/test/kotlin/com/doki/DokiApplicationTests.kt index 686418f..91a3daf 100644 --- a/src/test/kotlin/com/study/core/DokiApplicationTests.kt +++ b/src/test/kotlin/com/doki/DokiApplicationTests.kt @@ -1,4 +1,4 @@ -package com.study.core +package com.doki import org.junit.jupiter.api.Test import org.springframework.boot.test.context.SpringBootTest diff --git a/src/test/kotlin/com/study/core/auth/AuthControllerReissueTest.kt b/src/test/kotlin/com/doki/auth/AuthControllerReissueTest.kt similarity index 90% rename from src/test/kotlin/com/study/core/auth/AuthControllerReissueTest.kt rename to src/test/kotlin/com/doki/auth/AuthControllerReissueTest.kt index fee2e5a..265e4ac 100644 --- a/src/test/kotlin/com/study/core/auth/AuthControllerReissueTest.kt +++ b/src/test/kotlin/com/doki/auth/AuthControllerReissueTest.kt @@ -1,8 +1,8 @@ -package com.study.core.auth +package com.doki.auth -import com.study.core.auth.application.AuthService -import com.study.core.auth.infrastructure.dto.response.AccessTokenResponse -import com.study.core.auth.ui.AuthController +import com.doki.user.auth.application.AuthService +import com.doki.user.auth.infrastructure.dto.response.AccessTokenResponse +import com.doki.user.auth.ui.AuthController import jakarta.servlet.http.Cookie import org.junit.jupiter.api.Test import org.mockito.kotlin.any diff --git a/src/test/kotlin/com/study/core/auth/AuthServiceTest.kt b/src/test/kotlin/com/doki/auth/AuthServiceTest.kt similarity index 85% rename from src/test/kotlin/com/study/core/auth/AuthServiceTest.kt rename to src/test/kotlin/com/doki/auth/AuthServiceTest.kt index 73fedfb..6fae198 100644 --- a/src/test/kotlin/com/study/core/auth/AuthServiceTest.kt +++ b/src/test/kotlin/com/doki/auth/AuthServiceTest.kt @@ -1,14 +1,14 @@ -package com.study.core.auth +package com.doki.auth -import com.study.core.auth.application.AuthService -import com.study.core.auth.infrastructure.dto.response.AccessTokenResponse -import com.study.core.auth.infrastructure.dto.response.TokenResponse -import com.study.core.auth.infrastructure.support.RefreshTokenCookieSupporter -import com.study.core.global.security.JwtProvider -import com.study.core.user.domain.User -import com.study.core.user.infrastructure.UserOAuthRepository -import com.study.core.user.infrastructure.UserRepository +import com.doki.user.auth.application.AuthService +import com.doki.user.auth.infrastructure.dto.response.AccessTokenResponse +import com.doki.user.auth.infrastructure.dto.response.TokenResponse +import com.doki.user.auth.infrastructure.support.RefreshTokenCookieSupporter +import com.doki.global.security.JwtProvider +import com.doki.user.domain.User +import com.doki.user.infrastructure.UserOAuthRepository +import com.doki.user.infrastructure.UserRepository import jakarta.servlet.http.HttpServletResponse import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach diff --git a/src/test/kotlin/com/study/core/auth/RefreshTokenCookieSupporterTest.kt b/src/test/kotlin/com/doki/auth/RefreshTokenCookieSupporterTest.kt similarity index 92% rename from src/test/kotlin/com/study/core/auth/RefreshTokenCookieSupporterTest.kt rename to src/test/kotlin/com/doki/auth/RefreshTokenCookieSupporterTest.kt index 9c3114e..27ba279 100644 --- a/src/test/kotlin/com/study/core/auth/RefreshTokenCookieSupporterTest.kt +++ b/src/test/kotlin/com/doki/auth/RefreshTokenCookieSupporterTest.kt @@ -1,6 +1,6 @@ -package com.study.core.auth +package com.doki.auth -import com.study.core.auth.infrastructure.support.RefreshTokenCookieSupporter +import com.doki.user.auth.infrastructure.support.RefreshTokenCookieSupporter import org.junit.jupiter.api.Test import org.springframework.http.HttpHeaders import org.springframework.mock.web.MockHttpServletResponse diff --git a/src/test/kotlin/com/study/core/image/application/ImageEventListenerTest.kt b/src/test/kotlin/com/doki/image/application/ImageEventListenerTest.kt similarity index 82% rename from src/test/kotlin/com/study/core/image/application/ImageEventListenerTest.kt rename to src/test/kotlin/com/doki/image/application/ImageEventListenerTest.kt index 2a36dcc..f0cc8a6 100644 --- a/src/test/kotlin/com/study/core/image/application/ImageEventListenerTest.kt +++ b/src/test/kotlin/com/doki/image/application/ImageEventListenerTest.kt @@ -1,11 +1,11 @@ -package com.study.core.image.application - -import com.study.core.image.application.event.ImageCreateEvent -import com.study.core.image.domain.domainservice.StoredImage -import com.study.core.image.domain.domainservice.ImageStorage -import com.study.core.image.domain.Image -import com.study.core.image.domain.vo.ImageAggregateType -import com.study.core.image.domain.ImageRepository +package com.doki.image.application + +import com.doki.image.application.event.ImageCreateEvent +import com.doki.image.domain.domainservice.StoredImage +import com.doki.image.domain.domainservice.ImageStorage +import com.doki.image.domain.Image +import com.doki.image.domain.vo.ImageAggregateType +import com.doki.image.domain.ImageRepository import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldEndWith import io.mockk.every diff --git a/src/test/kotlin/com/study/core/image/domain/ImageTest.kt b/src/test/kotlin/com/doki/image/domain/ImageTest.kt similarity index 90% rename from src/test/kotlin/com/study/core/image/domain/ImageTest.kt rename to src/test/kotlin/com/doki/image/domain/ImageTest.kt index 6f00b46..0187e43 100644 --- a/src/test/kotlin/com/study/core/image/domain/ImageTest.kt +++ b/src/test/kotlin/com/doki/image/domain/ImageTest.kt @@ -1,8 +1,8 @@ -package com.study.core.image.domain +package com.doki.image.domain -import com.study.core.image.domain.domainservice.ImageStorage -import com.study.core.image.domain.domainservice.StoredImage -import com.study.core.image.domain.vo.ImageAggregateType +import com.doki.image.domain.domainservice.ImageStorage +import com.doki.image.domain.domainservice.StoredImage +import com.doki.image.domain.vo.ImageAggregateType import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldEndWith diff --git a/src/test/kotlin/com/study/core/image/infrastructure/LocalImageStorageTest.kt b/src/test/kotlin/com/doki/image/infrastructure/LocalImageStorageTest.kt similarity index 88% rename from src/test/kotlin/com/study/core/image/infrastructure/LocalImageStorageTest.kt rename to src/test/kotlin/com/doki/image/infrastructure/LocalImageStorageTest.kt index ec18932..53063ba 100644 --- a/src/test/kotlin/com/study/core/image/infrastructure/LocalImageStorageTest.kt +++ b/src/test/kotlin/com/doki/image/infrastructure/LocalImageStorageTest.kt @@ -1,6 +1,6 @@ -package com.study.core.image.infrastructure +package com.doki.image.infrastructure -import com.study.core.image.infrastructure.storage.LocalImageStorage +import com.doki.image.infrastructure.storage.LocalImageStorage import io.kotest.matchers.booleans.shouldBeTrue import io.kotest.matchers.shouldBe import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/study/core/productpackage/domain/PackageTest.kt b/src/test/kotlin/com/doki/productpackage/domain/PackageTest.kt similarity index 94% rename from src/test/kotlin/com/study/core/productpackage/domain/PackageTest.kt rename to src/test/kotlin/com/doki/productpackage/domain/PackageTest.kt index e5c5161..4ba79b9 100644 --- a/src/test/kotlin/com/study/core/productpackage/domain/PackageTest.kt +++ b/src/test/kotlin/com/doki/productpackage/domain/PackageTest.kt @@ -1,5 +1,6 @@ -package com.study.core.productpackage.domain +package com.doki.productpackage.domain +import com.doki.productpackage.product.domain.Product import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test @@ -9,7 +10,7 @@ import java.time.LocalDate class PackageTest { - private fun product(id: Long, price: String) = com.study.core.product.domain.Product( + private fun product(id: Long, price: String) = Product( id = id, name = "상품$id", description = "desc", diff --git a/src/test/kotlin/com/study/core/reservation/domain/ReservationSlotTest.kt b/src/test/kotlin/com/doki/reservation/domain/ReservationSlotTest.kt similarity index 95% rename from src/test/kotlin/com/study/core/reservation/domain/ReservationSlotTest.kt rename to src/test/kotlin/com/doki/reservation/domain/ReservationSlotTest.kt index 2fd6e97..a5db36f 100644 --- a/src/test/kotlin/com/study/core/reservation/domain/ReservationSlotTest.kt +++ b/src/test/kotlin/com/doki/reservation/domain/ReservationSlotTest.kt @@ -1,6 +1,7 @@ -package com.study.core.reservation.domain +package com.doki.reservation.domain -import com.study.core.productpackage.domain.Package +import com.doki.productpackage.domain.Package +import com.doki.productpackage.reservation.domain.ReservationSlot import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue diff --git a/src/test/kotlin/com/study/core/reservation/domain/ReservationTest.kt b/src/test/kotlin/com/doki/reservation/domain/ReservationTest.kt similarity index 95% rename from src/test/kotlin/com/study/core/reservation/domain/ReservationTest.kt rename to src/test/kotlin/com/doki/reservation/domain/ReservationTest.kt index eeeb361..4b5ab5e 100644 --- a/src/test/kotlin/com/study/core/reservation/domain/ReservationTest.kt +++ b/src/test/kotlin/com/doki/reservation/domain/ReservationTest.kt @@ -1,6 +1,9 @@ -package com.study.core.reservation.domain +package com.doki.reservation.domain -import com.study.core.productpackage.domain.Package +import com.doki.productpackage.domain.Package +import com.doki.productpackage.reservation.domain.Reservation +import com.doki.productpackage.reservation.domain.ReservationSlot +import com.doki.productpackage.reservation.domain.ReservationStatus import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue diff --git a/src/test/kotlin/com/study/core/review/application/PackageReviewCommandServiceTest.kt b/src/test/kotlin/com/doki/review/application/PackageReviewCommandServiceTest.kt similarity index 91% rename from src/test/kotlin/com/study/core/review/application/PackageReviewCommandServiceTest.kt rename to src/test/kotlin/com/doki/review/application/PackageReviewCommandServiceTest.kt index 85324e9..e963948 100644 --- a/src/test/kotlin/com/study/core/review/application/PackageReviewCommandServiceTest.kt +++ b/src/test/kotlin/com/doki/review/application/PackageReviewCommandServiceTest.kt @@ -1,15 +1,15 @@ -package com.study.core.review.application - -import com.study.core.image.application.ImageEventPublisher -import com.study.core.image.domain.vo.ImageAggregateType -import com.study.core.productpackage.domain.Package -import com.study.core.productpackage.domain.PackageRepository -import com.study.core.review.application.dto.CreatePackageReviewCommand -import com.study.core.review.application.dto.ReviewImageFile -import com.study.core.review.application.dto.UpdatePackageReviewCommand -import com.study.core.review.domain.PackageReview -import com.study.core.review.domain.PackageReviewRepository -import com.study.core.review.domain.ReviewRating +package com.doki.review.application + +import com.doki.image.application.ImageEventPublisher +import com.doki.image.domain.vo.ImageAggregateType +import com.doki.productpackage.domain.Package +import com.doki.productpackage.domain.PackageRepository +import com.doki.review.application.dto.CreatePackageReviewCommand +import com.doki.review.application.dto.ReviewImageFile +import com.doki.review.application.dto.UpdatePackageReviewCommand +import com.doki.review.domain.PackageReview +import com.doki.review.domain.PackageReviewRepository +import com.doki.review.domain.ReviewRating import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.shouldBe import io.mockk.every diff --git a/src/test/kotlin/com/study/core/review/application/PackageReviewQueryServiceTest.kt b/src/test/kotlin/com/doki/review/application/PackageReviewQueryServiceTest.kt similarity index 90% rename from src/test/kotlin/com/study/core/review/application/PackageReviewQueryServiceTest.kt rename to src/test/kotlin/com/doki/review/application/PackageReviewQueryServiceTest.kt index 385ff78..0807e38 100644 --- a/src/test/kotlin/com/study/core/review/application/PackageReviewQueryServiceTest.kt +++ b/src/test/kotlin/com/doki/review/application/PackageReviewQueryServiceTest.kt @@ -1,12 +1,12 @@ -package com.study.core.review.application +package com.doki.review.application -import com.study.core.image.domain.Image -import com.study.core.image.domain.ImageRepository -import com.study.core.image.domain.vo.ImageAggregateType -import com.study.core.productpackage.domain.Package -import com.study.core.review.domain.PackageReview -import com.study.core.review.domain.PackageReviewRepository -import com.study.core.review.domain.ReviewRating +import com.doki.image.domain.Image +import com.doki.image.domain.ImageRepository +import com.doki.image.domain.vo.ImageAggregateType +import com.doki.productpackage.domain.Package +import com.doki.review.domain.PackageReview +import com.doki.review.domain.PackageReviewRepository +import com.doki.review.domain.ReviewRating import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.shouldBe import io.mockk.every diff --git a/src/test/kotlin/com/study/core/review/domain/PackageReviewTest.kt b/src/test/kotlin/com/doki/review/domain/PackageReviewTest.kt similarity index 96% rename from src/test/kotlin/com/study/core/review/domain/PackageReviewTest.kt rename to src/test/kotlin/com/doki/review/domain/PackageReviewTest.kt index b20d81f..6b8d851 100644 --- a/src/test/kotlin/com/study/core/review/domain/PackageReviewTest.kt +++ b/src/test/kotlin/com/doki/review/domain/PackageReviewTest.kt @@ -1,6 +1,6 @@ -package com.study.core.review.domain +package com.doki.review.domain -import com.study.core.productpackage.domain.Package +import com.doki.productpackage.domain.Package import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.shouldBe import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/study/core/review/ui/PackageReviewControllerTest.kt b/src/test/kotlin/com/doki/review/ui/PackageReviewControllerTest.kt similarity index 90% rename from src/test/kotlin/com/study/core/review/ui/PackageReviewControllerTest.kt rename to src/test/kotlin/com/doki/review/ui/PackageReviewControllerTest.kt index 0212820..0e3a7e1 100644 --- a/src/test/kotlin/com/study/core/review/ui/PackageReviewControllerTest.kt +++ b/src/test/kotlin/com/doki/review/ui/PackageReviewControllerTest.kt @@ -1,14 +1,14 @@ -package com.study.core.review.ui +package com.doki.review.ui import com.fasterxml.jackson.databind.ObjectMapper -import com.study.core.global.enums.UserRole -import com.study.core.global.security.JwtProvider -import com.study.core.productpackage.domain.Package -import com.study.core.productpackage.infrastructure.PackageCommandRepository -import com.study.core.review.application.dto.PackageReviewResponse -import com.study.core.review.ui.request.CreatePackageReviewRequest -import com.study.core.review.ui.request.UpdatePackageReviewRequest -import com.study.core.testhelper.IntegrationTest +import com.doki.user.domain.vo.UserRole +import com.doki.global.security.JwtProvider +import com.doki.productpackage.domain.Package +import com.doki.productpackage.infrastructure.PackageCommandRepository +import com.doki.review.application.dto.PackageReviewResponse +import com.doki.review.ui.request.CreatePackageReviewRequest +import com.doki.review.ui.request.UpdatePackageReviewRequest +import com.doki.testhelper.IntegrationTest import io.kotest.matchers.shouldBe import io.restassured.RestAssured.given import io.restassured.builder.MultiPartSpecBuilder diff --git a/src/test/kotlin/com/study/core/testhelper/IntegrationTest.kt b/src/test/kotlin/com/doki/testhelper/IntegrationTest.kt similarity index 98% rename from src/test/kotlin/com/study/core/testhelper/IntegrationTest.kt rename to src/test/kotlin/com/doki/testhelper/IntegrationTest.kt index 57b2d18..45525e9 100644 --- a/src/test/kotlin/com/study/core/testhelper/IntegrationTest.kt +++ b/src/test/kotlin/com/doki/testhelper/IntegrationTest.kt @@ -1,4 +1,4 @@ -package com.study.core.testhelper +package com.doki.testhelper import io.restassured.RestAssured import jakarta.persistence.EntityManager