diff --git a/backend/src/main/java/com/festago/application/AdminService.java b/backend/src/main/java/com/festago/admin/application/AdminService.java similarity index 82% rename from backend/src/main/java/com/festago/application/AdminService.java rename to backend/src/main/java/com/festago/admin/application/AdminService.java index 20b337d79..6ee9d2de8 100644 --- a/backend/src/main/java/com/festago/application/AdminService.java +++ b/backend/src/main/java/com/festago/admin/application/AdminService.java @@ -1,17 +1,17 @@ -package com.festago.application; +package com.festago.admin.application; -import com.festago.domain.Festival; -import com.festago.domain.FestivalRepository; -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.domain.Ticket; -import com.festago.domain.TicketAmount; -import com.festago.domain.TicketEntryTime; -import com.festago.domain.TicketRepository; -import com.festago.dto.AdminFestivalResponse; -import com.festago.dto.AdminResponse; -import com.festago.dto.AdminStageResponse; -import com.festago.dto.AdminTicketResponse; +import com.festago.admin.dto.AdminFestivalResponse; +import com.festago.admin.dto.AdminResponse; +import com.festago.admin.dto.AdminStageResponse; +import com.festago.admin.dto.AdminTicketResponse; +import com.festago.festival.domain.Festival; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketAmount; +import com.festago.ticket.domain.TicketEntryTime; +import com.festago.ticket.repository.TicketRepository; import java.time.LocalDateTime; import java.util.List; import java.util.Map; diff --git a/backend/src/main/java/com/festago/auth/domain/Admin.java b/backend/src/main/java/com/festago/admin/domain/Admin.java similarity index 90% rename from backend/src/main/java/com/festago/auth/domain/Admin.java rename to backend/src/main/java/com/festago/admin/domain/Admin.java index 60aec0c40..40e5ca0a4 100644 --- a/backend/src/main/java/com/festago/auth/domain/Admin.java +++ b/backend/src/main/java/com/festago/admin/domain/Admin.java @@ -1,6 +1,6 @@ -package com.festago.auth.domain; +package com.festago.admin.domain; -import com.festago.domain.BaseTimeEntity; +import com.festago.common.domain.BaseTimeEntity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/backend/src/main/java/com/festago/dto/AdminFestivalResponse.java b/backend/src/main/java/com/festago/admin/dto/AdminFestivalResponse.java similarity index 84% rename from backend/src/main/java/com/festago/dto/AdminFestivalResponse.java rename to backend/src/main/java/com/festago/admin/dto/AdminFestivalResponse.java index 05b0b7e34..ad409142f 100644 --- a/backend/src/main/java/com/festago/dto/AdminFestivalResponse.java +++ b/backend/src/main/java/com/festago/admin/dto/AdminFestivalResponse.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.admin.dto; import java.time.LocalDate; diff --git a/backend/src/main/java/com/festago/dto/AdminResponse.java b/backend/src/main/java/com/festago/admin/dto/AdminResponse.java similarity index 86% rename from backend/src/main/java/com/festago/dto/AdminResponse.java rename to backend/src/main/java/com/festago/admin/dto/AdminResponse.java index 1017c3a34..13c6498ab 100644 --- a/backend/src/main/java/com/festago/dto/AdminResponse.java +++ b/backend/src/main/java/com/festago/admin/dto/AdminResponse.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.admin.dto; import java.util.List; diff --git a/backend/src/main/java/com/festago/dto/AdminStageResponse.java b/backend/src/main/java/com/festago/admin/dto/AdminStageResponse.java similarity index 86% rename from backend/src/main/java/com/festago/dto/AdminStageResponse.java rename to backend/src/main/java/com/festago/admin/dto/AdminStageResponse.java index 7b5d09742..ab568d4c2 100644 --- a/backend/src/main/java/com/festago/dto/AdminStageResponse.java +++ b/backend/src/main/java/com/festago/admin/dto/AdminStageResponse.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.admin.dto; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/main/java/com/festago/dto/AdminTicketResponse.java b/backend/src/main/java/com/festago/admin/dto/AdminTicketResponse.java similarity index 77% rename from backend/src/main/java/com/festago/dto/AdminTicketResponse.java rename to backend/src/main/java/com/festago/admin/dto/AdminTicketResponse.java index 9f2cdb3c2..88c93754d 100644 --- a/backend/src/main/java/com/festago/dto/AdminTicketResponse.java +++ b/backend/src/main/java/com/festago/admin/dto/AdminTicketResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.admin.dto; -import com.festago.domain.TicketType; +import com.festago.ticket.domain.TicketType; import java.time.LocalDateTime; import java.util.Map; diff --git a/backend/src/main/java/com/festago/auth/domain/AdminRepository.java b/backend/src/main/java/com/festago/admin/repository/AdminRepository.java similarity index 77% rename from backend/src/main/java/com/festago/auth/domain/AdminRepository.java rename to backend/src/main/java/com/festago/admin/repository/AdminRepository.java index 399ad36d9..6bb333397 100644 --- a/backend/src/main/java/com/festago/auth/domain/AdminRepository.java +++ b/backend/src/main/java/com/festago/admin/repository/AdminRepository.java @@ -1,5 +1,6 @@ -package com.festago.auth.domain; +package com.festago.admin.repository; +import com.festago.admin.domain.Admin; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/com/festago/auth/application/AdminAuthService.java b/backend/src/main/java/com/festago/auth/application/AdminAuthService.java index a5e788238..9d80d2ccd 100644 --- a/backend/src/main/java/com/festago/auth/application/AdminAuthService.java +++ b/backend/src/main/java/com/festago/auth/application/AdminAuthService.java @@ -1,17 +1,16 @@ package com.festago.auth.application; -import com.festago.auth.domain.Admin; -import com.festago.auth.domain.AdminRepository; +import com.festago.admin.domain.Admin; +import com.festago.admin.repository.AdminRepository; import com.festago.auth.domain.AuthPayload; -import com.festago.auth.domain.AuthProvider; import com.festago.auth.domain.Role; import com.festago.auth.dto.AdminLoginRequest; import com.festago.auth.dto.AdminSignupRequest; import com.festago.auth.dto.AdminSignupResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.ForbiddenException; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.ForbiddenException; +import com.festago.common.exception.UnauthorizedException; import java.util.Objects; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/festago/auth/application/AuthExtractor.java b/backend/src/main/java/com/festago/auth/application/AuthExtractor.java new file mode 100644 index 000000000..326ae5121 --- /dev/null +++ b/backend/src/main/java/com/festago/auth/application/AuthExtractor.java @@ -0,0 +1,8 @@ +package com.festago.auth.application; + +import com.festago.auth.domain.AuthPayload; + +public interface AuthExtractor { + + AuthPayload extract(String token); +} diff --git a/backend/src/main/java/com/festago/auth/application/AuthFacadeService.java b/backend/src/main/java/com/festago/auth/application/AuthFacadeService.java index 7f9373f7f..b87ffea85 100644 --- a/backend/src/main/java/com/festago/auth/application/AuthFacadeService.java +++ b/backend/src/main/java/com/festago/auth/application/AuthFacadeService.java @@ -1,9 +1,6 @@ package com.festago.auth.application; import com.festago.auth.domain.AuthPayload; -import com.festago.auth.domain.AuthProvider; -import com.festago.auth.domain.OAuth2Client; -import com.festago.auth.domain.OAuth2Clients; import com.festago.auth.domain.Role; import com.festago.auth.domain.UserInfo; import com.festago.auth.dto.LoginMemberDto; diff --git a/backend/src/main/java/com/festago/auth/application/AuthProvider.java b/backend/src/main/java/com/festago/auth/application/AuthProvider.java new file mode 100644 index 000000000..f4a52c123 --- /dev/null +++ b/backend/src/main/java/com/festago/auth/application/AuthProvider.java @@ -0,0 +1,8 @@ +package com.festago.auth.application; + +import com.festago.auth.domain.AuthPayload; + +public interface AuthProvider { + + String provide(AuthPayload authPayload); +} diff --git a/backend/src/main/java/com/festago/auth/application/AuthService.java b/backend/src/main/java/com/festago/auth/application/AuthService.java index 7f6881a27..6c8b26647 100644 --- a/backend/src/main/java/com/festago/auth/application/AuthService.java +++ b/backend/src/main/java/com/festago/auth/application/AuthService.java @@ -2,10 +2,10 @@ import com.festago.auth.domain.UserInfo; import com.festago.auth.dto.LoginMemberDto; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/festago/auth/application/OAuth2Client.java b/backend/src/main/java/com/festago/auth/application/OAuth2Client.java new file mode 100644 index 000000000..1e4e1d378 --- /dev/null +++ b/backend/src/main/java/com/festago/auth/application/OAuth2Client.java @@ -0,0 +1,11 @@ +package com.festago.auth.application; + +import com.festago.auth.domain.SocialType; +import com.festago.auth.domain.UserInfo; + +public interface OAuth2Client { + + UserInfo getUserInfo(String accessToken); + + SocialType getSocialType(); +} diff --git a/backend/src/main/java/com/festago/auth/domain/OAuth2Clients.java b/backend/src/main/java/com/festago/auth/application/OAuth2Clients.java similarity index 86% rename from backend/src/main/java/com/festago/auth/domain/OAuth2Clients.java rename to backend/src/main/java/com/festago/auth/application/OAuth2Clients.java index 59e3bc436..7805c57f0 100644 --- a/backend/src/main/java/com/festago/auth/domain/OAuth2Clients.java +++ b/backend/src/main/java/com/festago/auth/application/OAuth2Clients.java @@ -1,8 +1,9 @@ -package com.festago.auth.domain; +package com.festago.auth.application; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.auth.domain.SocialType; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; import java.util.EnumMap; import java.util.List; import java.util.Map; diff --git a/backend/src/main/java/com/festago/auth/domain/TokenExtractor.java b/backend/src/main/java/com/festago/auth/application/TokenExtractor.java similarity index 81% rename from backend/src/main/java/com/festago/auth/domain/TokenExtractor.java rename to backend/src/main/java/com/festago/auth/application/TokenExtractor.java index 004c60bb6..f9396bd9c 100644 --- a/backend/src/main/java/com/festago/auth/domain/TokenExtractor.java +++ b/backend/src/main/java/com/festago/auth/application/TokenExtractor.java @@ -1,4 +1,4 @@ -package com.festago.auth.domain; +package com.festago.auth.application; import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; diff --git a/backend/src/main/java/com/festago/auth/config/AuthConfig.java b/backend/src/main/java/com/festago/auth/config/AuthConfig.java index ef7bd2daf..5912d12b3 100644 --- a/backend/src/main/java/com/festago/auth/config/AuthConfig.java +++ b/backend/src/main/java/com/festago/auth/config/AuthConfig.java @@ -1,9 +1,9 @@ package com.festago.auth.config; -import com.festago.auth.domain.AuthExtractor; -import com.festago.auth.domain.AuthProvider; -import com.festago.auth.domain.OAuth2Client; -import com.festago.auth.domain.OAuth2Clients; +import com.festago.auth.application.AuthExtractor; +import com.festago.auth.application.AuthProvider; +import com.festago.auth.application.OAuth2Client; +import com.festago.auth.application.OAuth2Clients; import com.festago.auth.infrastructure.JwtAuthExtractor; import com.festago.auth.infrastructure.JwtAuthProvider; import java.util.List; diff --git a/backend/src/main/java/com/festago/auth/config/LoginConfig.java b/backend/src/main/java/com/festago/auth/config/LoginConfig.java index 1c0c755be..34715834f 100644 --- a/backend/src/main/java/com/festago/auth/config/LoginConfig.java +++ b/backend/src/main/java/com/festago/auth/config/LoginConfig.java @@ -1,12 +1,12 @@ package com.festago.auth.config; -import com.festago.auth.domain.AuthExtractor; +import com.festago.auth.application.AuthExtractor; import com.festago.auth.domain.Role; import com.festago.auth.infrastructure.CookieTokenExtractor; import com.festago.auth.infrastructure.HeaderTokenExtractor; -import com.festago.auth.presentation.AuthInterceptor; -import com.festago.auth.presentation.AuthenticateContext; -import com.festago.auth.presentation.RoleArgumentResolver; +import com.festago.presentation.auth.AuthInterceptor; +import com.festago.presentation.auth.AuthenticateContext; +import com.festago.presentation.auth.RoleArgumentResolver; import java.util.List; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/com/festago/auth/domain/AuthExtractor.java b/backend/src/main/java/com/festago/auth/domain/AuthExtractor.java deleted file mode 100644 index a8b4bd2d5..000000000 --- a/backend/src/main/java/com/festago/auth/domain/AuthExtractor.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.festago.auth.domain; - -public interface AuthExtractor { - - AuthPayload extract(String token); -} diff --git a/backend/src/main/java/com/festago/auth/domain/AuthPayload.java b/backend/src/main/java/com/festago/auth/domain/AuthPayload.java index 0c8f91b12..1b174f74c 100644 --- a/backend/src/main/java/com/festago/auth/domain/AuthPayload.java +++ b/backend/src/main/java/com/festago/auth/domain/AuthPayload.java @@ -1,7 +1,7 @@ package com.festago.auth.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; public class AuthPayload { diff --git a/backend/src/main/java/com/festago/auth/domain/AuthProvider.java b/backend/src/main/java/com/festago/auth/domain/AuthProvider.java deleted file mode 100644 index 195dc78c2..000000000 --- a/backend/src/main/java/com/festago/auth/domain/AuthProvider.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.festago.auth.domain; - -public interface AuthProvider { - - String provide(AuthPayload authPayload); -} diff --git a/backend/src/main/java/com/festago/auth/domain/OAuth2Client.java b/backend/src/main/java/com/festago/auth/domain/OAuth2Client.java deleted file mode 100644 index 39de5dd4f..000000000 --- a/backend/src/main/java/com/festago/auth/domain/OAuth2Client.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.festago.auth.domain; - -public interface OAuth2Client { - - UserInfo getUserInfo(String accessToken); - - SocialType getSocialType(); -} diff --git a/backend/src/main/java/com/festago/auth/domain/Role.java b/backend/src/main/java/com/festago/auth/domain/Role.java index 28e1924dd..69936580b 100644 --- a/backend/src/main/java/com/festago/auth/domain/Role.java +++ b/backend/src/main/java/com/festago/auth/domain/Role.java @@ -3,8 +3,8 @@ import com.festago.auth.annotation.Admin; import com.festago.auth.annotation.Anonymous; import com.festago.auth.annotation.Member; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; import java.lang.annotation.Annotation; public enum Role { diff --git a/backend/src/main/java/com/festago/auth/domain/UserInfo.java b/backend/src/main/java/com/festago/auth/domain/UserInfo.java index 0d36f66f8..3df1d31be 100644 --- a/backend/src/main/java/com/festago/auth/domain/UserInfo.java +++ b/backend/src/main/java/com/festago/auth/domain/UserInfo.java @@ -1,6 +1,6 @@ package com.festago.auth.domain; -import com.festago.domain.Member; +import com.festago.member.domain.Member; public record UserInfo( String socialId, diff --git a/backend/src/main/java/com/festago/auth/dto/LoginMemberDto.java b/backend/src/main/java/com/festago/auth/dto/LoginMemberDto.java index f331449ab..5a921bffb 100644 --- a/backend/src/main/java/com/festago/auth/dto/LoginMemberDto.java +++ b/backend/src/main/java/com/festago/auth/dto/LoginMemberDto.java @@ -1,6 +1,6 @@ package com.festago.auth.dto; -import com.festago.domain.Member; +import com.festago.member.domain.Member; public record LoginMemberDto( boolean isNew, diff --git a/backend/src/main/java/com/festago/auth/infrastructure/CookieTokenExtractor.java b/backend/src/main/java/com/festago/auth/infrastructure/CookieTokenExtractor.java index 1e8f03a41..e3d490374 100644 --- a/backend/src/main/java/com/festago/auth/infrastructure/CookieTokenExtractor.java +++ b/backend/src/main/java/com/festago/auth/infrastructure/CookieTokenExtractor.java @@ -1,6 +1,6 @@ package com.festago.auth.infrastructure; -import com.festago.auth.domain.TokenExtractor; +import com.festago.auth.application.TokenExtractor; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import java.util.Objects; diff --git a/backend/src/main/java/com/festago/auth/infrastructure/FestagoOAuth2Client.java b/backend/src/main/java/com/festago/auth/infrastructure/FestagoOAuth2Client.java index 2012371f4..b46f74a3a 100644 --- a/backend/src/main/java/com/festago/auth/infrastructure/FestagoOAuth2Client.java +++ b/backend/src/main/java/com/festago/auth/infrastructure/FestagoOAuth2Client.java @@ -1,10 +1,10 @@ package com.festago.auth.infrastructure; -import com.festago.auth.domain.OAuth2Client; +import com.festago.auth.application.OAuth2Client; import com.festago.auth.domain.SocialType; import com.festago.auth.domain.UserInfo; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; diff --git a/backend/src/main/java/com/festago/auth/infrastructure/HeaderTokenExtractor.java b/backend/src/main/java/com/festago/auth/infrastructure/HeaderTokenExtractor.java index f0e4f6b09..f0eab8f78 100644 --- a/backend/src/main/java/com/festago/auth/infrastructure/HeaderTokenExtractor.java +++ b/backend/src/main/java/com/festago/auth/infrastructure/HeaderTokenExtractor.java @@ -1,8 +1,8 @@ package com.festago.auth.infrastructure; -import com.festago.auth.domain.TokenExtractor; -import com.festago.exception.ErrorCode; -import com.festago.exception.UnauthorizedException; +import com.festago.auth.application.TokenExtractor; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.UnauthorizedException; import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; import org.springframework.http.HttpHeaders; diff --git a/backend/src/main/java/com/festago/auth/infrastructure/JwtAuthExtractor.java b/backend/src/main/java/com/festago/auth/infrastructure/JwtAuthExtractor.java index 1ee63953d..5eef34745 100644 --- a/backend/src/main/java/com/festago/auth/infrastructure/JwtAuthExtractor.java +++ b/backend/src/main/java/com/festago/auth/infrastructure/JwtAuthExtractor.java @@ -1,10 +1,10 @@ package com.festago.auth.infrastructure; -import com.festago.auth.domain.AuthExtractor; +import com.festago.auth.application.AuthExtractor; import com.festago.auth.domain.AuthPayload; import com.festago.auth.domain.Role; -import com.festago.exception.ErrorCode; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.UnauthorizedException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.JwtException; diff --git a/backend/src/main/java/com/festago/auth/infrastructure/JwtAuthProvider.java b/backend/src/main/java/com/festago/auth/infrastructure/JwtAuthProvider.java index 7e06132c3..77ce6bda1 100644 --- a/backend/src/main/java/com/festago/auth/infrastructure/JwtAuthProvider.java +++ b/backend/src/main/java/com/festago/auth/infrastructure/JwtAuthProvider.java @@ -1,7 +1,7 @@ package com.festago.auth.infrastructure; +import com.festago.auth.application.AuthProvider; import com.festago.auth.domain.AuthPayload; -import com.festago.auth.domain.AuthProvider; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.security.Keys; diff --git a/backend/src/main/java/com/festago/auth/infrastructure/KakaoOAuth2Client.java b/backend/src/main/java/com/festago/auth/infrastructure/KakaoOAuth2Client.java index 8a6436b2b..b89eda3c0 100644 --- a/backend/src/main/java/com/festago/auth/infrastructure/KakaoOAuth2Client.java +++ b/backend/src/main/java/com/festago/auth/infrastructure/KakaoOAuth2Client.java @@ -1,6 +1,6 @@ package com.festago.auth.infrastructure; -import com.festago.auth.domain.OAuth2Client; +import com.festago.auth.application.OAuth2Client; import com.festago.auth.domain.SocialType; import com.festago.auth.domain.UserInfo; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/com/festago/auth/infrastructure/KakaoOAuth2UserInfoErrorHandler.java b/backend/src/main/java/com/festago/auth/infrastructure/KakaoOAuth2UserInfoErrorHandler.java index 4860bc89c..044f4d408 100644 --- a/backend/src/main/java/com/festago/auth/infrastructure/KakaoOAuth2UserInfoErrorHandler.java +++ b/backend/src/main/java/com/festago/auth/infrastructure/KakaoOAuth2UserInfoErrorHandler.java @@ -1,8 +1,8 @@ package com.festago.auth.infrastructure; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; import java.io.IOException; import org.springframework.http.HttpStatusCode; import org.springframework.http.client.ClientHttpResponse; diff --git a/backend/src/main/java/com/festago/aop/LogRequestBody.java b/backend/src/main/java/com/festago/common/aop/LogRequestBody.java similarity index 92% rename from backend/src/main/java/com/festago/aop/LogRequestBody.java rename to backend/src/main/java/com/festago/common/aop/LogRequestBody.java index 005c4d2ae..372190b58 100644 --- a/backend/src/main/java/com/festago/aop/LogRequestBody.java +++ b/backend/src/main/java/com/festago/common/aop/LogRequestBody.java @@ -1,4 +1,4 @@ -package com.festago.aop; +package com.festago.common.aop; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/com/festago/aop/LogRequestBodyAspect.java b/backend/src/main/java/com/festago/common/aop/LogRequestBodyAspect.java similarity index 96% rename from backend/src/main/java/com/festago/aop/LogRequestBodyAspect.java rename to backend/src/main/java/com/festago/common/aop/LogRequestBodyAspect.java index ebb553e4c..e00ad0e9e 100644 --- a/backend/src/main/java/com/festago/aop/LogRequestBodyAspect.java +++ b/backend/src/main/java/com/festago/common/aop/LogRequestBodyAspect.java @@ -1,8 +1,8 @@ -package com.festago.aop; +package com.festago.common.aop; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.lang.reflect.Method; diff --git a/backend/src/main/java/com/festago/domain/BaseTimeEntity.java b/backend/src/main/java/com/festago/common/domain/BaseTimeEntity.java similarity index 95% rename from backend/src/main/java/com/festago/domain/BaseTimeEntity.java rename to backend/src/main/java/com/festago/common/domain/BaseTimeEntity.java index 82c446193..7a8621f42 100644 --- a/backend/src/main/java/com/festago/domain/BaseTimeEntity.java +++ b/backend/src/main/java/com/festago/common/domain/BaseTimeEntity.java @@ -1,4 +1,4 @@ -package com.festago.domain; +package com.festago.common.domain; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/backend/src/main/java/com/festago/exception/BadRequestException.java b/backend/src/main/java/com/festago/common/exception/BadRequestException.java similarity index 79% rename from backend/src/main/java/com/festago/exception/BadRequestException.java rename to backend/src/main/java/com/festago/common/exception/BadRequestException.java index 13ac36288..cd4372162 100644 --- a/backend/src/main/java/com/festago/exception/BadRequestException.java +++ b/backend/src/main/java/com/festago/common/exception/BadRequestException.java @@ -1,4 +1,4 @@ -package com.festago.exception; +package com.festago.common.exception; public class BadRequestException extends FestaGoException { diff --git a/backend/src/main/java/com/festago/exception/ErrorCode.java b/backend/src/main/java/com/festago/common/exception/ErrorCode.java similarity index 99% rename from backend/src/main/java/com/festago/exception/ErrorCode.java rename to backend/src/main/java/com/festago/common/exception/ErrorCode.java index bcf1cae53..175e4dca1 100644 --- a/backend/src/main/java/com/festago/exception/ErrorCode.java +++ b/backend/src/main/java/com/festago/common/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package com.festago.exception; +package com.festago.common.exception; public enum ErrorCode { // 400 diff --git a/backend/src/main/java/com/festago/exception/FestaGoException.java b/backend/src/main/java/com/festago/common/exception/FestaGoException.java similarity index 93% rename from backend/src/main/java/com/festago/exception/FestaGoException.java rename to backend/src/main/java/com/festago/common/exception/FestaGoException.java index 1a9ad0fa0..4bbdab694 100644 --- a/backend/src/main/java/com/festago/exception/FestaGoException.java +++ b/backend/src/main/java/com/festago/common/exception/FestaGoException.java @@ -1,4 +1,4 @@ -package com.festago.exception; +package com.festago.common.exception; import org.springframework.core.NestedRuntimeException; diff --git a/backend/src/main/java/com/festago/exception/ForbiddenException.java b/backend/src/main/java/com/festago/common/exception/ForbiddenException.java similarity index 79% rename from backend/src/main/java/com/festago/exception/ForbiddenException.java rename to backend/src/main/java/com/festago/common/exception/ForbiddenException.java index b1b9f400e..e7b08812b 100644 --- a/backend/src/main/java/com/festago/exception/ForbiddenException.java +++ b/backend/src/main/java/com/festago/common/exception/ForbiddenException.java @@ -1,4 +1,4 @@ -package com.festago.exception; +package com.festago.common.exception; public class ForbiddenException extends FestaGoException { diff --git a/backend/src/main/java/com/festago/exception/InternalServerException.java b/backend/src/main/java/com/festago/common/exception/InternalServerException.java similarity index 87% rename from backend/src/main/java/com/festago/exception/InternalServerException.java rename to backend/src/main/java/com/festago/common/exception/InternalServerException.java index d9cf8f4aa..0fbf320f5 100644 --- a/backend/src/main/java/com/festago/exception/InternalServerException.java +++ b/backend/src/main/java/com/festago/common/exception/InternalServerException.java @@ -1,4 +1,4 @@ -package com.festago.exception; +package com.festago.common.exception; public class InternalServerException extends FestaGoException { diff --git a/backend/src/main/java/com/festago/exception/NotFoundException.java b/backend/src/main/java/com/festago/common/exception/NotFoundException.java similarity index 79% rename from backend/src/main/java/com/festago/exception/NotFoundException.java rename to backend/src/main/java/com/festago/common/exception/NotFoundException.java index 6fc8777ca..4600daf49 100644 --- a/backend/src/main/java/com/festago/exception/NotFoundException.java +++ b/backend/src/main/java/com/festago/common/exception/NotFoundException.java @@ -1,4 +1,4 @@ -package com.festago.exception; +package com.festago.common.exception; public class NotFoundException extends FestaGoException { diff --git a/backend/src/main/java/com/festago/exception/UnauthorizedException.java b/backend/src/main/java/com/festago/common/exception/UnauthorizedException.java similarity index 80% rename from backend/src/main/java/com/festago/exception/UnauthorizedException.java rename to backend/src/main/java/com/festago/common/exception/UnauthorizedException.java index 55935b1fd..ffef316c0 100644 --- a/backend/src/main/java/com/festago/exception/UnauthorizedException.java +++ b/backend/src/main/java/com/festago/common/exception/UnauthorizedException.java @@ -1,4 +1,4 @@ -package com.festago.exception; +package com.festago.common.exception; public class UnauthorizedException extends FestaGoException { diff --git a/backend/src/main/java/com/festago/dto/ErrorResponse.java b/backend/src/main/java/com/festago/common/exception/dto/ErrorResponse.java similarity index 85% rename from backend/src/main/java/com/festago/dto/ErrorResponse.java rename to backend/src/main/java/com/festago/common/exception/dto/ErrorResponse.java index cb76fcd0a..7c58f746e 100644 --- a/backend/src/main/java/com/festago/dto/ErrorResponse.java +++ b/backend/src/main/java/com/festago/common/exception/dto/ErrorResponse.java @@ -1,7 +1,7 @@ -package com.festago.dto; +package com.festago.common.exception.dto; -import com.festago.exception.ErrorCode; -import com.festago.exception.FestaGoException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.FestaGoException; import org.springframework.web.bind.MethodArgumentNotValidException; public record ErrorResponse( diff --git a/backend/src/main/java/com/festago/domain/EntryCodeExtractor.java b/backend/src/main/java/com/festago/domain/EntryCodeExtractor.java deleted file mode 100644 index 429df79ad..000000000 --- a/backend/src/main/java/com/festago/domain/EntryCodeExtractor.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.festago.domain; - -public interface EntryCodeExtractor { - - EntryCodePayload extract(String code); -} diff --git a/backend/src/main/java/com/festago/domain/MailClient.java b/backend/src/main/java/com/festago/domain/MailClient.java deleted file mode 100644 index 141c0aa57..000000000 --- a/backend/src/main/java/com/festago/domain/MailClient.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.festago.domain; - -public interface MailClient { - - void send(VerificationMailPayload payload); -} diff --git a/backend/src/main/java/com/festago/domain/VerificationCodeProvider.java b/backend/src/main/java/com/festago/domain/VerificationCodeProvider.java deleted file mode 100644 index eb3b9e6e7..000000000 --- a/backend/src/main/java/com/festago/domain/VerificationCodeProvider.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.festago.domain; - -public interface VerificationCodeProvider { - - VerificationCode provide(); -} diff --git a/backend/src/main/java/com/festago/entry/application/EntryCodeExtractor.java b/backend/src/main/java/com/festago/entry/application/EntryCodeExtractor.java new file mode 100644 index 000000000..89716d035 --- /dev/null +++ b/backend/src/main/java/com/festago/entry/application/EntryCodeExtractor.java @@ -0,0 +1,8 @@ +package com.festago.entry.application; + +import com.festago.entry.domain.EntryCodePayload; + +public interface EntryCodeExtractor { + + EntryCodePayload extract(String code); +} diff --git a/backend/src/main/java/com/festago/application/EntryCodeManager.java b/backend/src/main/java/com/festago/entry/application/EntryCodeManager.java similarity index 83% rename from backend/src/main/java/com/festago/application/EntryCodeManager.java rename to backend/src/main/java/com/festago/entry/application/EntryCodeManager.java index 165e7ea6d..ac6e0d509 100644 --- a/backend/src/main/java/com/festago/application/EntryCodeManager.java +++ b/backend/src/main/java/com/festago/entry/application/EntryCodeManager.java @@ -1,9 +1,7 @@ -package com.festago.application; +package com.festago.entry.application; -import com.festago.domain.EntryCode; -import com.festago.domain.EntryCodeExtractor; -import com.festago.domain.EntryCodePayload; -import com.festago.domain.EntryCodeProvider; +import com.festago.entry.domain.EntryCode; +import com.festago.entry.domain.EntryCodePayload; import java.util.Date; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/com/festago/domain/EntryCodeProvider.java b/backend/src/main/java/com/festago/entry/application/EntryCodeProvider.java similarity index 60% rename from backend/src/main/java/com/festago/domain/EntryCodeProvider.java rename to backend/src/main/java/com/festago/entry/application/EntryCodeProvider.java index 083bc01c0..1f024f9ec 100644 --- a/backend/src/main/java/com/festago/domain/EntryCodeProvider.java +++ b/backend/src/main/java/com/festago/entry/application/EntryCodeProvider.java @@ -1,5 +1,6 @@ -package com.festago.domain; +package com.festago.entry.application; +import com.festago.entry.domain.EntryCodePayload; import java.util.Date; public interface EntryCodeProvider { diff --git a/backend/src/main/java/com/festago/application/EntryService.java b/backend/src/main/java/com/festago/entry/application/EntryService.java similarity index 76% rename from backend/src/main/java/com/festago/application/EntryService.java rename to backend/src/main/java/com/festago/entry/application/EntryService.java index f0b9ced3a..1e2f23ec3 100644 --- a/backend/src/main/java/com/festago/application/EntryService.java +++ b/backend/src/main/java/com/festago/entry/application/EntryService.java @@ -1,15 +1,15 @@ -package com.festago.application; +package com.festago.entry.application; -import com.festago.domain.EntryCode; -import com.festago.domain.EntryCodePayload; -import com.festago.domain.MemberTicket; -import com.festago.domain.MemberTicketRepository; -import com.festago.dto.EntryCodeResponse; -import com.festago.dto.TicketValidationRequest; -import com.festago.dto.TicketValidationResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.entry.domain.EntryCode; +import com.festago.entry.domain.EntryCodePayload; +import com.festago.entry.dto.EntryCodeResponse; +import com.festago.entry.dto.TicketValidationRequest; +import com.festago.entry.dto.TicketValidationResponse; +import com.festago.ticketing.domain.MemberTicket; +import com.festago.ticketing.repository.MemberTicketRepository; import java.time.Clock; import java.time.LocalDateTime; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/festago/config/EntryCodeConfig.java b/backend/src/main/java/com/festago/entry/config/EntryCodeConfig.java similarity index 69% rename from backend/src/main/java/com/festago/config/EntryCodeConfig.java rename to backend/src/main/java/com/festago/entry/config/EntryCodeConfig.java index 924e798b2..bc910c2b5 100644 --- a/backend/src/main/java/com/festago/config/EntryCodeConfig.java +++ b/backend/src/main/java/com/festago/entry/config/EntryCodeConfig.java @@ -1,9 +1,9 @@ -package com.festago.config; +package com.festago.entry.config; -import com.festago.domain.EntryCodeExtractor; -import com.festago.domain.EntryCodeProvider; -import com.festago.infrastructure.JwtEntryCodeExtractor; -import com.festago.infrastructure.JwtEntryCodeProvider; +import com.festago.entry.application.EntryCodeExtractor; +import com.festago.entry.application.EntryCodeProvider; +import com.festago.entry.infrastructure.JwtEntryCodeExtractor; +import com.festago.entry.infrastructure.JwtEntryCodeProvider; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/com/festago/domain/EntryCode.java b/backend/src/main/java/com/festago/entry/domain/EntryCode.java similarity index 87% rename from backend/src/main/java/com/festago/domain/EntryCode.java rename to backend/src/main/java/com/festago/entry/domain/EntryCode.java index 6a433a5f2..c75fde867 100644 --- a/backend/src/main/java/com/festago/domain/EntryCode.java +++ b/backend/src/main/java/com/festago/entry/domain/EntryCode.java @@ -1,7 +1,7 @@ -package com.festago.domain; +package com.festago.entry.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; public class EntryCode { diff --git a/backend/src/main/java/com/festago/domain/EntryCodePayload.java b/backend/src/main/java/com/festago/entry/domain/EntryCodePayload.java similarity index 78% rename from backend/src/main/java/com/festago/domain/EntryCodePayload.java rename to backend/src/main/java/com/festago/entry/domain/EntryCodePayload.java index 51a82e779..38ff7c411 100644 --- a/backend/src/main/java/com/festago/domain/EntryCodePayload.java +++ b/backend/src/main/java/com/festago/entry/domain/EntryCodePayload.java @@ -1,7 +1,9 @@ -package com.festago.domain; +package com.festago.entry.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; +import com.festago.ticketing.domain.EntryState; +import com.festago.ticketing.domain.MemberTicket; public class EntryCodePayload { @@ -14,16 +16,16 @@ public EntryCodePayload(Long memberTicketId, EntryState entryState) { this.entryState = entryState; } + public static EntryCodePayload from(MemberTicket memberTicket) { + return new EntryCodePayload(memberTicket.getId(), memberTicket.getEntryState()); + } + private void validate(Long memberTicketId, EntryState entryState) { if (memberTicketId == null || entryState == null) { throw new InternalServerException(ErrorCode.INVALID_ENTRY_CODE_PAYLOAD); } } - public static EntryCodePayload from(MemberTicket memberTicket) { - return new EntryCodePayload(memberTicket.getId(), memberTicket.getEntryState()); - } - public Long getMemberTicketId() { return memberTicketId; } diff --git a/backend/src/main/java/com/festago/dto/EntryCodeResponse.java b/backend/src/main/java/com/festago/entry/dto/EntryCodeResponse.java similarity index 77% rename from backend/src/main/java/com/festago/dto/EntryCodeResponse.java rename to backend/src/main/java/com/festago/entry/dto/EntryCodeResponse.java index d6ff2d14f..c161502e9 100644 --- a/backend/src/main/java/com/festago/dto/EntryCodeResponse.java +++ b/backend/src/main/java/com/festago/entry/dto/EntryCodeResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.entry.dto; -import com.festago.domain.EntryCode; +import com.festago.entry.domain.EntryCode; public record EntryCodeResponse( String code, diff --git a/backend/src/main/java/com/festago/dto/TicketValidationRequest.java b/backend/src/main/java/com/festago/entry/dto/TicketValidationRequest.java similarity index 84% rename from backend/src/main/java/com/festago/dto/TicketValidationRequest.java rename to backend/src/main/java/com/festago/entry/dto/TicketValidationRequest.java index 03ffeb4cc..e8aeba744 100644 --- a/backend/src/main/java/com/festago/dto/TicketValidationRequest.java +++ b/backend/src/main/java/com/festago/entry/dto/TicketValidationRequest.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.entry.dto; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/com/festago/dto/TicketValidationResponse.java b/backend/src/main/java/com/festago/entry/dto/TicketValidationResponse.java similarity index 64% rename from backend/src/main/java/com/festago/dto/TicketValidationResponse.java rename to backend/src/main/java/com/festago/entry/dto/TicketValidationResponse.java index 5ce421d09..3c5f01175 100644 --- a/backend/src/main/java/com/festago/dto/TicketValidationResponse.java +++ b/backend/src/main/java/com/festago/entry/dto/TicketValidationResponse.java @@ -1,7 +1,7 @@ -package com.festago.dto; +package com.festago.entry.dto; -import com.festago.domain.EntryState; -import com.festago.domain.MemberTicket; +import com.festago.ticketing.domain.EntryState; +import com.festago.ticketing.domain.MemberTicket; public record TicketValidationResponse( EntryState updatedState) { diff --git a/backend/src/main/java/com/festago/infrastructure/JwtEntryCodeExtractor.java b/backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeExtractor.java similarity index 83% rename from backend/src/main/java/com/festago/infrastructure/JwtEntryCodeExtractor.java rename to backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeExtractor.java index d18de11bf..dbc0bf63c 100644 --- a/backend/src/main/java/com/festago/infrastructure/JwtEntryCodeExtractor.java +++ b/backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeExtractor.java @@ -1,10 +1,10 @@ -package com.festago.infrastructure; +package com.festago.entry.infrastructure; -import com.festago.domain.EntryCodeExtractor; -import com.festago.domain.EntryCodePayload; -import com.festago.domain.EntryState; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.entry.application.EntryCodeExtractor; +import com.festago.entry.domain.EntryCodePayload; +import com.festago.ticketing.domain.EntryState; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.JwtException; diff --git a/backend/src/main/java/com/festago/infrastructure/JwtEntryCodeProvider.java b/backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeProvider.java similarity index 82% rename from backend/src/main/java/com/festago/infrastructure/JwtEntryCodeProvider.java rename to backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeProvider.java index 634fd52a2..852915e6c 100644 --- a/backend/src/main/java/com/festago/infrastructure/JwtEntryCodeProvider.java +++ b/backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeProvider.java @@ -1,9 +1,9 @@ -package com.festago.infrastructure; +package com.festago.entry.infrastructure; -import com.festago.domain.EntryCodePayload; -import com.festago.domain.EntryCodeProvider; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; +import com.festago.entry.application.EntryCodeProvider; +import com.festago.entry.domain.EntryCodePayload; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.security.Keys; diff --git a/backend/src/main/java/com/festago/application/FestivalService.java b/backend/src/main/java/com/festago/festival/application/FestivalService.java similarity index 74% rename from backend/src/main/java/com/festago/application/FestivalService.java rename to backend/src/main/java/com/festago/festival/application/FestivalService.java index 6f2f8e855..75e6fdbc5 100644 --- a/backend/src/main/java/com/festago/application/FestivalService.java +++ b/backend/src/main/java/com/festago/festival/application/FestivalService.java @@ -1,18 +1,18 @@ -package com.festago.application; +package com.festago.festival.application; import static java.util.Comparator.comparing; -import com.festago.domain.Festival; -import com.festago.domain.FestivalRepository; -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.dto.FestivalCreateRequest; -import com.festago.dto.FestivalDetailResponse; -import com.festago.dto.FestivalResponse; -import com.festago.dto.FestivalsResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.festival.domain.Festival; +import com.festago.festival.dto.FestivalCreateRequest; +import com.festago.festival.dto.FestivalDetailResponse; +import com.festago.festival.dto.FestivalResponse; +import com.festago.festival.dto.FestivalsResponse; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; import java.time.LocalDate; import java.util.List; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/festago/domain/Festival.java b/backend/src/main/java/com/festago/festival/domain/Festival.java similarity index 94% rename from backend/src/main/java/com/festago/domain/Festival.java rename to backend/src/main/java/com/festago/festival/domain/Festival.java index 2c72c9460..df2d3c30d 100644 --- a/backend/src/main/java/com/festago/domain/Festival.java +++ b/backend/src/main/java/com/festago/festival/domain/Festival.java @@ -1,7 +1,8 @@ -package com.festago.domain; +package com.festago.festival.domain; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; +import com.festago.common.domain.BaseTimeEntity; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/backend/src/main/java/com/festago/dto/FestivalCreateRequest.java b/backend/src/main/java/com/festago/festival/dto/FestivalCreateRequest.java similarity index 89% rename from backend/src/main/java/com/festago/dto/FestivalCreateRequest.java rename to backend/src/main/java/com/festago/festival/dto/FestivalCreateRequest.java index aac290345..fd908a0f1 100644 --- a/backend/src/main/java/com/festago/dto/FestivalCreateRequest.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalCreateRequest.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.festival.dto; -import com.festago.domain.Festival; +import com.festago.festival.domain.Festival; import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import org.springframework.format.annotation.DateTimeFormat; diff --git a/backend/src/main/java/com/festago/dto/FestivalDetailResponse.java b/backend/src/main/java/com/festago/festival/dto/FestivalDetailResponse.java similarity index 86% rename from backend/src/main/java/com/festago/dto/FestivalDetailResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalDetailResponse.java index d9910e4f4..5ff6d92ea 100644 --- a/backend/src/main/java/com/festago/dto/FestivalDetailResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalDetailResponse.java @@ -1,7 +1,7 @@ -package com.festago.dto; +package com.festago.festival.dto; -import com.festago.domain.Festival; -import com.festago.domain.Stage; +import com.festago.festival.domain.Festival; +import com.festago.stage.domain.Stage; import java.time.LocalDate; import java.util.List; diff --git a/backend/src/main/java/com/festago/dto/FestivalDetailStageResponse.java b/backend/src/main/java/com/festago/festival/dto/FestivalDetailStageResponse.java similarity index 90% rename from backend/src/main/java/com/festago/dto/FestivalDetailStageResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalDetailStageResponse.java index c25aeecbe..e9704cec8 100644 --- a/backend/src/main/java/com/festago/dto/FestivalDetailStageResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalDetailStageResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.festival.dto; -import com.festago.domain.Stage; +import com.festago.stage.domain.Stage; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/main/java/com/festago/dto/FestivalDetailTicketResponse.java b/backend/src/main/java/com/festago/festival/dto/FestivalDetailTicketResponse.java similarity index 74% rename from backend/src/main/java/com/festago/dto/FestivalDetailTicketResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalDetailTicketResponse.java index 848ccc865..971042219 100644 --- a/backend/src/main/java/com/festago/dto/FestivalDetailTicketResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalDetailTicketResponse.java @@ -1,8 +1,8 @@ -package com.festago.dto; +package com.festago.festival.dto; -import com.festago.domain.Ticket; -import com.festago.domain.TicketAmount; -import com.festago.domain.TicketType; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketAmount; +import com.festago.ticket.domain.TicketType; public record FestivalDetailTicketResponse( Long id, diff --git a/backend/src/main/java/com/festago/dto/FestivalResponse.java b/backend/src/main/java/com/festago/festival/dto/FestivalResponse.java similarity index 84% rename from backend/src/main/java/com/festago/dto/FestivalResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalResponse.java index 17655e7b7..d59f9ae93 100644 --- a/backend/src/main/java/com/festago/dto/FestivalResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.festival.dto; -import com.festago.domain.Festival; +import com.festago.festival.domain.Festival; import java.time.LocalDate; public record FestivalResponse( diff --git a/backend/src/main/java/com/festago/dto/FestivalsResponse.java b/backend/src/main/java/com/festago/festival/dto/FestivalsResponse.java similarity index 84% rename from backend/src/main/java/com/festago/dto/FestivalsResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalsResponse.java index 37ddd27bf..44b04c1b1 100644 --- a/backend/src/main/java/com/festago/dto/FestivalsResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalsResponse.java @@ -1,9 +1,9 @@ -package com.festago.dto; +package com.festago.festival.dto; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; -import com.festago.domain.Festival; +import com.festago.festival.domain.Festival; import java.util.List; public record FestivalsResponse( diff --git a/backend/src/main/java/com/festago/domain/FestivalRepository.java b/backend/src/main/java/com/festago/festival/repository/FestivalRepository.java similarity index 62% rename from backend/src/main/java/com/festago/domain/FestivalRepository.java rename to backend/src/main/java/com/festago/festival/repository/FestivalRepository.java index f17005af6..10b3c02c6 100644 --- a/backend/src/main/java/com/festago/domain/FestivalRepository.java +++ b/backend/src/main/java/com/festago/festival/repository/FestivalRepository.java @@ -1,5 +1,6 @@ -package com.festago.domain; +package com.festago.festival.repository; +import com.festago.festival.domain.Festival; import org.springframework.data.jpa.repository.JpaRepository; public interface FestivalRepository extends JpaRepository { diff --git a/backend/src/main/java/com/festago/application/MemberService.java b/backend/src/main/java/com/festago/member/application/MemberService.java similarity index 68% rename from backend/src/main/java/com/festago/application/MemberService.java rename to backend/src/main/java/com/festago/member/application/MemberService.java index d5f094d6f..e9528e803 100644 --- a/backend/src/main/java/com/festago/application/MemberService.java +++ b/backend/src/main/java/com/festago/member/application/MemberService.java @@ -1,10 +1,10 @@ -package com.festago.application; +package com.festago.member.application; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.dto.MemberProfileResponse; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.member.domain.Member; +import com.festago.member.dto.MemberProfileResponse; +import com.festago.member.repository.MemberRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/festago/domain/Member.java b/backend/src/main/java/com/festago/member/domain/Member.java similarity index 97% rename from backend/src/main/java/com/festago/domain/Member.java rename to backend/src/main/java/com/festago/member/domain/Member.java index 4b657e6d1..a990a0392 100644 --- a/backend/src/main/java/com/festago/domain/Member.java +++ b/backend/src/main/java/com/festago/member/domain/Member.java @@ -1,6 +1,7 @@ -package com.festago.domain; +package com.festago.member.domain; import com.festago.auth.domain.SocialType; +import com.festago.common.domain.BaseTimeEntity; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/backend/src/main/java/com/festago/dto/MemberProfileResponse.java b/backend/src/main/java/com/festago/member/dto/MemberProfileResponse.java similarity index 79% rename from backend/src/main/java/com/festago/dto/MemberProfileResponse.java rename to backend/src/main/java/com/festago/member/dto/MemberProfileResponse.java index aeec3fb2c..70e30baf7 100644 --- a/backend/src/main/java/com/festago/dto/MemberProfileResponse.java +++ b/backend/src/main/java/com/festago/member/dto/MemberProfileResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.member.dto; -import com.festago.domain.Member; +import com.festago.member.domain.Member; public record MemberProfileResponse( Long memberId, diff --git a/backend/src/main/java/com/festago/domain/MemberRepository.java b/backend/src/main/java/com/festago/member/repository/MemberRepository.java similarity index 78% rename from backend/src/main/java/com/festago/domain/MemberRepository.java rename to backend/src/main/java/com/festago/member/repository/MemberRepository.java index b9cab1507..e9536e0af 100644 --- a/backend/src/main/java/com/festago/domain/MemberRepository.java +++ b/backend/src/main/java/com/festago/member/repository/MemberRepository.java @@ -1,6 +1,7 @@ -package com.festago.domain; +package com.festago.member.repository; import com.festago.auth.domain.SocialType; +import com.festago.member.domain.Member; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/com/festago/presentation/AdminController.java b/backend/src/main/java/com/festago/presentation/AdminController.java index 415066190..19ef5de85 100644 --- a/backend/src/main/java/com/festago/presentation/AdminController.java +++ b/backend/src/main/java/com/festago/presentation/AdminController.java @@ -1,26 +1,26 @@ package com.festago.presentation; -import com.festago.application.AdminService; -import com.festago.application.FestivalService; -import com.festago.application.StageService; -import com.festago.application.TicketService; +import com.festago.admin.application.AdminService; +import com.festago.admin.dto.AdminResponse; import com.festago.auth.annotation.Admin; import com.festago.auth.application.AdminAuthService; import com.festago.auth.dto.AdminLoginRequest; import com.festago.auth.dto.AdminSignupRequest; import com.festago.auth.dto.AdminSignupResponse; import com.festago.auth.dto.RootAdminInitializeRequest; -import com.festago.dto.AdminResponse; -import com.festago.dto.FestivalCreateRequest; -import com.festago.dto.FestivalResponse; -import com.festago.dto.StageCreateRequest; -import com.festago.dto.StageResponse; -import com.festago.dto.TicketCreateRequest; -import com.festago.dto.TicketCreateResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; +import com.festago.common.exception.UnauthorizedException; +import com.festago.festival.application.FestivalService; +import com.festago.festival.dto.FestivalCreateRequest; +import com.festago.festival.dto.FestivalResponse; +import com.festago.stage.application.StageService; +import com.festago.stage.dto.StageCreateRequest; +import com.festago.stage.dto.StageResponse; +import com.festago.ticket.application.TicketService; +import com.festago.ticket.dto.TicketCreateRequest; +import com.festago.ticket.dto.TicketCreateResponse; import io.swagger.v3.oas.annotations.Hidden; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; diff --git a/backend/src/main/java/com/festago/auth/presentation/AuthController.java b/backend/src/main/java/com/festago/presentation/AuthController.java similarity index 97% rename from backend/src/main/java/com/festago/auth/presentation/AuthController.java rename to backend/src/main/java/com/festago/presentation/AuthController.java index e703f4197..9d0e83f6f 100644 --- a/backend/src/main/java/com/festago/auth/presentation/AuthController.java +++ b/backend/src/main/java/com/festago/presentation/AuthController.java @@ -1,4 +1,4 @@ -package com.festago.auth.presentation; +package com.festago.presentation; import com.festago.auth.annotation.Member; import com.festago.auth.application.AuthFacadeService; diff --git a/backend/src/main/java/com/festago/presentation/FestivalController.java b/backend/src/main/java/com/festago/presentation/FestivalController.java index bab130bb8..462b0f0b3 100644 --- a/backend/src/main/java/com/festago/presentation/FestivalController.java +++ b/backend/src/main/java/com/festago/presentation/FestivalController.java @@ -1,8 +1,8 @@ package com.festago.presentation; -import com.festago.application.FestivalService; -import com.festago.dto.FestivalDetailResponse; -import com.festago.dto.FestivalsResponse; +import com.festago.festival.application.FestivalService; +import com.festago.festival.dto.FestivalDetailResponse; +import com.festago.festival.dto.FestivalsResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/com/festago/presentation/GlobalExceptionHandler.java b/backend/src/main/java/com/festago/presentation/GlobalExceptionHandler.java index 1df4a7d82..1bc3b023b 100644 --- a/backend/src/main/java/com/festago/presentation/GlobalExceptionHandler.java +++ b/backend/src/main/java/com/festago/presentation/GlobalExceptionHandler.java @@ -1,20 +1,20 @@ package com.festago.presentation; -import com.festago.auth.presentation.AuthenticateContext; -import com.festago.dto.ErrorResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.FestaGoException; -import com.festago.exception.ForbiddenException; -import com.festago.exception.InternalServerException; -import com.festago.exception.NotFoundException; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.FestaGoException; +import com.festago.common.exception.ForbiddenException; +import com.festago.common.exception.InternalServerException; +import com.festago.common.exception.NotFoundException; +import com.festago.common.exception.UnauthorizedException; +import com.festago.common.exception.dto.ErrorResponse; +import com.festago.presentation.auth.AuthenticateContext; import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.http.InvalidMediaTypeException; import org.springframework.http.HttpStatusCode; +import org.springframework.http.InvalidMediaTypeException; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/backend/src/main/java/com/festago/presentation/MemberController.java b/backend/src/main/java/com/festago/presentation/MemberController.java index 269b2ce51..b27cb3550 100644 --- a/backend/src/main/java/com/festago/presentation/MemberController.java +++ b/backend/src/main/java/com/festago/presentation/MemberController.java @@ -1,8 +1,8 @@ package com.festago.presentation; -import com.festago.application.MemberService; import com.festago.auth.annotation.Member; -import com.festago.dto.MemberProfileResponse; +import com.festago.member.application.MemberService; +import com.festago.member.dto.MemberProfileResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/backend/src/main/java/com/festago/presentation/MemberTicketController.java b/backend/src/main/java/com/festago/presentation/MemberTicketController.java index 1319d954f..2997fb3a6 100644 --- a/backend/src/main/java/com/festago/presentation/MemberTicketController.java +++ b/backend/src/main/java/com/festago/presentation/MemberTicketController.java @@ -1,14 +1,14 @@ package com.festago.presentation; -import com.festago.application.EntryService; -import com.festago.application.MemberTicketService; -import com.festago.application.TicketingService; import com.festago.auth.annotation.Member; -import com.festago.dto.EntryCodeResponse; -import com.festago.dto.MemberTicketResponse; -import com.festago.dto.MemberTicketsResponse; -import com.festago.dto.TicketingRequest; -import com.festago.dto.TicketingResponse; +import com.festago.entry.application.EntryService; +import com.festago.entry.dto.EntryCodeResponse; +import com.festago.ticketing.application.MemberTicketService; +import com.festago.ticketing.application.TicketingService; +import com.festago.ticketing.dto.MemberTicketResponse; +import com.festago.ticketing.dto.MemberTicketsResponse; +import com.festago.ticketing.dto.TicketingRequest; +import com.festago.ticketing.dto.TicketingResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/backend/src/main/java/com/festago/presentation/SchoolController.java b/backend/src/main/java/com/festago/presentation/SchoolController.java index 4f942e162..672d0c0e6 100644 --- a/backend/src/main/java/com/festago/presentation/SchoolController.java +++ b/backend/src/main/java/com/festago/presentation/SchoolController.java @@ -1,7 +1,7 @@ package com.festago.presentation; -import com.festago.application.SchoolService; -import com.festago.dto.SchoolsResponse; +import com.festago.school.application.SchoolService; +import com.festago.school.dto.SchoolsResponse; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/backend/src/main/java/com/festago/presentation/StaffMemberTicketController.java b/backend/src/main/java/com/festago/presentation/StaffMemberTicketController.java index cf969b956..be44bda14 100644 --- a/backend/src/main/java/com/festago/presentation/StaffMemberTicketController.java +++ b/backend/src/main/java/com/festago/presentation/StaffMemberTicketController.java @@ -1,9 +1,9 @@ package com.festago.presentation; -import com.festago.application.EntryService; -import com.festago.dto.TicketValidationRequest; -import com.festago.dto.TicketValidationResponse; +import com.festago.entry.application.EntryService; +import com.festago.entry.dto.TicketValidationRequest; +import com.festago.entry.dto.TicketValidationResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/backend/src/main/java/com/festago/presentation/StageController.java b/backend/src/main/java/com/festago/presentation/StageController.java index 928a190e3..73b707239 100644 --- a/backend/src/main/java/com/festago/presentation/StageController.java +++ b/backend/src/main/java/com/festago/presentation/StageController.java @@ -1,7 +1,7 @@ package com.festago.presentation; -import com.festago.application.TicketService; -import com.festago.dto.StageTicketsResponse; +import com.festago.ticket.application.TicketService; +import com.festago.ticket.dto.StageTicketsResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/com/festago/presentation/StudentController.java b/backend/src/main/java/com/festago/presentation/StudentController.java index 462c87cb3..d0f397f92 100644 --- a/backend/src/main/java/com/festago/presentation/StudentController.java +++ b/backend/src/main/java/com/festago/presentation/StudentController.java @@ -1,9 +1,9 @@ package com.festago.presentation; -import com.festago.application.StudentService; import com.festago.auth.annotation.Member; -import com.festago.dto.StudentSendMailRequest; -import com.festago.dto.StudentVerificateRequest; +import com.festago.student.application.StudentService; +import com.festago.student.dto.StudentSendMailRequest; +import com.festago.student.dto.StudentVerificateRequest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/backend/src/main/java/com/festago/auth/presentation/AuthInterceptor.java b/backend/src/main/java/com/festago/presentation/auth/AuthInterceptor.java similarity index 90% rename from backend/src/main/java/com/festago/auth/presentation/AuthInterceptor.java rename to backend/src/main/java/com/festago/presentation/auth/AuthInterceptor.java index 87c401da5..8d4399183 100644 --- a/backend/src/main/java/com/festago/auth/presentation/AuthInterceptor.java +++ b/backend/src/main/java/com/festago/presentation/auth/AuthInterceptor.java @@ -1,12 +1,12 @@ -package com.festago.auth.presentation; +package com.festago.presentation.auth; -import com.festago.auth.domain.AuthExtractor; +import com.festago.auth.application.AuthExtractor; +import com.festago.auth.application.TokenExtractor; import com.festago.auth.domain.AuthPayload; import com.festago.auth.domain.Role; -import com.festago.auth.domain.TokenExtractor; -import com.festago.exception.ErrorCode; -import com.festago.exception.ForbiddenException; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.ForbiddenException; +import com.festago.common.exception.UnauthorizedException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.util.Assert; diff --git a/backend/src/main/java/com/festago/auth/presentation/AuthenticateContext.java b/backend/src/main/java/com/festago/presentation/auth/AuthenticateContext.java similarity index 92% rename from backend/src/main/java/com/festago/auth/presentation/AuthenticateContext.java rename to backend/src/main/java/com/festago/presentation/auth/AuthenticateContext.java index 2edae0e28..5334bf2be 100644 --- a/backend/src/main/java/com/festago/auth/presentation/AuthenticateContext.java +++ b/backend/src/main/java/com/festago/presentation/auth/AuthenticateContext.java @@ -1,4 +1,4 @@ -package com.festago.auth.presentation; +package com.festago.presentation.auth; import com.festago.auth.domain.Role; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/com/festago/auth/presentation/RoleArgumentResolver.java b/backend/src/main/java/com/festago/presentation/auth/RoleArgumentResolver.java similarity index 91% rename from backend/src/main/java/com/festago/auth/presentation/RoleArgumentResolver.java rename to backend/src/main/java/com/festago/presentation/auth/RoleArgumentResolver.java index 9fd393edb..c48d2c2f9 100644 --- a/backend/src/main/java/com/festago/auth/presentation/RoleArgumentResolver.java +++ b/backend/src/main/java/com/festago/presentation/auth/RoleArgumentResolver.java @@ -1,8 +1,8 @@ -package com.festago.auth.presentation; +package com.festago.presentation.auth; import com.festago.auth.domain.Role; -import com.festago.exception.ErrorCode; -import com.festago.exception.ForbiddenException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.ForbiddenException; import org.springframework.core.MethodParameter; import org.springframework.util.Assert; import org.springframework.web.bind.support.WebDataBinderFactory; diff --git a/backend/src/main/java/com/festago/auth/presentation/ErrorFilter.java b/backend/src/main/java/com/festago/presentation/common/ErrorFilter.java similarity index 96% rename from backend/src/main/java/com/festago/auth/presentation/ErrorFilter.java rename to backend/src/main/java/com/festago/presentation/common/ErrorFilter.java index 8bdb75a0b..c3a2a1218 100644 --- a/backend/src/main/java/com/festago/auth/presentation/ErrorFilter.java +++ b/backend/src/main/java/com/festago/presentation/common/ErrorFilter.java @@ -1,4 +1,4 @@ -package com.festago.auth.presentation; +package com.festago.presentation.common; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/backend/src/main/java/com/festago/application/SchoolService.java b/backend/src/main/java/com/festago/school/application/SchoolService.java similarity index 77% rename from backend/src/main/java/com/festago/application/SchoolService.java rename to backend/src/main/java/com/festago/school/application/SchoolService.java index edb571b4a..1c0220b71 100644 --- a/backend/src/main/java/com/festago/application/SchoolService.java +++ b/backend/src/main/java/com/festago/school/application/SchoolService.java @@ -1,7 +1,7 @@ -package com.festago.application; +package com.festago.school.application; -import com.festago.domain.SchoolRepository; -import com.festago.dto.SchoolsResponse; +import com.festago.school.dto.SchoolsResponse; +import com.festago.school.repository.SchoolRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/festago/domain/School.java b/backend/src/main/java/com/festago/school/domain/School.java similarity index 90% rename from backend/src/main/java/com/festago/domain/School.java rename to backend/src/main/java/com/festago/school/domain/School.java index 2275386c3..231a41fca 100644 --- a/backend/src/main/java/com/festago/domain/School.java +++ b/backend/src/main/java/com/festago/school/domain/School.java @@ -1,7 +1,8 @@ -package com.festago.domain; +package com.festago.school.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.domain.BaseTimeEntity; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/backend/src/main/java/com/festago/dto/SchoolResponse.java b/backend/src/main/java/com/festago/school/dto/SchoolResponse.java similarity index 79% rename from backend/src/main/java/com/festago/dto/SchoolResponse.java rename to backend/src/main/java/com/festago/school/dto/SchoolResponse.java index a33a104db..e75e78900 100644 --- a/backend/src/main/java/com/festago/dto/SchoolResponse.java +++ b/backend/src/main/java/com/festago/school/dto/SchoolResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.school.dto; -import com.festago.domain.School; +import com.festago.school.domain.School; public record SchoolResponse( Long id, diff --git a/backend/src/main/java/com/festago/dto/SchoolsResponse.java b/backend/src/main/java/com/festago/school/dto/SchoolsResponse.java similarity index 85% rename from backend/src/main/java/com/festago/dto/SchoolsResponse.java rename to backend/src/main/java/com/festago/school/dto/SchoolsResponse.java index f92e33f9e..129b1f887 100644 --- a/backend/src/main/java/com/festago/dto/SchoolsResponse.java +++ b/backend/src/main/java/com/festago/school/dto/SchoolsResponse.java @@ -1,9 +1,9 @@ -package com.festago.dto; +package com.festago.school.dto; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; -import com.festago.domain.School; +import com.festago.school.domain.School; import java.util.List; public record SchoolsResponse( diff --git a/backend/src/main/java/com/festago/domain/SchoolRepository.java b/backend/src/main/java/com/festago/school/repository/SchoolRepository.java similarity index 63% rename from backend/src/main/java/com/festago/domain/SchoolRepository.java rename to backend/src/main/java/com/festago/school/repository/SchoolRepository.java index 1d5e27222..e733df5c6 100644 --- a/backend/src/main/java/com/festago/domain/SchoolRepository.java +++ b/backend/src/main/java/com/festago/school/repository/SchoolRepository.java @@ -1,5 +1,6 @@ -package com.festago.domain; +package com.festago.school.repository; +import com.festago.school.domain.School; import org.springframework.data.jpa.repository.JpaRepository; public interface SchoolRepository extends JpaRepository { diff --git a/backend/src/main/java/com/festago/application/StageService.java b/backend/src/main/java/com/festago/stage/application/StageService.java similarity index 71% rename from backend/src/main/java/com/festago/application/StageService.java rename to backend/src/main/java/com/festago/stage/application/StageService.java index 98cdf3cae..5198becab 100644 --- a/backend/src/main/java/com/festago/application/StageService.java +++ b/backend/src/main/java/com/festago/stage/application/StageService.java @@ -1,13 +1,13 @@ -package com.festago.application; +package com.festago.stage.application; -import com.festago.domain.Festival; -import com.festago.domain.FestivalRepository; -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.dto.StageCreateRequest; -import com.festago.dto.StageResponse; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.festival.domain.Festival; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.dto.StageCreateRequest; +import com.festago.stage.dto.StageResponse; +import com.festago.stage.repository.StageRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/festago/domain/Stage.java b/backend/src/main/java/com/festago/stage/domain/Stage.java similarity index 93% rename from backend/src/main/java/com/festago/domain/Stage.java rename to backend/src/main/java/com/festago/stage/domain/Stage.java index 933475dbd..9faaf2b5e 100644 --- a/backend/src/main/java/com/festago/domain/Stage.java +++ b/backend/src/main/java/com/festago/stage/domain/Stage.java @@ -1,7 +1,10 @@ -package com.festago.domain; +package com.festago.stage.domain; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; +import com.festago.common.domain.BaseTimeEntity; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.festival.domain.Festival; +import com.festago.ticket.domain.Ticket; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; diff --git a/backend/src/main/java/com/festago/dto/StageCreateRequest.java b/backend/src/main/java/com/festago/stage/dto/StageCreateRequest.java similarity index 94% rename from backend/src/main/java/com/festago/dto/StageCreateRequest.java rename to backend/src/main/java/com/festago/stage/dto/StageCreateRequest.java index bb0468c9f..00691a8db 100644 --- a/backend/src/main/java/com/festago/dto/StageCreateRequest.java +++ b/backend/src/main/java/com/festago/stage/dto/StageCreateRequest.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.stage.dto; import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/festago/dto/StageResponse.java b/backend/src/main/java/com/festago/stage/dto/StageResponse.java similarity index 77% rename from backend/src/main/java/com/festago/dto/StageResponse.java rename to backend/src/main/java/com/festago/stage/dto/StageResponse.java index a2d049e99..1aea96eaa 100644 --- a/backend/src/main/java/com/festago/dto/StageResponse.java +++ b/backend/src/main/java/com/festago/stage/dto/StageResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.stage.dto; -import com.festago.domain.Stage; +import com.festago.stage.domain.Stage; import java.time.LocalDateTime; public record StageResponse( diff --git a/backend/src/main/java/com/festago/domain/StageRepository.java b/backend/src/main/java/com/festago/stage/repository/StageRepository.java similarity index 87% rename from backend/src/main/java/com/festago/domain/StageRepository.java rename to backend/src/main/java/com/festago/stage/repository/StageRepository.java index 6531d7ef4..0956dc2b9 100644 --- a/backend/src/main/java/com/festago/domain/StageRepository.java +++ b/backend/src/main/java/com/festago/stage/repository/StageRepository.java @@ -1,5 +1,6 @@ -package com.festago.domain; +package com.festago.stage.repository; +import com.festago.stage.domain.Stage; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/com/festago/student/application/MailClient.java b/backend/src/main/java/com/festago/student/application/MailClient.java new file mode 100644 index 000000000..29f0ec11c --- /dev/null +++ b/backend/src/main/java/com/festago/student/application/MailClient.java @@ -0,0 +1,8 @@ +package com.festago.student.application; + +import com.festago.student.domain.VerificationMailPayload; + +public interface MailClient { + + void send(VerificationMailPayload payload); +} diff --git a/backend/src/main/java/com/festago/application/StudentService.java b/backend/src/main/java/com/festago/student/application/StudentService.java similarity index 78% rename from backend/src/main/java/com/festago/application/StudentService.java rename to backend/src/main/java/com/festago/student/application/StudentService.java index ea52de469..0ae184eb3 100644 --- a/backend/src/main/java/com/festago/application/StudentService.java +++ b/backend/src/main/java/com/festago/student/application/StudentService.java @@ -1,22 +1,20 @@ -package com.festago.application; +package com.festago.student.application; -import com.festago.domain.MailClient; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.domain.School; -import com.festago.domain.SchoolRepository; -import com.festago.domain.Student; -import com.festago.domain.StudentCode; -import com.festago.domain.StudentCodeRepository; -import com.festago.domain.StudentRepository; -import com.festago.domain.VerificationCode; -import com.festago.domain.VerificationCodeProvider; -import com.festago.domain.VerificationMailPayload; -import com.festago.dto.StudentSendMailRequest; -import com.festago.dto.StudentVerificateRequest; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; +import com.festago.school.domain.School; +import com.festago.school.repository.SchoolRepository; +import com.festago.student.domain.Student; +import com.festago.student.domain.StudentCode; +import com.festago.student.domain.VerificationCode; +import com.festago.student.domain.VerificationMailPayload; +import com.festago.student.dto.StudentSendMailRequest; +import com.festago.student.dto.StudentVerificateRequest; +import com.festago.student.repository.StudentCodeRepository; +import com.festago.student.repository.StudentRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/festago/student/application/VerificationCodeProvider.java b/backend/src/main/java/com/festago/student/application/VerificationCodeProvider.java new file mode 100644 index 000000000..0538ecc1c --- /dev/null +++ b/backend/src/main/java/com/festago/student/application/VerificationCodeProvider.java @@ -0,0 +1,8 @@ +package com.festago.student.application; + +import com.festago.student.domain.VerificationCode; + +public interface VerificationCodeProvider { + + VerificationCode provide(); +} diff --git a/backend/src/main/java/com/festago/domain/Student.java b/backend/src/main/java/com/festago/student/domain/Student.java similarity index 88% rename from backend/src/main/java/com/festago/domain/Student.java rename to backend/src/main/java/com/festago/student/domain/Student.java index 9e09ad219..2b7b46214 100644 --- a/backend/src/main/java/com/festago/domain/Student.java +++ b/backend/src/main/java/com/festago/student/domain/Student.java @@ -1,7 +1,10 @@ -package com.festago.domain; +package com.festago.student.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.domain.BaseTimeEntity; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; +import com.festago.member.domain.Member; +import com.festago.school.domain.School; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; diff --git a/backend/src/main/java/com/festago/domain/StudentCode.java b/backend/src/main/java/com/festago/student/domain/StudentCode.java similarity index 86% rename from backend/src/main/java/com/festago/domain/StudentCode.java rename to backend/src/main/java/com/festago/student/domain/StudentCode.java index 935f500a2..947e58a61 100644 --- a/backend/src/main/java/com/festago/domain/StudentCode.java +++ b/backend/src/main/java/com/festago/student/domain/StudentCode.java @@ -1,7 +1,10 @@ -package com.festago.domain; +package com.festago.student.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.domain.BaseTimeEntity; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; +import com.festago.member.domain.Member; +import com.festago.school.domain.School; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/backend/src/main/java/com/festago/domain/VerificationCode.java b/backend/src/main/java/com/festago/student/domain/VerificationCode.java similarity index 89% rename from backend/src/main/java/com/festago/domain/VerificationCode.java rename to backend/src/main/java/com/festago/student/domain/VerificationCode.java index 1220650d7..2236a9b24 100644 --- a/backend/src/main/java/com/festago/domain/VerificationCode.java +++ b/backend/src/main/java/com/festago/student/domain/VerificationCode.java @@ -1,7 +1,7 @@ -package com.festago.domain; +package com.festago.student.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import java.util.regex.Pattern; @@ -9,9 +9,8 @@ @Embeddable public class VerificationCode { - private static final Pattern POSITIVE_REGEX = Pattern.compile("^\\d+$"); public static final int LENGTH = 6; - + private static final Pattern POSITIVE_REGEX = Pattern.compile("^\\d+$"); @Column(name = "code") private String value; diff --git a/backend/src/main/java/com/festago/domain/VerificationMailPayload.java b/backend/src/main/java/com/festago/student/domain/VerificationMailPayload.java similarity index 84% rename from backend/src/main/java/com/festago/domain/VerificationMailPayload.java rename to backend/src/main/java/com/festago/student/domain/VerificationMailPayload.java index 3ed2fd4fb..e6e159d06 100644 --- a/backend/src/main/java/com/festago/domain/VerificationMailPayload.java +++ b/backend/src/main/java/com/festago/student/domain/VerificationMailPayload.java @@ -1,7 +1,7 @@ -package com.festago.domain; +package com.festago.student.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; public class VerificationMailPayload { diff --git a/backend/src/main/java/com/festago/dto/StudentSendMailRequest.java b/backend/src/main/java/com/festago/student/dto/StudentSendMailRequest.java similarity index 72% rename from backend/src/main/java/com/festago/dto/StudentSendMailRequest.java rename to backend/src/main/java/com/festago/student/dto/StudentSendMailRequest.java index dbf8e8218..f58238144 100644 --- a/backend/src/main/java/com/festago/dto/StudentSendMailRequest.java +++ b/backend/src/main/java/com/festago/student/dto/StudentSendMailRequest.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.student.dto; public record StudentSendMailRequest( String username, diff --git a/backend/src/main/java/com/festago/dto/StudentVerificateRequest.java b/backend/src/main/java/com/festago/student/dto/StudentVerificateRequest.java similarity index 63% rename from backend/src/main/java/com/festago/dto/StudentVerificateRequest.java rename to backend/src/main/java/com/festago/student/dto/StudentVerificateRequest.java index 2c22c8ecb..8e9053d1d 100644 --- a/backend/src/main/java/com/festago/dto/StudentVerificateRequest.java +++ b/backend/src/main/java/com/festago/student/dto/StudentVerificateRequest.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.student.dto; public record StudentVerificateRequest(String code) { diff --git a/backend/src/main/java/com/festago/infrastructure/GoogleMailClient.java b/backend/src/main/java/com/festago/student/infrastructure/GoogleMailClient.java similarity index 88% rename from backend/src/main/java/com/festago/infrastructure/GoogleMailClient.java rename to backend/src/main/java/com/festago/student/infrastructure/GoogleMailClient.java index 713ba13c2..8fe87e1d9 100644 --- a/backend/src/main/java/com/festago/infrastructure/GoogleMailClient.java +++ b/backend/src/main/java/com/festago/student/infrastructure/GoogleMailClient.java @@ -1,7 +1,7 @@ -package com.festago.infrastructure; +package com.festago.student.infrastructure; -import com.festago.domain.MailClient; -import com.festago.domain.VerificationMailPayload; +import com.festago.student.application.MailClient; +import com.festago.student.domain.VerificationMailPayload; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.mail.MailSender; diff --git a/backend/src/main/java/com/festago/infrastructure/MockMailClient.java b/backend/src/main/java/com/festago/student/infrastructure/MockMailClient.java similarity index 64% rename from backend/src/main/java/com/festago/infrastructure/MockMailClient.java rename to backend/src/main/java/com/festago/student/infrastructure/MockMailClient.java index f4bea068d..5fd9181d9 100644 --- a/backend/src/main/java/com/festago/infrastructure/MockMailClient.java +++ b/backend/src/main/java/com/festago/student/infrastructure/MockMailClient.java @@ -1,7 +1,7 @@ -package com.festago.infrastructure; +package com.festago.student.infrastructure; -import com.festago.domain.MailClient; -import com.festago.domain.VerificationMailPayload; +import com.festago.student.application.MailClient; +import com.festago.student.domain.VerificationMailPayload; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/com/festago/infrastructure/RandomVerificationCodeProvider.java b/backend/src/main/java/com/festago/student/infrastructure/RandomVerificationCodeProvider.java similarity index 79% rename from backend/src/main/java/com/festago/infrastructure/RandomVerificationCodeProvider.java rename to backend/src/main/java/com/festago/student/infrastructure/RandomVerificationCodeProvider.java index fbf1f4451..b40146cb4 100644 --- a/backend/src/main/java/com/festago/infrastructure/RandomVerificationCodeProvider.java +++ b/backend/src/main/java/com/festago/student/infrastructure/RandomVerificationCodeProvider.java @@ -1,10 +1,10 @@ -package com.festago.infrastructure; +package com.festago.student.infrastructure; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.joining; -import com.festago.domain.VerificationCode; -import com.festago.domain.VerificationCodeProvider; +import com.festago.student.application.VerificationCodeProvider; +import com.festago.student.domain.VerificationCode; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/com/festago/domain/StudentCodeRepository.java b/backend/src/main/java/com/festago/student/repository/StudentCodeRepository.java similarity index 62% rename from backend/src/main/java/com/festago/domain/StudentCodeRepository.java rename to backend/src/main/java/com/festago/student/repository/StudentCodeRepository.java index 54c627b1f..6afe6cbd2 100644 --- a/backend/src/main/java/com/festago/domain/StudentCodeRepository.java +++ b/backend/src/main/java/com/festago/student/repository/StudentCodeRepository.java @@ -1,5 +1,8 @@ -package com.festago.domain; +package com.festago.student.repository; +import com.festago.member.domain.Member; +import com.festago.student.domain.StudentCode; +import com.festago.student.domain.VerificationCode; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/com/festago/domain/StudentRepository.java b/backend/src/main/java/com/festago/student/repository/StudentRepository.java similarity index 74% rename from backend/src/main/java/com/festago/domain/StudentRepository.java rename to backend/src/main/java/com/festago/student/repository/StudentRepository.java index ab1cdf49d..43576d299 100644 --- a/backend/src/main/java/com/festago/domain/StudentRepository.java +++ b/backend/src/main/java/com/festago/student/repository/StudentRepository.java @@ -1,5 +1,6 @@ -package com.festago.domain; +package com.festago.student.repository; +import com.festago.student.domain.Student; import org.springframework.data.jpa.repository.JpaRepository; public interface StudentRepository extends JpaRepository { diff --git a/backend/src/main/java/com/festago/application/TicketService.java b/backend/src/main/java/com/festago/ticket/application/TicketService.java similarity index 73% rename from backend/src/main/java/com/festago/application/TicketService.java rename to backend/src/main/java/com/festago/ticket/application/TicketService.java index 6bdc6ddf4..79a8ef17b 100644 --- a/backend/src/main/java/com/festago/application/TicketService.java +++ b/backend/src/main/java/com/festago/ticket/application/TicketService.java @@ -1,15 +1,15 @@ -package com.festago.application; - -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.domain.Ticket; -import com.festago.domain.TicketRepository; -import com.festago.domain.TicketType; -import com.festago.dto.StageTicketsResponse; -import com.festago.dto.TicketCreateRequest; -import com.festago.dto.TicketCreateResponse; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +package com.festago.ticket.application; + +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketType; +import com.festago.ticket.dto.StageTicketsResponse; +import com.festago.ticket.dto.TicketCreateRequest; +import com.festago.ticket.dto.TicketCreateResponse; +import com.festago.ticket.repository.TicketRepository; import java.time.Clock; import java.time.LocalDateTime; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/festago/domain/Ticket.java b/backend/src/main/java/com/festago/ticket/domain/Ticket.java similarity index 93% rename from backend/src/main/java/com/festago/domain/Ticket.java rename to backend/src/main/java/com/festago/ticket/domain/Ticket.java index 326c2c1bc..5ed3c789d 100644 --- a/backend/src/main/java/com/festago/domain/Ticket.java +++ b/backend/src/main/java/com/festago/ticket/domain/Ticket.java @@ -1,7 +1,11 @@ -package com.festago.domain; - -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; +package com.festago.ticket.domain; + +import com.festago.common.domain.BaseTimeEntity; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.member.domain.Member; +import com.festago.stage.domain.Stage; +import com.festago.ticketing.domain.MemberTicket; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/backend/src/main/java/com/festago/domain/TicketAmount.java b/backend/src/main/java/com/festago/ticket/domain/TicketAmount.java similarity index 87% rename from backend/src/main/java/com/festago/domain/TicketAmount.java rename to backend/src/main/java/com/festago/ticket/domain/TicketAmount.java index 03d4a91db..b3faa00b6 100644 --- a/backend/src/main/java/com/festago/domain/TicketAmount.java +++ b/backend/src/main/java/com/festago/ticket/domain/TicketAmount.java @@ -1,7 +1,8 @@ -package com.festago.domain; +package com.festago.ticket.domain; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; +import com.festago.common.domain.BaseTimeEntity; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.Id; @@ -27,7 +28,7 @@ public class TicketAmount extends BaseTimeEntity { @JoinColumn(name = "ticket_id") private Ticket ticket; - protected TicketAmount() { + public TicketAmount() { } public TicketAmount(Ticket ticket) { diff --git a/backend/src/main/java/com/festago/domain/TicketEntryTime.java b/backend/src/main/java/com/festago/ticket/domain/TicketEntryTime.java similarity index 93% rename from backend/src/main/java/com/festago/domain/TicketEntryTime.java rename to backend/src/main/java/com/festago/ticket/domain/TicketEntryTime.java index e495a07d4..3a0500f6d 100644 --- a/backend/src/main/java/com/festago/domain/TicketEntryTime.java +++ b/backend/src/main/java/com/festago/ticket/domain/TicketEntryTime.java @@ -1,7 +1,8 @@ -package com.festago.domain; +package com.festago.ticket.domain; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; +import com.festago.common.domain.BaseTimeEntity; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/backend/src/main/java/com/festago/domain/TicketType.java b/backend/src/main/java/com/festago/ticket/domain/TicketType.java similarity index 63% rename from backend/src/main/java/com/festago/domain/TicketType.java rename to backend/src/main/java/com/festago/ticket/domain/TicketType.java index 914350966..42973899b 100644 --- a/backend/src/main/java/com/festago/domain/TicketType.java +++ b/backend/src/main/java/com/festago/ticket/domain/TicketType.java @@ -1,4 +1,4 @@ -package com.festago.domain; +package com.festago.ticket.domain; public enum TicketType { STUDENT, diff --git a/backend/src/main/java/com/festago/dto/StageTicketResponse.java b/backend/src/main/java/com/festago/ticket/dto/StageTicketResponse.java similarity index 73% rename from backend/src/main/java/com/festago/dto/StageTicketResponse.java rename to backend/src/main/java/com/festago/ticket/dto/StageTicketResponse.java index b525f9a08..271a57e9f 100644 --- a/backend/src/main/java/com/festago/dto/StageTicketResponse.java +++ b/backend/src/main/java/com/festago/ticket/dto/StageTicketResponse.java @@ -1,8 +1,8 @@ -package com.festago.dto; +package com.festago.ticket.dto; -import com.festago.domain.Ticket; -import com.festago.domain.TicketAmount; -import com.festago.domain.TicketType; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketAmount; +import com.festago.ticket.domain.TicketType; public record StageTicketResponse( Long id, diff --git a/backend/src/main/java/com/festago/dto/StageTicketsResponse.java b/backend/src/main/java/com/festago/ticket/dto/StageTicketsResponse.java similarity index 85% rename from backend/src/main/java/com/festago/dto/StageTicketsResponse.java rename to backend/src/main/java/com/festago/ticket/dto/StageTicketsResponse.java index 7a184ed02..870d73f85 100644 --- a/backend/src/main/java/com/festago/dto/StageTicketsResponse.java +++ b/backend/src/main/java/com/festago/ticket/dto/StageTicketsResponse.java @@ -1,9 +1,9 @@ -package com.festago.dto; +package com.festago.ticket.dto; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; -import com.festago.domain.Ticket; +import com.festago.ticket.domain.Ticket; import java.util.List; public record StageTicketsResponse( diff --git a/backend/src/main/java/com/festago/dto/TicketCreateRequest.java b/backend/src/main/java/com/festago/ticket/dto/TicketCreateRequest.java similarity index 87% rename from backend/src/main/java/com/festago/dto/TicketCreateRequest.java rename to backend/src/main/java/com/festago/ticket/dto/TicketCreateRequest.java index c90b8e872..823bdca2b 100644 --- a/backend/src/main/java/com/festago/dto/TicketCreateRequest.java +++ b/backend/src/main/java/com/festago/ticket/dto/TicketCreateRequest.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.ticket.dto; -import com.festago.domain.TicketType; +import com.festago.ticket.domain.TicketType; import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; import org.springframework.format.annotation.DateTimeFormat; diff --git a/backend/src/main/java/com/festago/dto/TicketCreateResponse.java b/backend/src/main/java/com/festago/ticket/dto/TicketCreateResponse.java similarity index 71% rename from backend/src/main/java/com/festago/dto/TicketCreateResponse.java rename to backend/src/main/java/com/festago/ticket/dto/TicketCreateResponse.java index fc06a4450..148114fe6 100644 --- a/backend/src/main/java/com/festago/dto/TicketCreateResponse.java +++ b/backend/src/main/java/com/festago/ticket/dto/TicketCreateResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.ticket.dto; -import com.festago.domain.Ticket; +import com.festago.ticket.domain.Ticket; public record TicketCreateResponse( Long id) { diff --git a/backend/src/main/java/com/festago/domain/TicketAmountRepository.java b/backend/src/main/java/com/festago/ticket/repository/TicketAmountRepository.java similarity index 87% rename from backend/src/main/java/com/festago/domain/TicketAmountRepository.java rename to backend/src/main/java/com/festago/ticket/repository/TicketAmountRepository.java index dca248cfb..0ec6f7b3e 100644 --- a/backend/src/main/java/com/festago/domain/TicketAmountRepository.java +++ b/backend/src/main/java/com/festago/ticket/repository/TicketAmountRepository.java @@ -1,5 +1,6 @@ -package com.festago.domain; +package com.festago.ticket.repository; +import com.festago.ticket.domain.TicketAmount; import jakarta.persistence.LockModeType; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/com/festago/domain/TicketRepository.java b/backend/src/main/java/com/festago/ticket/repository/TicketRepository.java similarity index 80% rename from backend/src/main/java/com/festago/domain/TicketRepository.java rename to backend/src/main/java/com/festago/ticket/repository/TicketRepository.java index 75e7079cf..8c5ab50af 100644 --- a/backend/src/main/java/com/festago/domain/TicketRepository.java +++ b/backend/src/main/java/com/festago/ticket/repository/TicketRepository.java @@ -1,5 +1,8 @@ -package com.festago.domain; +package com.festago.ticket.repository; +import com.festago.stage.domain.Stage; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketType; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/com/festago/application/MemberTicketService.java b/backend/src/main/java/com/festago/ticketing/application/MemberTicketService.java similarity index 86% rename from backend/src/main/java/com/festago/application/MemberTicketService.java rename to backend/src/main/java/com/festago/ticketing/application/MemberTicketService.java index 050d05f46..ef4b2d0d4 100644 --- a/backend/src/main/java/com/festago/application/MemberTicketService.java +++ b/backend/src/main/java/com/festago/ticketing/application/MemberTicketService.java @@ -1,17 +1,17 @@ -package com.festago.application; +package com.festago.ticketing.application; import static java.util.Comparator.comparing; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; -import com.festago.domain.MemberRepository; -import com.festago.domain.MemberTicket; -import com.festago.domain.MemberTicketRepository; -import com.festago.dto.MemberTicketResponse; -import com.festago.dto.MemberTicketsResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.member.repository.MemberRepository; +import com.festago.ticketing.domain.MemberTicket; +import com.festago.ticketing.dto.MemberTicketResponse; +import com.festago.ticketing.dto.MemberTicketsResponse; +import com.festago.ticketing.repository.MemberTicketRepository; import java.time.Clock; import java.time.Duration; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/festago/application/TicketingService.java b/backend/src/main/java/com/festago/ticketing/application/TicketingService.java similarity index 78% rename from backend/src/main/java/com/festago/application/TicketingService.java rename to backend/src/main/java/com/festago/ticketing/application/TicketingService.java index 2319fb673..81893faf8 100644 --- a/backend/src/main/java/com/festago/application/TicketingService.java +++ b/backend/src/main/java/com/festago/ticketing/application/TicketingService.java @@ -1,18 +1,18 @@ -package com.festago.application; +package com.festago.ticketing.application; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.domain.MemberTicket; -import com.festago.domain.MemberTicketRepository; -import com.festago.domain.Ticket; -import com.festago.domain.TicketAmount; -import com.festago.domain.TicketAmountRepository; -import com.festago.domain.TicketRepository; -import com.festago.dto.TicketingRequest; -import com.festago.dto.TicketingResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketAmount; +import com.festago.ticket.repository.TicketAmountRepository; +import com.festago.ticket.repository.TicketRepository; +import com.festago.ticketing.domain.MemberTicket; +import com.festago.ticketing.dto.TicketingRequest; +import com.festago.ticketing.dto.TicketingResponse; +import com.festago.ticketing.repository.MemberTicketRepository; import java.time.Clock; import java.time.LocalDateTime; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/festago/domain/EntryState.java b/backend/src/main/java/com/festago/ticketing/domain/EntryState.java similarity index 83% rename from backend/src/main/java/com/festago/domain/EntryState.java rename to backend/src/main/java/com/festago/ticketing/domain/EntryState.java index 46f6413a0..76c68a288 100644 --- a/backend/src/main/java/com/festago/domain/EntryState.java +++ b/backend/src/main/java/com/festago/ticketing/domain/EntryState.java @@ -1,7 +1,7 @@ -package com.festago.domain; +package com.festago.ticketing.domain; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.InternalServerException; public enum EntryState { BEFORE_ENTRY(0), diff --git a/backend/src/main/java/com/festago/domain/MemberTicket.java b/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java similarity index 94% rename from backend/src/main/java/com/festago/domain/MemberTicket.java rename to backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java index ce741075c..cf7a5bc5e 100644 --- a/backend/src/main/java/com/festago/domain/MemberTicket.java +++ b/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java @@ -1,5 +1,9 @@ -package com.festago.domain; +package com.festago.ticketing.domain; +import com.festago.common.domain.BaseTimeEntity; +import com.festago.member.domain.Member; +import com.festago.stage.domain.Stage; +import com.festago.ticket.domain.TicketType; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/backend/src/main/java/com/festago/dto/MemberTicketFestivalResponse.java b/backend/src/main/java/com/festago/ticketing/dto/MemberTicketFestivalResponse.java similarity index 80% rename from backend/src/main/java/com/festago/dto/MemberTicketFestivalResponse.java rename to backend/src/main/java/com/festago/ticketing/dto/MemberTicketFestivalResponse.java index 45cdbf0b7..0b3779cf0 100644 --- a/backend/src/main/java/com/festago/dto/MemberTicketFestivalResponse.java +++ b/backend/src/main/java/com/festago/ticketing/dto/MemberTicketFestivalResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.ticketing.dto; -import com.festago.domain.Festival; +import com.festago.festival.domain.Festival; public record MemberTicketFestivalResponse( Long id, diff --git a/backend/src/main/java/com/festago/dto/MemberTicketResponse.java b/backend/src/main/java/com/festago/ticketing/dto/MemberTicketResponse.java similarity index 81% rename from backend/src/main/java/com/festago/dto/MemberTicketResponse.java rename to backend/src/main/java/com/festago/ticketing/dto/MemberTicketResponse.java index f90a1004e..bd41105be 100644 --- a/backend/src/main/java/com/festago/dto/MemberTicketResponse.java +++ b/backend/src/main/java/com/festago/ticketing/dto/MemberTicketResponse.java @@ -1,8 +1,9 @@ -package com.festago.dto; +package com.festago.ticketing.dto; -import com.festago.domain.EntryState; -import com.festago.domain.MemberTicket; -import com.festago.domain.Stage; +import com.festago.stage.domain.Stage; +import com.festago.stage.dto.StageResponse; +import com.festago.ticketing.domain.EntryState; +import com.festago.ticketing.domain.MemberTicket; import java.time.LocalDateTime; public record MemberTicketResponse( diff --git a/backend/src/main/java/com/festago/dto/MemberTicketsResponse.java b/backend/src/main/java/com/festago/ticketing/dto/MemberTicketsResponse.java similarity index 84% rename from backend/src/main/java/com/festago/dto/MemberTicketsResponse.java rename to backend/src/main/java/com/festago/ticketing/dto/MemberTicketsResponse.java index 90cd91f58..b06e2aa41 100644 --- a/backend/src/main/java/com/festago/dto/MemberTicketsResponse.java +++ b/backend/src/main/java/com/festago/ticketing/dto/MemberTicketsResponse.java @@ -1,9 +1,9 @@ -package com.festago.dto; +package com.festago.ticketing.dto; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; -import com.festago.domain.MemberTicket; +import com.festago.ticketing.domain.MemberTicket; import java.util.List; public record MemberTicketsResponse( diff --git a/backend/src/main/java/com/festago/dto/TicketingRequest.java b/backend/src/main/java/com/festago/ticketing/dto/TicketingRequest.java similarity index 82% rename from backend/src/main/java/com/festago/dto/TicketingRequest.java rename to backend/src/main/java/com/festago/ticketing/dto/TicketingRequest.java index 0c3bbaba8..a2fe08a38 100644 --- a/backend/src/main/java/com/festago/dto/TicketingRequest.java +++ b/backend/src/main/java/com/festago/ticketing/dto/TicketingRequest.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.ticketing.dto; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/com/festago/dto/TicketingResponse.java b/backend/src/main/java/com/festago/ticketing/dto/TicketingResponse.java similarity index 80% rename from backend/src/main/java/com/festago/dto/TicketingResponse.java rename to backend/src/main/java/com/festago/ticketing/dto/TicketingResponse.java index 0dd10b058..8e3234374 100644 --- a/backend/src/main/java/com/festago/dto/TicketingResponse.java +++ b/backend/src/main/java/com/festago/ticketing/dto/TicketingResponse.java @@ -1,6 +1,6 @@ -package com.festago.dto; +package com.festago.ticketing.dto; -import com.festago.domain.MemberTicket; +import com.festago.ticketing.domain.MemberTicket; import java.time.LocalDateTime; public record TicketingResponse( diff --git a/backend/src/main/java/com/festago/domain/MemberTicketRepository.java b/backend/src/main/java/com/festago/ticketing/repository/MemberTicketRepository.java similarity index 67% rename from backend/src/main/java/com/festago/domain/MemberTicketRepository.java rename to backend/src/main/java/com/festago/ticketing/repository/MemberTicketRepository.java index 547f93c4c..4608b6208 100644 --- a/backend/src/main/java/com/festago/domain/MemberTicketRepository.java +++ b/backend/src/main/java/com/festago/ticketing/repository/MemberTicketRepository.java @@ -1,5 +1,8 @@ -package com.festago.domain; +package com.festago.ticketing.repository; +import com.festago.member.domain.Member; +import com.festago.stage.domain.Stage; +import com.festago.ticketing.domain.MemberTicket; import java.util.List; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/test/java/com/festago/application/EntryServiceTest.java b/backend/src/test/java/com/festago/application/EntryServiceTest.java index ea2a7e8cb..962c1a3af 100644 --- a/backend/src/test/java/com/festago/application/EntryServiceTest.java +++ b/backend/src/test/java/com/festago/application/EntryServiceTest.java @@ -7,24 +7,26 @@ import static org.mockito.BDDMockito.anyLong; import static org.mockito.BDDMockito.given; -import com.festago.domain.EntryCode; -import com.festago.domain.EntryCodePayload; -import com.festago.domain.EntryState; -import com.festago.domain.Festival; -import com.festago.domain.Member; -import com.festago.domain.MemberTicket; -import com.festago.domain.MemberTicketRepository; -import com.festago.domain.Stage; -import com.festago.dto.EntryCodeResponse; -import com.festago.dto.TicketValidationRequest; -import com.festago.dto.TicketValidationResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.NotFoundException; +import com.festago.entry.application.EntryCodeManager; +import com.festago.entry.application.EntryService; +import com.festago.entry.domain.EntryCode; +import com.festago.entry.domain.EntryCodePayload; +import com.festago.entry.dto.EntryCodeResponse; +import com.festago.entry.dto.TicketValidationRequest; +import com.festago.entry.dto.TicketValidationResponse; +import com.festago.festival.domain.Festival; +import com.festago.member.domain.Member; +import com.festago.stage.domain.Stage; import com.festago.support.FestivalFixture; import com.festago.support.MemberFixture; import com.festago.support.MemberTicketFixture; import com.festago.support.StageFixture; import com.festago.support.TimeInstantProvider; +import com.festago.ticketing.domain.EntryState; +import com.festago.ticketing.domain.MemberTicket; +import com.festago.ticketing.repository.MemberTicketRepository; import java.time.Clock; import java.time.Instant; import java.time.LocalDateTime; diff --git a/backend/src/test/java/com/festago/application/FestivalServiceTest.java b/backend/src/test/java/com/festago/application/FestivalServiceTest.java index a34a7f3d3..edd5cab95 100644 --- a/backend/src/test/java/com/festago/application/FestivalServiceTest.java +++ b/backend/src/test/java/com/festago/application/FestivalServiceTest.java @@ -5,17 +5,18 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; -import com.festago.domain.Festival; -import com.festago.domain.FestivalRepository; -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.dto.FestivalCreateRequest; -import com.festago.dto.FestivalDetailResponse; -import com.festago.dto.FestivalDetailStageResponse; -import com.festago.dto.FestivalResponse; -import com.festago.dto.FestivalsResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.NotFoundException; +import com.festago.festival.application.FestivalService; +import com.festago.festival.domain.Festival; +import com.festago.festival.dto.FestivalCreateRequest; +import com.festago.festival.dto.FestivalDetailResponse; +import com.festago.festival.dto.FestivalDetailStageResponse; +import com.festago.festival.dto.FestivalResponse; +import com.festago.festival.dto.FestivalsResponse; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; import com.festago.support.FestivalFixture; import com.festago.support.StageFixture; import java.time.LocalDate; diff --git a/backend/src/test/java/com/festago/application/MemberTicketServiceTest.java b/backend/src/test/java/com/festago/application/MemberTicketServiceTest.java index 591a820c1..4fa00125e 100644 --- a/backend/src/test/java/com/festago/application/MemberTicketServiceTest.java +++ b/backend/src/test/java/com/festago/application/MemberTicketServiceTest.java @@ -7,18 +7,19 @@ import static org.mockito.BDDMockito.anyLong; import static org.mockito.BDDMockito.given; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.domain.MemberTicket; -import com.festago.domain.MemberTicketRepository; -import com.festago.domain.Stage; -import com.festago.dto.MemberTicketResponse; -import com.festago.dto.MemberTicketsResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.NotFoundException; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; +import com.festago.stage.domain.Stage; import com.festago.support.MemberFixture; import com.festago.support.MemberTicketFixture; import com.festago.support.StageFixture; +import com.festago.ticketing.application.MemberTicketService; +import com.festago.ticketing.domain.MemberTicket; +import com.festago.ticketing.dto.MemberTicketResponse; +import com.festago.ticketing.dto.MemberTicketsResponse; +import com.festago.ticketing.repository.MemberTicketRepository; import java.time.Clock; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/test/java/com/festago/application/StageServiceTest.java b/backend/src/test/java/com/festago/application/StageServiceTest.java index 5ee2c92ea..a2261cd22 100644 --- a/backend/src/test/java/com/festago/application/StageServiceTest.java +++ b/backend/src/test/java/com/festago/application/StageServiceTest.java @@ -5,12 +5,13 @@ import static org.mockito.BDDMockito.anyLong; import static org.mockito.BDDMockito.given; -import com.festago.domain.Festival; -import com.festago.domain.FestivalRepository; -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.dto.StageCreateRequest; -import com.festago.dto.StageResponse; +import com.festago.festival.domain.Festival; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.application.StageService; +import com.festago.stage.domain.Stage; +import com.festago.stage.dto.StageCreateRequest; +import com.festago.stage.dto.StageResponse; +import com.festago.stage.repository.StageRepository; import com.festago.support.FestivalFixture; import java.time.LocalDateTime; import java.util.Optional; diff --git a/backend/src/test/java/com/festago/application/StudentServiceTest.java b/backend/src/test/java/com/festago/application/StudentServiceTest.java index 9f5896b20..41e94d388 100644 --- a/backend/src/test/java/com/festago/application/StudentServiceTest.java +++ b/backend/src/test/java/com/festago/application/StudentServiceTest.java @@ -6,20 +6,21 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.BDDMockito.given; -import com.festago.domain.MailClient; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.domain.School; -import com.festago.domain.SchoolRepository; -import com.festago.domain.StudentCode; -import com.festago.domain.StudentCodeRepository; -import com.festago.domain.StudentRepository; -import com.festago.domain.VerificationCode; -import com.festago.domain.VerificationCodeProvider; -import com.festago.dto.StudentSendMailRequest; -import com.festago.dto.StudentVerificateRequest; -import com.festago.exception.BadRequestException; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.NotFoundException; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; +import com.festago.school.domain.School; +import com.festago.school.repository.SchoolRepository; +import com.festago.student.application.MailClient; +import com.festago.student.application.StudentService; +import com.festago.student.application.VerificationCodeProvider; +import com.festago.student.domain.StudentCode; +import com.festago.student.domain.VerificationCode; +import com.festago.student.dto.StudentSendMailRequest; +import com.festago.student.dto.StudentVerificateRequest; +import com.festago.student.repository.StudentCodeRepository; +import com.festago.student.repository.StudentRepository; import com.festago.support.MemberFixture; import java.util.Optional; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/application/TicketServiceTest.java b/backend/src/test/java/com/festago/application/TicketServiceTest.java index 7f8095604..cca7c198a 100644 --- a/backend/src/test/java/com/festago/application/TicketServiceTest.java +++ b/backend/src/test/java/com/festago/application/TicketServiceTest.java @@ -3,14 +3,15 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import com.festago.domain.Stage; -import com.festago.domain.Ticket; -import com.festago.domain.TicketRepository; -import com.festago.domain.TicketType; -import com.festago.dto.StageTicketResponse; -import com.festago.dto.StageTicketsResponse; +import com.festago.stage.domain.Stage; import com.festago.support.StageFixture; import com.festago.support.TicketFixture; +import com.festago.ticket.application.TicketService; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketType; +import com.festago.ticket.dto.StageTicketResponse; +import com.festago.ticket.dto.StageTicketsResponse; +import com.festago.ticket.repository.TicketRepository; import java.util.List; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; @@ -27,7 +28,7 @@ class TicketServiceTest { @Mock TicketRepository ticketRepository; - + @InjectMocks TicketService ticketService; diff --git a/backend/src/test/java/com/festago/application/integration/FestivalServiceIntegrationTest.java b/backend/src/test/java/com/festago/application/integration/FestivalServiceIntegrationTest.java index 71f838dfb..7b863ef60 100644 --- a/backend/src/test/java/com/festago/application/integration/FestivalServiceIntegrationTest.java +++ b/backend/src/test/java/com/festago/application/integration/FestivalServiceIntegrationTest.java @@ -2,22 +2,22 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.festago.application.FestivalService; -import com.festago.domain.Festival; -import com.festago.domain.FestivalRepository; -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.domain.Ticket; -import com.festago.domain.TicketRepository; -import com.festago.domain.TicketType; -import com.festago.dto.FestivalCreateRequest; -import com.festago.dto.FestivalDetailResponse; -import com.festago.dto.FestivalDetailStageResponse; -import com.festago.dto.FestivalDetailTicketResponse; -import com.festago.dto.FestivalResponse; +import com.festago.festival.application.FestivalService; +import com.festago.festival.domain.Festival; +import com.festago.festival.dto.FestivalCreateRequest; +import com.festago.festival.dto.FestivalDetailResponse; +import com.festago.festival.dto.FestivalDetailStageResponse; +import com.festago.festival.dto.FestivalDetailTicketResponse; +import com.festago.festival.dto.FestivalResponse; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; import com.festago.support.FestivalFixture; import com.festago.support.StageFixture; import com.festago.support.TicketFixture; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketType; +import com.festago.ticket.repository.TicketRepository; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/test/java/com/festago/application/integration/MemberTicketIntegrationTest.java b/backend/src/test/java/com/festago/application/integration/MemberTicketIntegrationTest.java index 4391e4ecb..b4e719f72 100644 --- a/backend/src/test/java/com/festago/application/integration/MemberTicketIntegrationTest.java +++ b/backend/src/test/java/com/festago/application/integration/MemberTicketIntegrationTest.java @@ -2,20 +2,20 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.festago.application.MemberTicketService; -import com.festago.domain.Festival; -import com.festago.domain.FestivalRepository; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.domain.MemberTicketRepository; -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.domain.TicketRepository; -import com.festago.dto.MemberTicketsResponse; +import com.festago.festival.domain.Festival; +import com.festago.festival.repository.FestivalRepository; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; import com.festago.support.FestivalFixture; import com.festago.support.MemberFixture; import com.festago.support.MemberTicketFixture; import com.festago.support.StageFixture; +import com.festago.ticket.repository.TicketRepository; +import com.festago.ticketing.application.MemberTicketService; +import com.festago.ticketing.dto.MemberTicketsResponse; +import com.festago.ticketing.repository.MemberTicketRepository; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/application/integration/StageServiceIntegrationTest.java b/backend/src/test/java/com/festago/application/integration/StageServiceIntegrationTest.java index f73f37098..25f471e8e 100644 --- a/backend/src/test/java/com/festago/application/integration/StageServiceIntegrationTest.java +++ b/backend/src/test/java/com/festago/application/integration/StageServiceIntegrationTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.festago.application.StageService; -import com.festago.domain.FestivalRepository; -import com.festago.dto.StageCreateRequest; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.NotFoundException; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.application.StageService; +import com.festago.stage.dto.StageCreateRequest; import java.time.LocalDateTime; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/application/integration/TicketServiceIntegrationTest.java b/backend/src/test/java/com/festago/application/integration/TicketServiceIntegrationTest.java index 7a5fca505..a0d755858 100644 --- a/backend/src/test/java/com/festago/application/integration/TicketServiceIntegrationTest.java +++ b/backend/src/test/java/com/festago/application/integration/TicketServiceIntegrationTest.java @@ -4,20 +4,20 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.doReturn; -import com.festago.application.TicketService; -import com.festago.domain.Festival; -import com.festago.domain.FestivalRepository; -import com.festago.domain.Stage; -import com.festago.domain.StageRepository; -import com.festago.domain.TicketAmount; -import com.festago.domain.TicketAmountRepository; -import com.festago.domain.TicketRepository; -import com.festago.domain.TicketType; -import com.festago.dto.TicketCreateRequest; -import com.festago.dto.TicketCreateResponse; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.NotFoundException; +import com.festago.festival.domain.Festival; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; import com.festago.support.FestivalFixture; import com.festago.support.StageFixture; +import com.festago.ticket.application.TicketService; +import com.festago.ticket.domain.TicketAmount; +import com.festago.ticket.domain.TicketType; +import com.festago.ticket.dto.TicketCreateRequest; +import com.festago.ticket.dto.TicketCreateResponse; +import com.festago.ticket.repository.TicketAmountRepository; +import com.festago.ticket.repository.TicketRepository; import java.time.Clock; import java.time.LocalDateTime; import java.time.ZoneOffset; diff --git a/backend/src/test/java/com/festago/application/integration/TicketingServiceIntegrationTest.java b/backend/src/test/java/com/festago/application/integration/TicketingServiceIntegrationTest.java index 00ecb925a..5b57991bb 100644 --- a/backend/src/test/java/com/festago/application/integration/TicketingServiceIntegrationTest.java +++ b/backend/src/test/java/com/festago/application/integration/TicketingServiceIntegrationTest.java @@ -5,14 +5,14 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; -import com.festago.application.TicketingService; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.domain.MemberTicketRepository; -import com.festago.domain.Stage; -import com.festago.dto.TicketingRequest; -import com.festago.exception.BadRequestException; +import com.festago.common.exception.BadRequestException; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; +import com.festago.stage.domain.Stage; import com.festago.support.MemberFixture; +import com.festago.ticketing.application.TicketingService; +import com.festago.ticketing.dto.TicketingRequest; +import com.festago.ticketing.repository.MemberTicketRepository; import java.time.Clock; import java.time.Instant; import java.util.List; diff --git a/backend/src/test/java/com/festago/auth/application/AdminAuthFacadeServiceTest.java b/backend/src/test/java/com/festago/auth/application/AdminAuthFacadeServiceTest.java index 99f798a1f..0a232719a 100644 --- a/backend/src/test/java/com/festago/auth/application/AdminAuthFacadeServiceTest.java +++ b/backend/src/test/java/com/festago/auth/application/AdminAuthFacadeServiceTest.java @@ -7,15 +7,14 @@ import static org.mockito.BDDMockito.anyString; import static org.mockito.BDDMockito.given; -import com.festago.auth.domain.Admin; -import com.festago.auth.domain.AdminRepository; -import com.festago.auth.domain.AuthProvider; +import com.festago.admin.domain.Admin; +import com.festago.admin.repository.AdminRepository; import com.festago.auth.dto.AdminLoginRequest; import com.festago.auth.dto.AdminSignupRequest; import com.festago.auth.dto.AdminSignupResponse; -import com.festago.exception.BadRequestException; -import com.festago.exception.ForbiddenException; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.ForbiddenException; +import com.festago.common.exception.UnauthorizedException; import java.util.Optional; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/auth/application/AuthFacadeServiceTest.java b/backend/src/test/java/com/festago/auth/application/AuthFacadeServiceTest.java index 5c56d1322..e953d8e06 100644 --- a/backend/src/test/java/com/festago/auth/application/AuthFacadeServiceTest.java +++ b/backend/src/test/java/com/festago/auth/application/AuthFacadeServiceTest.java @@ -6,15 +6,13 @@ import static org.mockito.BDDMockito.mock; import com.festago.auth.domain.AuthPayload; -import com.festago.auth.domain.AuthProvider; -import com.festago.auth.domain.OAuth2Clients; import com.festago.auth.domain.SocialType; import com.festago.auth.domain.UserInfo; import com.festago.auth.dto.LoginMemberDto; import com.festago.auth.dto.LoginRequest; import com.festago.auth.dto.LoginResponse; import com.festago.auth.infrastructure.FestagoOAuth2Client; -import com.festago.domain.Member; +import com.festago.member.domain.Member; import com.festago.support.MemberFixture; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/auth/application/AuthServiceTest.java b/backend/src/test/java/com/festago/auth/application/AuthServiceTest.java index c6a0fedc3..e7f30e34b 100644 --- a/backend/src/test/java/com/festago/auth/application/AuthServiceTest.java +++ b/backend/src/test/java/com/festago/auth/application/AuthServiceTest.java @@ -10,9 +10,9 @@ import com.festago.auth.domain.SocialType; import com.festago.auth.domain.UserInfo; import com.festago.auth.dto.LoginMemberDto; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; -import com.festago.exception.NotFoundException; +import com.festago.common.exception.NotFoundException; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; import com.festago.support.MemberFixture; import java.util.Optional; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/auth/application/integration/AuthFacadeServiceIntegrationTest.java b/backend/src/test/java/com/festago/auth/application/integration/AuthFacadeServiceIntegrationTest.java index 1be92b665..0724545a0 100644 --- a/backend/src/test/java/com/festago/auth/application/integration/AuthFacadeServiceIntegrationTest.java +++ b/backend/src/test/java/com/festago/auth/application/integration/AuthFacadeServiceIntegrationTest.java @@ -7,8 +7,8 @@ import com.festago.auth.application.AuthFacadeService; import com.festago.auth.domain.SocialType; import com.festago.auth.dto.LoginRequest; -import com.festago.domain.Member; -import com.festago.domain.MemberRepository; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; import com.festago.support.MemberFixture; import jakarta.persistence.EntityManager; import java.util.List; diff --git a/backend/src/test/java/com/festago/auth/domain/OAuth2ClientsTest.java b/backend/src/test/java/com/festago/auth/domain/OAuth2ClientsTest.java index 58b3d2651..2eadd9f77 100644 --- a/backend/src/test/java/com/festago/auth/domain/OAuth2ClientsTest.java +++ b/backend/src/test/java/com/festago/auth/domain/OAuth2ClientsTest.java @@ -4,12 +4,14 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; -import com.festago.auth.domain.OAuth2Clients.OAuth2ClientsBuilder; +import com.festago.auth.application.OAuth2Client; +import com.festago.auth.application.OAuth2Clients; +import com.festago.auth.application.OAuth2Clients.OAuth2ClientsBuilder; import com.festago.auth.infrastructure.FestagoOAuth2Client; import com.festago.auth.infrastructure.KakaoOAuth2Client; import com.festago.auth.infrastructure.KakaoOAuth2UserInfoClient; -import com.festago.exception.BadRequestException; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.InternalServerException; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/auth/infrastructure/HeaderTokenExtractorTest.java b/backend/src/test/java/com/festago/auth/infrastructure/HeaderTokenExtractorTest.java index 0b0804ac9..3f15dc7d2 100644 --- a/backend/src/test/java/com/festago/auth/infrastructure/HeaderTokenExtractorTest.java +++ b/backend/src/test/java/com/festago/auth/infrastructure/HeaderTokenExtractorTest.java @@ -4,7 +4,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.BDDMockito.given; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.UnauthorizedException; import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/auth/infrastructure/JwtAuthExtractorTest.java b/backend/src/test/java/com/festago/auth/infrastructure/JwtAuthExtractorTest.java index 209ce2558..3be793412 100644 --- a/backend/src/test/java/com/festago/auth/infrastructure/JwtAuthExtractorTest.java +++ b/backend/src/test/java/com/festago/auth/infrastructure/JwtAuthExtractorTest.java @@ -4,8 +4,8 @@ import com.festago.auth.domain.AuthPayload; import com.festago.auth.domain.Role; -import com.festago.exception.InternalServerException; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.InternalServerException; +import com.festago.common.exception.UnauthorizedException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.security.Keys; diff --git a/backend/src/test/java/com/festago/auth/infrastructure/KakaoOAuth2UserInfoClientTest.java b/backend/src/test/java/com/festago/auth/infrastructure/KakaoOAuth2UserInfoClientTest.java index e04e0cc6d..d2ef9f418 100644 --- a/backend/src/test/java/com/festago/auth/infrastructure/KakaoOAuth2UserInfoClientTest.java +++ b/backend/src/test/java/com/festago/auth/infrastructure/KakaoOAuth2UserInfoClientTest.java @@ -11,8 +11,8 @@ import com.festago.auth.dto.KakaoUserInfo; import com.festago.auth.dto.KakaoUserInfo.KakaoAccount; import com.festago.auth.dto.KakaoUserInfo.KakaoAccount.Profile; -import com.festago.exception.BadRequestException; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.InternalServerException; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/auth/presentation/AuthControllerTest.java b/backend/src/test/java/com/festago/auth/presentation/AuthControllerTest.java index 663251e38..281261a03 100644 --- a/backend/src/test/java/com/festago/auth/presentation/AuthControllerTest.java +++ b/backend/src/test/java/com/festago/auth/presentation/AuthControllerTest.java @@ -14,6 +14,7 @@ import com.festago.auth.domain.SocialType; import com.festago.auth.dto.LoginRequest; import com.festago.auth.dto.LoginResponse; +import com.festago.presentation.AuthController; import com.festago.support.CustomWebMvcTest; import com.festago.support.WithMockAuth; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/auth/presentation/RoleArgumentResolverTest.java b/backend/src/test/java/com/festago/auth/presentation/RoleArgumentResolverTest.java index ca04824c7..e66c993dd 100644 --- a/backend/src/test/java/com/festago/auth/presentation/RoleArgumentResolverTest.java +++ b/backend/src/test/java/com/festago/auth/presentation/RoleArgumentResolverTest.java @@ -4,7 +4,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.festago.auth.domain.Role; -import com.festago.exception.ForbiddenException; +import com.festago.common.exception.ForbiddenException; +import com.festago.presentation.auth.AuthenticateContext; +import com.festago.presentation.auth.RoleArgumentResolver; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/domain/EntryCodeTest.java b/backend/src/test/java/com/festago/domain/EntryCodeTest.java index c7939f962..f8444ca41 100644 --- a/backend/src/test/java/com/festago/domain/EntryCodeTest.java +++ b/backend/src/test/java/com/festago/domain/EntryCodeTest.java @@ -3,7 +3,8 @@ import static org.assertj.core.api.Assertions.assertThatNoException; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.InternalServerException; +import com.festago.entry.domain.EntryCode; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/domain/EntryStateTest.java b/backend/src/test/java/com/festago/domain/EntryStateTest.java index e0c6c4602..5060e890d 100644 --- a/backend/src/test/java/com/festago/domain/EntryStateTest.java +++ b/backend/src/test/java/com/festago/domain/EntryStateTest.java @@ -3,7 +3,8 @@ import static org.assertj.core.api.Assertions.assertThatNoException; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.InternalServerException; +import com.festago.ticketing.domain.EntryState; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/domain/FestivalTest.java b/backend/src/test/java/com/festago/domain/FestivalTest.java index f2f833b70..98ecd9c57 100644 --- a/backend/src/test/java/com/festago/domain/FestivalTest.java +++ b/backend/src/test/java/com/festago/domain/FestivalTest.java @@ -3,7 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.festago.exception.BadRequestException; +import com.festago.common.exception.BadRequestException; +import com.festago.festival.domain.Festival; import com.festago.support.FestivalFixture; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/backend/src/test/java/com/festago/domain/MemberRepositoryTest.java b/backend/src/test/java/com/festago/domain/MemberRepositoryTest.java index e5dc68de7..6e6e2e927 100644 --- a/backend/src/test/java/com/festago/domain/MemberRepositoryTest.java +++ b/backend/src/test/java/com/festago/domain/MemberRepositoryTest.java @@ -3,6 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; import com.festago.support.MemberFixture; import jakarta.persistence.EntityManager; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/domain/MemberTest.java b/backend/src/test/java/com/festago/domain/MemberTest.java index 74a68c9a1..e88b98641 100644 --- a/backend/src/test/java/com/festago/domain/MemberTest.java +++ b/backend/src/test/java/com/festago/domain/MemberTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.festago.member.domain.Member; import com.festago.support.MemberFixture; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/domain/MemberTicketRepositoryTest.java b/backend/src/test/java/com/festago/domain/MemberTicketRepositoryTest.java index 7a674bad5..0f08a1b2d 100644 --- a/backend/src/test/java/com/festago/domain/MemberTicketRepositoryTest.java +++ b/backend/src/test/java/com/festago/domain/MemberTicketRepositoryTest.java @@ -2,11 +2,21 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.festago.common.domain.BaseTimeEntity; import com.festago.config.JpaAuditingConfig; +import com.festago.festival.domain.Festival; +import com.festago.festival.repository.FestivalRepository; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; import com.festago.support.FestivalFixture; import com.festago.support.MemberFixture; import com.festago.support.MemberTicketFixture; import com.festago.support.StageFixture; +import com.festago.ticket.repository.TicketRepository; +import com.festago.ticketing.domain.MemberTicket; +import com.festago.ticketing.repository.MemberTicketRepository; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/backend/src/test/java/com/festago/domain/MemberTicketTest.java b/backend/src/test/java/com/festago/domain/MemberTicketTest.java index 3e4ec5a74..9189725ca 100644 --- a/backend/src/test/java/com/festago/domain/MemberTicketTest.java +++ b/backend/src/test/java/com/festago/domain/MemberTicketTest.java @@ -1,13 +1,17 @@ package com.festago.domain; -import static com.festago.domain.EntryState.AFTER_ENTRY; -import static com.festago.domain.EntryState.AWAY; -import static com.festago.domain.EntryState.BEFORE_ENTRY; +import static com.festago.ticketing.domain.EntryState.AFTER_ENTRY; +import static com.festago.ticketing.domain.EntryState.AWAY; +import static com.festago.ticketing.domain.EntryState.BEFORE_ENTRY; import static org.assertj.core.api.Assertions.assertThat; +import com.festago.festival.domain.Festival; +import com.festago.member.domain.Member; +import com.festago.stage.domain.Stage; import com.festago.support.FestivalFixture; import com.festago.support.MemberTicketFixture; import com.festago.support.StageFixture; +import com.festago.ticketing.domain.MemberTicket; import java.time.LocalDateTime; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/domain/RandomVerificationCodeProviderTest.java b/backend/src/test/java/com/festago/domain/RandomVerificationCodeProviderTest.java index 46c413959..1bf3e8a23 100644 --- a/backend/src/test/java/com/festago/domain/RandomVerificationCodeProviderTest.java +++ b/backend/src/test/java/com/festago/domain/RandomVerificationCodeProviderTest.java @@ -2,7 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.festago.infrastructure.RandomVerificationCodeProvider; +import com.festago.student.domain.VerificationCode; +import com.festago.student.infrastructure.RandomVerificationCodeProvider; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/domain/StageRepositoryTest.java b/backend/src/test/java/com/festago/domain/StageRepositoryTest.java index 05f1014d9..088d15562 100644 --- a/backend/src/test/java/com/festago/domain/StageRepositoryTest.java +++ b/backend/src/test/java/com/festago/domain/StageRepositoryTest.java @@ -3,9 +3,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; +import com.festago.festival.domain.Festival; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; import com.festago.support.FestivalFixture; import com.festago.support.StageFixture; import com.festago.support.TicketFixture; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketType; +import com.festago.ticket.repository.TicketRepository; import jakarta.persistence.EntityManager; import java.util.List; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/domain/StageTest.java b/backend/src/test/java/com/festago/domain/StageTest.java index ce788de69..b1873ef1d 100644 --- a/backend/src/test/java/com/festago/domain/StageTest.java +++ b/backend/src/test/java/com/festago/domain/StageTest.java @@ -3,7 +3,8 @@ import static org.assertj.core.api.Assertions.assertThatNoException; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.festago.exception.BadRequestException; +import com.festago.common.exception.BadRequestException; +import com.festago.festival.domain.Festival; import com.festago.support.FestivalFixture; import com.festago.support.StageFixture; import java.time.LocalDateTime; diff --git a/backend/src/test/java/com/festago/domain/TicketAmountTest.java b/backend/src/test/java/com/festago/domain/TicketAmountTest.java index 632263ff9..5260a1889 100644 --- a/backend/src/test/java/com/festago/domain/TicketAmountTest.java +++ b/backend/src/test/java/com/festago/domain/TicketAmountTest.java @@ -2,7 +2,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.festago.exception.BadRequestException; +import com.festago.common.exception.BadRequestException; +import com.festago.ticket.domain.TicketAmount; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/domain/TicketEntryTimeTest.java b/backend/src/test/java/com/festago/domain/TicketEntryTimeTest.java index e1c283290..647042a4f 100644 --- a/backend/src/test/java/com/festago/domain/TicketEntryTimeTest.java +++ b/backend/src/test/java/com/festago/domain/TicketEntryTimeTest.java @@ -2,7 +2,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.festago.exception.BadRequestException; +import com.festago.common.exception.BadRequestException; +import com.festago.ticket.domain.TicketEntryTime; import java.time.LocalDateTime; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/domain/TicketRepositoryTest.java b/backend/src/test/java/com/festago/domain/TicketRepositoryTest.java index 4f58ef697..bb92b7494 100644 --- a/backend/src/test/java/com/festago/domain/TicketRepositoryTest.java +++ b/backend/src/test/java/com/festago/domain/TicketRepositoryTest.java @@ -2,9 +2,16 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.festago.festival.domain.Festival; +import com.festago.festival.repository.FestivalRepository; +import com.festago.stage.domain.Stage; +import com.festago.stage.repository.StageRepository; import com.festago.support.FestivalFixture; import com.festago.support.StageFixture; import com.festago.support.TicketFixture; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketType; +import com.festago.ticket.repository.TicketRepository; import java.util.List; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/domain/TicketTest.java b/backend/src/test/java/com/festago/domain/TicketTest.java index 476c02d8c..e972aa9d4 100644 --- a/backend/src/test/java/com/festago/domain/TicketTest.java +++ b/backend/src/test/java/com/festago/domain/TicketTest.java @@ -4,11 +4,16 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import com.festago.exception.BadRequestException; +import com.festago.common.exception.BadRequestException; +import com.festago.festival.domain.Festival; +import com.festago.member.domain.Member; +import com.festago.stage.domain.Stage; import com.festago.support.FestivalFixture; import com.festago.support.MemberFixture; import com.festago.support.StageFixture; import com.festago.support.TicketFixture; +import com.festago.ticket.domain.Ticket; +import com.festago.ticketing.domain.MemberTicket; import java.time.LocalDateTime; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/domain/VerificationCodeTest.java b/backend/src/test/java/com/festago/domain/VerificationCodeTest.java index cfc7e4771..4cccf3fc4 100644 --- a/backend/src/test/java/com/festago/domain/VerificationCodeTest.java +++ b/backend/src/test/java/com/festago/domain/VerificationCodeTest.java @@ -3,7 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.InternalServerException; +import com.festago.student.domain.VerificationCode; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/dto/FestivalCreateRequestTest.java b/backend/src/test/java/com/festago/dto/FestivalCreateRequestTest.java index 90212404e..723a5ecb4 100644 --- a/backend/src/test/java/com/festago/dto/FestivalCreateRequestTest.java +++ b/backend/src/test/java/com/festago/dto/FestivalCreateRequestTest.java @@ -2,7 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.festago.domain.Festival; +import com.festago.festival.domain.Festival; +import com.festago.festival.dto.FestivalCreateRequest; import java.time.LocalDate; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/exception/FestaGoExceptionTest.java b/backend/src/test/java/com/festago/exception/FestaGoExceptionTest.java index c0c07eeb6..b71a58dea 100644 --- a/backend/src/test/java/com/festago/exception/FestaGoExceptionTest.java +++ b/backend/src/test/java/com/festago/exception/FestaGoExceptionTest.java @@ -2,6 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.FestaGoException; +import com.festago.common.exception.InternalServerException; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeExtractorTest.java b/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeExtractorTest.java index da4a31c1b..45fb0f6bf 100644 --- a/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeExtractorTest.java +++ b/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeExtractorTest.java @@ -3,9 +3,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import com.festago.domain.EntryCodePayload; -import com.festago.exception.BadRequestException; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.BadRequestException; +import com.festago.common.exception.InternalServerException; +import com.festago.entry.domain.EntryCodePayload; +import com.festago.entry.infrastructure.JwtEntryCodeExtractor; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.security.Keys; diff --git a/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeProviderTest.java b/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeProviderTest.java index dc6d4557c..6152092ae 100644 --- a/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeProviderTest.java +++ b/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeProviderTest.java @@ -3,11 +3,12 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import com.festago.domain.EntryCodePayload; -import com.festago.domain.EntryCodeProvider; -import com.festago.domain.MemberTicket; -import com.festago.exception.InternalServerException; +import com.festago.common.exception.InternalServerException; +import com.festago.entry.application.EntryCodeProvider; +import com.festago.entry.domain.EntryCodePayload; +import com.festago.entry.infrastructure.JwtEntryCodeProvider; import com.festago.support.MemberTicketFixture; +import com.festago.ticketing.domain.MemberTicket; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import java.util.Date; diff --git a/backend/src/test/java/com/festago/presentation/AdminControllerTest.java b/backend/src/test/java/com/festago/presentation/AdminControllerTest.java index 17137726d..a0fd0f50f 100644 --- a/backend/src/test/java/com/festago/presentation/AdminControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/AdminControllerTest.java @@ -10,26 +10,26 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.application.AdminService; -import com.festago.application.FestivalService; -import com.festago.application.StageService; -import com.festago.application.TicketService; +import com.festago.admin.application.AdminService; import com.festago.auth.application.AdminAuthService; -import com.festago.auth.domain.AuthExtractor; +import com.festago.auth.application.AuthExtractor; import com.festago.auth.domain.Role; -import com.festago.domain.TicketType; -import com.festago.dto.ErrorResponse; -import com.festago.dto.FestivalCreateRequest; -import com.festago.dto.FestivalResponse; -import com.festago.dto.StageCreateRequest; -import com.festago.dto.StageResponse; -import com.festago.dto.TicketCreateRequest; -import com.festago.dto.TicketCreateResponse; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; -import com.festago.exception.UnauthorizedException; +import com.festago.common.exception.ErrorCode; +import com.festago.common.exception.NotFoundException; +import com.festago.common.exception.UnauthorizedException; +import com.festago.common.exception.dto.ErrorResponse; +import com.festago.festival.application.FestivalService; +import com.festago.festival.dto.FestivalCreateRequest; +import com.festago.festival.dto.FestivalResponse; +import com.festago.stage.application.StageService; +import com.festago.stage.dto.StageCreateRequest; +import com.festago.stage.dto.StageResponse; import com.festago.support.CustomWebMvcTest; import com.festago.support.WithMockAuth; +import com.festago.ticket.application.TicketService; +import com.festago.ticket.domain.TicketType; +import com.festago.ticket.dto.TicketCreateRequest; +import com.festago.ticket.dto.TicketCreateResponse; import jakarta.servlet.http.Cookie; import java.nio.charset.StandardCharsets; import java.time.LocalDate; diff --git a/backend/src/test/java/com/festago/presentation/FestivalControllerTest.java b/backend/src/test/java/com/festago/presentation/FestivalControllerTest.java index 4d8a3bc4a..4959c32c6 100644 --- a/backend/src/test/java/com/festago/presentation/FestivalControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/FestivalControllerTest.java @@ -8,10 +8,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.application.FestivalService; -import com.festago.dto.FestivalDetailResponse; -import com.festago.dto.FestivalResponse; -import com.festago.dto.FestivalsResponse; +import com.festago.festival.application.FestivalService; +import com.festago.festival.dto.FestivalDetailResponse; +import com.festago.festival.dto.FestivalResponse; +import com.festago.festival.dto.FestivalsResponse; import com.festago.support.CustomWebMvcTest; import java.nio.charset.StandardCharsets; import java.time.LocalDate; diff --git a/backend/src/test/java/com/festago/presentation/MemberControllerTest.java b/backend/src/test/java/com/festago/presentation/MemberControllerTest.java index b6c8d5ad4..741ac7220 100644 --- a/backend/src/test/java/com/festago/presentation/MemberControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/MemberControllerTest.java @@ -8,11 +8,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.application.MemberService; -import com.festago.application.MemberTicketService; -import com.festago.dto.MemberProfileResponse; +import com.festago.member.application.MemberService; +import com.festago.member.dto.MemberProfileResponse; import com.festago.support.CustomWebMvcTest; import com.festago.support.WithMockAuth; +import com.festago.ticketing.application.MemberTicketService; import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/presentation/MemberTicketControllerTest.java b/backend/src/test/java/com/festago/presentation/MemberTicketControllerTest.java index c0a933f49..bcdd823f6 100644 --- a/backend/src/test/java/com/festago/presentation/MemberTicketControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/MemberTicketControllerTest.java @@ -13,19 +13,19 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.application.EntryService; -import com.festago.application.MemberTicketService; -import com.festago.application.TicketingService; -import com.festago.domain.EntryState; -import com.festago.dto.EntryCodeResponse; -import com.festago.dto.MemberTicketFestivalResponse; -import com.festago.dto.MemberTicketResponse; -import com.festago.dto.MemberTicketsResponse; -import com.festago.dto.StageResponse; -import com.festago.dto.TicketingRequest; -import com.festago.dto.TicketingResponse; +import com.festago.entry.application.EntryService; +import com.festago.entry.dto.EntryCodeResponse; +import com.festago.stage.dto.StageResponse; import com.festago.support.CustomWebMvcTest; import com.festago.support.WithMockAuth; +import com.festago.ticketing.application.MemberTicketService; +import com.festago.ticketing.application.TicketingService; +import com.festago.ticketing.domain.EntryState; +import com.festago.ticketing.dto.MemberTicketFestivalResponse; +import com.festago.ticketing.dto.MemberTicketResponse; +import com.festago.ticketing.dto.MemberTicketsResponse; +import com.festago.ticketing.dto.TicketingRequest; +import com.festago.ticketing.dto.TicketingResponse; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.util.stream.LongStream; diff --git a/backend/src/test/java/com/festago/presentation/SchoolControllerTest.java b/backend/src/test/java/com/festago/presentation/SchoolControllerTest.java index f9584d02c..c92297567 100644 --- a/backend/src/test/java/com/festago/presentation/SchoolControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/SchoolControllerTest.java @@ -7,9 +7,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.application.SchoolService; -import com.festago.dto.SchoolResponse; -import com.festago.dto.SchoolsResponse; +import com.festago.school.application.SchoolService; +import com.festago.school.dto.SchoolResponse; +import com.festago.school.dto.SchoolsResponse; import com.festago.support.CustomWebMvcTest; import java.nio.charset.StandardCharsets; import java.util.List; diff --git a/backend/src/test/java/com/festago/presentation/StaffMemberTicketControllerTest.java b/backend/src/test/java/com/festago/presentation/StaffMemberTicketControllerTest.java index b36df0ebe..0bcdd1a26 100644 --- a/backend/src/test/java/com/festago/presentation/StaffMemberTicketControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/StaffMemberTicketControllerTest.java @@ -7,11 +7,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.application.EntryService; -import com.festago.domain.EntryState; -import com.festago.dto.TicketValidationRequest; -import com.festago.dto.TicketValidationResponse; +import com.festago.entry.application.EntryService; +import com.festago.entry.dto.TicketValidationRequest; +import com.festago.entry.dto.TicketValidationResponse; import com.festago.support.CustomWebMvcTest; +import com.festago.ticketing.domain.EntryState; import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/presentation/StageControllerTest.java b/backend/src/test/java/com/festago/presentation/StageControllerTest.java index 90499dc8e..341f584a4 100644 --- a/backend/src/test/java/com/festago/presentation/StageControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/StageControllerTest.java @@ -8,11 +8,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.application.TicketService; -import com.festago.domain.TicketType; -import com.festago.dto.StageTicketResponse; -import com.festago.dto.StageTicketsResponse; import com.festago.support.CustomWebMvcTest; +import com.festago.ticket.application.TicketService; +import com.festago.ticket.domain.TicketType; +import com.festago.ticket.dto.StageTicketResponse; +import com.festago.ticket.dto.StageTicketsResponse; import java.nio.charset.StandardCharsets; import java.util.List; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/presentation/StudentControllerTest.java b/backend/src/test/java/com/festago/presentation/StudentControllerTest.java index 19322565d..541d79f40 100644 --- a/backend/src/test/java/com/festago/presentation/StudentControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/StudentControllerTest.java @@ -4,9 +4,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.festago.application.StudentService; -import com.festago.dto.StudentSendMailRequest; -import com.festago.dto.StudentVerificateRequest; +import com.festago.student.application.StudentService; +import com.festago.student.dto.StudentSendMailRequest; +import com.festago.student.dto.StudentVerificateRequest; import com.festago.support.CustomWebMvcTest; import com.festago.support.WithMockAuth; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/support/FestivalFixture.java b/backend/src/test/java/com/festago/support/FestivalFixture.java index aa92fae0f..39693181d 100644 --- a/backend/src/test/java/com/festago/support/FestivalFixture.java +++ b/backend/src/test/java/com/festago/support/FestivalFixture.java @@ -1,6 +1,6 @@ package com.festago.support; -import com.festago.domain.Festival; +import com.festago.festival.domain.Festival; import java.time.LocalDate; public class FestivalFixture { diff --git a/backend/src/test/java/com/festago/support/MemberFixture.java b/backend/src/test/java/com/festago/support/MemberFixture.java index 71b111875..ebc4f8f1d 100644 --- a/backend/src/test/java/com/festago/support/MemberFixture.java +++ b/backend/src/test/java/com/festago/support/MemberFixture.java @@ -1,7 +1,7 @@ package com.festago.support; import com.festago.auth.domain.SocialType; -import com.festago.domain.Member; +import com.festago.member.domain.Member; public class MemberFixture { diff --git a/backend/src/test/java/com/festago/support/MemberTicketFixture.java b/backend/src/test/java/com/festago/support/MemberTicketFixture.java index a2f9c83a1..784c59abd 100644 --- a/backend/src/test/java/com/festago/support/MemberTicketFixture.java +++ b/backend/src/test/java/com/festago/support/MemberTicketFixture.java @@ -1,9 +1,9 @@ package com.festago.support; -import com.festago.domain.Member; -import com.festago.domain.MemberTicket; -import com.festago.domain.Stage; -import com.festago.domain.TicketType; +import com.festago.member.domain.Member; +import com.festago.stage.domain.Stage; +import com.festago.ticket.domain.TicketType; +import com.festago.ticketing.domain.MemberTicket; import java.time.LocalDateTime; public class MemberTicketFixture { diff --git a/backend/src/test/java/com/festago/support/MockAuthExtractor.java b/backend/src/test/java/com/festago/support/MockAuthExtractor.java index 43c432dd8..cd88b0aed 100644 --- a/backend/src/test/java/com/festago/support/MockAuthExtractor.java +++ b/backend/src/test/java/com/festago/support/MockAuthExtractor.java @@ -1,8 +1,8 @@ package com.festago.support; -import com.festago.auth.domain.AuthExtractor; +import com.festago.auth.application.AuthExtractor; import com.festago.auth.domain.AuthPayload; -import com.festago.auth.presentation.AuthenticateContext; +import com.festago.presentation.auth.AuthenticateContext; public class MockAuthExtractor implements AuthExtractor { diff --git a/backend/src/test/java/com/festago/support/MockAuthTestExecutionListener.java b/backend/src/test/java/com/festago/support/MockAuthTestExecutionListener.java index 8f7a9e9e0..5cf14879c 100644 --- a/backend/src/test/java/com/festago/support/MockAuthTestExecutionListener.java +++ b/backend/src/test/java/com/festago/support/MockAuthTestExecutionListener.java @@ -1,7 +1,7 @@ package com.festago.support; import com.festago.auth.domain.Role; -import com.festago.auth.presentation.AuthenticateContext; +import com.festago.presentation.auth.AuthenticateContext; import java.lang.reflect.Method; import org.springframework.context.ApplicationContext; import org.springframework.test.context.TestContext; diff --git a/backend/src/test/java/com/festago/support/StageFixture.java b/backend/src/test/java/com/festago/support/StageFixture.java index 8435c5180..5c13eda00 100644 --- a/backend/src/test/java/com/festago/support/StageFixture.java +++ b/backend/src/test/java/com/festago/support/StageFixture.java @@ -1,7 +1,7 @@ package com.festago.support; -import com.festago.domain.Festival; -import com.festago.domain.Stage; +import com.festago.festival.domain.Festival; +import com.festago.stage.domain.Stage; import java.time.LocalDateTime; public class StageFixture { diff --git a/backend/src/test/java/com/festago/support/TestAuthConfig.java b/backend/src/test/java/com/festago/support/TestAuthConfig.java index f716d7a9c..c0a384dee 100644 --- a/backend/src/test/java/com/festago/support/TestAuthConfig.java +++ b/backend/src/test/java/com/festago/support/TestAuthConfig.java @@ -1,7 +1,7 @@ package com.festago.support; -import com.festago.auth.domain.AuthExtractor; -import com.festago.auth.presentation.AuthenticateContext; +import com.festago.auth.application.AuthExtractor; +import com.festago.presentation.auth.AuthenticateContext; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; diff --git a/backend/src/test/java/com/festago/support/TicketFixture.java b/backend/src/test/java/com/festago/support/TicketFixture.java index be548f099..d84b18f25 100644 --- a/backend/src/test/java/com/festago/support/TicketFixture.java +++ b/backend/src/test/java/com/festago/support/TicketFixture.java @@ -1,8 +1,8 @@ package com.festago.support; -import com.festago.domain.Stage; -import com.festago.domain.Ticket; -import com.festago.domain.TicketType; +import com.festago.stage.domain.Stage; +import com.festago.ticket.domain.Ticket; +import com.festago.ticket.domain.TicketType; public class TicketFixture {