diff --git a/backend/src/main/java/com/festago/zadmin/application/AdminService.java b/backend/src/main/java/com/festago/admin/application/AdminService.java similarity index 90% rename from backend/src/main/java/com/festago/zadmin/application/AdminService.java rename to backend/src/main/java/com/festago/admin/application/AdminService.java index 0d56b0a93..6ee9d2de8 100644 --- a/backend/src/main/java/com/festago/zadmin/application/AdminService.java +++ b/backend/src/main/java/com/festago/admin/application/AdminService.java @@ -1,17 +1,17 @@ -package com.festago.zadmin.application; +package com.festago.admin.application; -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 com.festago.zfestival.domain.Festival; -import com.festago.zfestival.repository.FestivalRepository; import java.time.LocalDateTime; import java.util.List; import java.util.Map; diff --git a/backend/src/main/java/com/festago/zadmin/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/zadmin/domain/Admin.java rename to backend/src/main/java/com/festago/admin/domain/Admin.java index eb718763d..40e5ca0a4 100644 --- a/backend/src/main/java/com/festago/zadmin/domain/Admin.java +++ b/backend/src/main/java/com/festago/admin/domain/Admin.java @@ -1,6 +1,6 @@ -package com.festago.zadmin.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 90% rename from backend/src/main/java/com/festago/dto/AdminTicketResponse.java rename to backend/src/main/java/com/festago/admin/dto/AdminTicketResponse.java index ef62c9276..88c93754d 100644 --- a/backend/src/main/java/com/festago/dto/AdminTicketResponse.java +++ b/backend/src/main/java/com/festago/admin/dto/AdminTicketResponse.java @@ -1,4 +1,4 @@ -package com.festago.dto; +package com.festago.admin.dto; import com.festago.ticket.domain.TicketType; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/festago/zadmin/repository/AdminRepository.java b/backend/src/main/java/com/festago/admin/repository/AdminRepository.java similarity index 77% rename from backend/src/main/java/com/festago/zadmin/repository/AdminRepository.java rename to backend/src/main/java/com/festago/admin/repository/AdminRepository.java index b0490523d..6bb333397 100644 --- a/backend/src/main/java/com/festago/zadmin/repository/AdminRepository.java +++ b/backend/src/main/java/com/festago/admin/repository/AdminRepository.java @@ -1,6 +1,6 @@ -package com.festago.zadmin.repository; +package com.festago.admin.repository; -import com.festago.zadmin.domain.Admin; +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 4f091963c..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.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.zadmin.domain.Admin; -import com.festago.zadmin.repository.AdminRepository; +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 6753069a6..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.exception.ErrorCode; -import com.festago.exception.NotFoundException; -import com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; +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 a8e21d8b0..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.zmember.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 f0d3d2763..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.zmember.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/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/zentry/application/EntryCodeManager.java b/backend/src/main/java/com/festago/entry/application/EntryCodeManager.java similarity index 88% rename from backend/src/main/java/com/festago/zentry/application/EntryCodeManager.java rename to backend/src/main/java/com/festago/entry/application/EntryCodeManager.java index 10ff634f0..ac6e0d509 100644 --- a/backend/src/main/java/com/festago/zentry/application/EntryCodeManager.java +++ b/backend/src/main/java/com/festago/entry/application/EntryCodeManager.java @@ -1,7 +1,7 @@ -package com.festago.zentry.application; +package com.festago.entry.application; -import com.festago.zentry.domain.EntryCode; -import com.festago.zentry.domain.EntryCodePayload; +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/zentry/application/EntryCodeProvider.java b/backend/src/main/java/com/festago/entry/application/EntryCodeProvider.java similarity index 59% rename from backend/src/main/java/com/festago/zentry/application/EntryCodeProvider.java rename to backend/src/main/java/com/festago/entry/application/EntryCodeProvider.java index 9152b8eb9..1f024f9ec 100644 --- a/backend/src/main/java/com/festago/zentry/application/EntryCodeProvider.java +++ b/backend/src/main/java/com/festago/entry/application/EntryCodeProvider.java @@ -1,6 +1,6 @@ -package com.festago.zentry.application; +package com.festago.entry.application; -import com.festago.zentry.domain.EntryCodePayload; +import com.festago.entry.domain.EntryCodePayload; import java.util.Date; public interface EntryCodeProvider { diff --git a/backend/src/main/java/com/festago/zentry/application/EntryService.java b/backend/src/main/java/com/festago/entry/application/EntryService.java similarity index 81% rename from backend/src/main/java/com/festago/zentry/application/EntryService.java rename to backend/src/main/java/com/festago/entry/application/EntryService.java index 22ad44e83..1e2f23ec3 100644 --- a/backend/src/main/java/com/festago/zentry/application/EntryService.java +++ b/backend/src/main/java/com/festago/entry/application/EntryService.java @@ -1,15 +1,15 @@ -package com.festago.zentry.application; +package com.festago.entry.application; -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 com.festago.zentry.domain.EntryCode; -import com.festago.zentry.domain.EntryCodePayload; -import com.festago.zentry.dto.EntryCodeResponse; -import com.festago.zentry.dto.TicketValidationRequest; -import com.festago.zentry.dto.TicketValidationResponse; 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 36f0a95da..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.zentry.application.EntryCodeExtractor; -import com.festago.zentry.application.EntryCodeProvider; -import com.festago.zentry.infrastructure.JwtEntryCodeExtractor; -import com.festago.zentry.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/zentry/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/zentry/domain/EntryCode.java rename to backend/src/main/java/com/festago/entry/domain/EntryCode.java index 3bc10c7b8..c75fde867 100644 --- a/backend/src/main/java/com/festago/zentry/domain/EntryCode.java +++ b/backend/src/main/java/com/festago/entry/domain/EntryCode.java @@ -1,7 +1,7 @@ -package com.festago.zentry.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/zentry/domain/EntryCodePayload.java b/backend/src/main/java/com/festago/entry/domain/EntryCodePayload.java similarity index 87% rename from backend/src/main/java/com/festago/zentry/domain/EntryCodePayload.java rename to backend/src/main/java/com/festago/entry/domain/EntryCodePayload.java index 4b64d6645..38ff7c411 100644 --- a/backend/src/main/java/com/festago/zentry/domain/EntryCodePayload.java +++ b/backend/src/main/java/com/festago/entry/domain/EntryCodePayload.java @@ -1,7 +1,7 @@ -package com.festago.zentry.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; diff --git a/backend/src/main/java/com/festago/zentry/dto/EntryCodeResponse.java b/backend/src/main/java/com/festago/entry/dto/EntryCodeResponse.java similarity index 76% rename from backend/src/main/java/com/festago/zentry/dto/EntryCodeResponse.java rename to backend/src/main/java/com/festago/entry/dto/EntryCodeResponse.java index 0b014a184..c161502e9 100644 --- a/backend/src/main/java/com/festago/zentry/dto/EntryCodeResponse.java +++ b/backend/src/main/java/com/festago/entry/dto/EntryCodeResponse.java @@ -1,6 +1,6 @@ -package com.festago.zentry.dto; +package com.festago.entry.dto; -import com.festago.zentry.domain.EntryCode; +import com.festago.entry.domain.EntryCode; public record EntryCodeResponse( String code, diff --git a/backend/src/main/java/com/festago/zentry/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/zentry/dto/TicketValidationRequest.java rename to backend/src/main/java/com/festago/entry/dto/TicketValidationRequest.java index 7a0e4e072..e8aeba744 100644 --- a/backend/src/main/java/com/festago/zentry/dto/TicketValidationRequest.java +++ b/backend/src/main/java/com/festago/entry/dto/TicketValidationRequest.java @@ -1,4 +1,4 @@ -package com.festago.zentry.dto; +package com.festago.entry.dto; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/com/festago/zentry/dto/TicketValidationResponse.java b/backend/src/main/java/com/festago/entry/dto/TicketValidationResponse.java similarity index 91% rename from backend/src/main/java/com/festago/zentry/dto/TicketValidationResponse.java rename to backend/src/main/java/com/festago/entry/dto/TicketValidationResponse.java index 845f8b5a1..3c5f01175 100644 --- a/backend/src/main/java/com/festago/zentry/dto/TicketValidationResponse.java +++ b/backend/src/main/java/com/festago/entry/dto/TicketValidationResponse.java @@ -1,4 +1,4 @@ -package com.festago.zentry.dto; +package com.festago.entry.dto; import com.festago.ticketing.domain.EntryState; import com.festago.ticketing.domain.MemberTicket; diff --git a/backend/src/main/java/com/festago/zentry/infrastructure/JwtEntryCodeExtractor.java b/backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeExtractor.java similarity index 86% rename from backend/src/main/java/com/festago/zentry/infrastructure/JwtEntryCodeExtractor.java rename to backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeExtractor.java index af3a1f08a..dbc0bf63c 100644 --- a/backend/src/main/java/com/festago/zentry/infrastructure/JwtEntryCodeExtractor.java +++ b/backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeExtractor.java @@ -1,10 +1,10 @@ -package com.festago.zentry.infrastructure; +package com.festago.entry.infrastructure; -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 com.festago.zentry.application.EntryCodeExtractor; -import com.festago.zentry.domain.EntryCodePayload; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.JwtException; diff --git a/backend/src/main/java/com/festago/zentry/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/zentry/infrastructure/JwtEntryCodeProvider.java rename to backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeProvider.java index 90686bc7f..852915e6c 100644 --- a/backend/src/main/java/com/festago/zentry/infrastructure/JwtEntryCodeProvider.java +++ b/backend/src/main/java/com/festago/entry/infrastructure/JwtEntryCodeProvider.java @@ -1,9 +1,9 @@ -package com.festago.zentry.infrastructure; +package com.festago.entry.infrastructure; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; -import com.festago.zentry.application.EntryCodeProvider; -import com.festago.zentry.domain.EntryCodePayload; +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/zfestival/application/FestivalService.java b/backend/src/main/java/com/festago/festival/application/FestivalService.java similarity index 77% rename from backend/src/main/java/com/festago/zfestival/application/FestivalService.java rename to backend/src/main/java/com/festago/festival/application/FestivalService.java index 30492b0b7..75e6fdbc5 100644 --- a/backend/src/main/java/com/festago/zfestival/application/FestivalService.java +++ b/backend/src/main/java/com/festago/festival/application/FestivalService.java @@ -1,18 +1,18 @@ -package com.festago.zfestival.application; +package com.festago.festival.application; import static java.util.Comparator.comparing; -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 com.festago.zfestival.domain.Festival; -import com.festago.zfestival.dto.FestivalCreateRequest; -import com.festago.zfestival.dto.FestivalDetailResponse; -import com.festago.zfestival.dto.FestivalResponse; -import com.festago.zfestival.dto.FestivalsResponse; -import com.festago.zfestival.repository.FestivalRepository; import java.time.LocalDate; import java.util.List; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/festago/zfestival/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/zfestival/domain/Festival.java rename to backend/src/main/java/com/festago/festival/domain/Festival.java index a66da3699..df2d3c30d 100644 --- a/backend/src/main/java/com/festago/zfestival/domain/Festival.java +++ b/backend/src/main/java/com/festago/festival/domain/Festival.java @@ -1,8 +1,8 @@ -package com.festago.zfestival.domain; +package com.festago.festival.domain; -import com.festago.domain.BaseTimeEntity; -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/zfestival/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/zfestival/dto/FestivalCreateRequest.java rename to backend/src/main/java/com/festago/festival/dto/FestivalCreateRequest.java index fae7d0496..fd908a0f1 100644 --- a/backend/src/main/java/com/festago/zfestival/dto/FestivalCreateRequest.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalCreateRequest.java @@ -1,6 +1,6 @@ -package com.festago.zfestival.dto; +package com.festago.festival.dto; -import com.festago.zfestival.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/zfestival/dto/FestivalDetailResponse.java b/backend/src/main/java/com/festago/festival/dto/FestivalDetailResponse.java similarity index 90% rename from backend/src/main/java/com/festago/zfestival/dto/FestivalDetailResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalDetailResponse.java index f6271fc35..5ff6d92ea 100644 --- a/backend/src/main/java/com/festago/zfestival/dto/FestivalDetailResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalDetailResponse.java @@ -1,7 +1,7 @@ -package com.festago.zfestival.dto; +package com.festago.festival.dto; +import com.festago.festival.domain.Festival; import com.festago.stage.domain.Stage; -import com.festago.zfestival.domain.Festival; import java.time.LocalDate; import java.util.List; diff --git a/backend/src/main/java/com/festago/zfestival/dto/FestivalDetailStageResponse.java b/backend/src/main/java/com/festago/festival/dto/FestivalDetailStageResponse.java similarity index 95% rename from backend/src/main/java/com/festago/zfestival/dto/FestivalDetailStageResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalDetailStageResponse.java index 0d2c1a234..e9704cec8 100644 --- a/backend/src/main/java/com/festago/zfestival/dto/FestivalDetailStageResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalDetailStageResponse.java @@ -1,4 +1,4 @@ -package com.festago.zfestival.dto; +package com.festago.festival.dto; import com.festago.stage.domain.Stage; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/festago/zfestival/dto/FestivalDetailTicketResponse.java b/backend/src/main/java/com/festago/festival/dto/FestivalDetailTicketResponse.java similarity index 94% rename from backend/src/main/java/com/festago/zfestival/dto/FestivalDetailTicketResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalDetailTicketResponse.java index f57bb731a..971042219 100644 --- a/backend/src/main/java/com/festago/zfestival/dto/FestivalDetailTicketResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalDetailTicketResponse.java @@ -1,4 +1,4 @@ -package com.festago.zfestival.dto; +package com.festago.festival.dto; import com.festago.ticket.domain.Ticket; import com.festago.ticket.domain.TicketAmount; diff --git a/backend/src/main/java/com/festago/zfestival/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/zfestival/dto/FestivalResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalResponse.java index 06ccf3657..d59f9ae93 100644 --- a/backend/src/main/java/com/festago/zfestival/dto/FestivalResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalResponse.java @@ -1,6 +1,6 @@ -package com.festago.zfestival.dto; +package com.festago.festival.dto; -import com.festago.zfestival.domain.Festival; +import com.festago.festival.domain.Festival; import java.time.LocalDate; public record FestivalResponse( diff --git a/backend/src/main/java/com/festago/zfestival/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/zfestival/dto/FestivalsResponse.java rename to backend/src/main/java/com/festago/festival/dto/FestivalsResponse.java index 1775be03b..44b04c1b1 100644 --- a/backend/src/main/java/com/festago/zfestival/dto/FestivalsResponse.java +++ b/backend/src/main/java/com/festago/festival/dto/FestivalsResponse.java @@ -1,9 +1,9 @@ -package com.festago.zfestival.dto; +package com.festago.festival.dto; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; -import com.festago.zfestival.domain.Festival; +import com.festago.festival.domain.Festival; import java.util.List; public record FestivalsResponse( diff --git a/backend/src/main/java/com/festago/zfestival/repository/FestivalRepository.java b/backend/src/main/java/com/festago/festival/repository/FestivalRepository.java similarity index 61% rename from backend/src/main/java/com/festago/zfestival/repository/FestivalRepository.java rename to backend/src/main/java/com/festago/festival/repository/FestivalRepository.java index fdb5a5ef6..10b3c02c6 100644 --- a/backend/src/main/java/com/festago/zfestival/repository/FestivalRepository.java +++ b/backend/src/main/java/com/festago/festival/repository/FestivalRepository.java @@ -1,6 +1,6 @@ -package com.festago.zfestival.repository; +package com.festago.festival.repository; -import com.festago.zfestival.domain.Festival; +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/zmember/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/zmember/application/MemberService.java rename to backend/src/main/java/com/festago/member/application/MemberService.java index 2263a9c56..e9528e803 100644 --- a/backend/src/main/java/com/festago/zmember/application/MemberService.java +++ b/backend/src/main/java/com/festago/member/application/MemberService.java @@ -1,10 +1,10 @@ -package com.festago.zmember.application; +package com.festago.member.application; -import com.festago.exception.ErrorCode; -import com.festago.exception.NotFoundException; -import com.festago.zmember.domain.Member; -import com.festago.zmember.dto.MemberProfileResponse; -import com.festago.zmember.repository.MemberRepository; +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/zmember/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/zmember/domain/Member.java rename to backend/src/main/java/com/festago/member/domain/Member.java index 34eb3c51c..a990a0392 100644 --- a/backend/src/main/java/com/festago/zmember/domain/Member.java +++ b/backend/src/main/java/com/festago/member/domain/Member.java @@ -1,7 +1,7 @@ -package com.festago.zmember.domain; +package com.festago.member.domain; import com.festago.auth.domain.SocialType; -import com.festago.domain.BaseTimeEntity; +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/zmember/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/zmember/dto/MemberProfileResponse.java rename to backend/src/main/java/com/festago/member/dto/MemberProfileResponse.java index ef1224195..70e30baf7 100644 --- a/backend/src/main/java/com/festago/zmember/dto/MemberProfileResponse.java +++ b/backend/src/main/java/com/festago/member/dto/MemberProfileResponse.java @@ -1,6 +1,6 @@ -package com.festago.zmember.dto; +package com.festago.member.dto; -import com.festago.zmember.domain.Member; +import com.festago.member.domain.Member; public record MemberProfileResponse( Long memberId, diff --git a/backend/src/main/java/com/festago/zmember/repository/MemberRepository.java b/backend/src/main/java/com/festago/member/repository/MemberRepository.java similarity index 78% rename from backend/src/main/java/com/festago/zmember/repository/MemberRepository.java rename to backend/src/main/java/com/festago/member/repository/MemberRepository.java index b11892077..e9536e0af 100644 --- a/backend/src/main/java/com/festago/zmember/repository/MemberRepository.java +++ b/backend/src/main/java/com/festago/member/repository/MemberRepository.java @@ -1,7 +1,7 @@ -package com.festago.zmember.repository; +package com.festago.member.repository; import com.festago.auth.domain.SocialType; -import com.festago.zmember.domain.Member; +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 162684668..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.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.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 com.festago.zadmin.application.AdminService; -import com.festago.zfestival.application.FestivalService; -import com.festago.zfestival.dto.FestivalCreateRequest; -import com.festago.zfestival.dto.FestivalResponse; 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 db4786799..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.zfestival.application.FestivalService; -import com.festago.zfestival.dto.FestivalDetailResponse; -import com.festago.zfestival.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 594ef5595..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.auth.annotation.Member; -import com.festago.zmember.application.MemberService; -import com.festago.zmember.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 71eb65d91..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.auth.annotation.Member; +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 com.festago.zentry.application.EntryService; -import com.festago.zentry.dto.EntryCodeResponse; 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 1987df5c4..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.zentry.application.EntryService; -import com.festago.zentry.dto.TicketValidationRequest; -import com.festago.zentry.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/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/stage/application/StageService.java b/backend/src/main/java/com/festago/stage/application/StageService.java index ee20cb138..5198becab 100644 --- a/backend/src/main/java/com/festago/stage/application/StageService.java +++ b/backend/src/main/java/com/festago/stage/application/StageService.java @@ -1,13 +1,13 @@ package com.festago.stage.application; -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 com.festago.zfestival.domain.Festival; -import com.festago.zfestival.repository.FestivalRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/festago/stage/domain/Stage.java b/backend/src/main/java/com/festago/stage/domain/Stage.java index 7e47275f9..9faaf2b5e 100644 --- a/backend/src/main/java/com/festago/stage/domain/Stage.java +++ b/backend/src/main/java/com/festago/stage/domain/Stage.java @@ -1,10 +1,10 @@ package com.festago.stage.domain; -import com.festago.domain.BaseTimeEntity; -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 com.festago.zfestival.domain.Festival; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; diff --git a/backend/src/main/java/com/festago/student/application/StudentService.java b/backend/src/main/java/com/festago/student/application/StudentService.java index cf0e55a7d..0ae184eb3 100644 --- a/backend/src/main/java/com/festago/student/application/StudentService.java +++ b/backend/src/main/java/com/festago/student/application/StudentService.java @@ -1,10 +1,12 @@ package com.festago.student.application; -import com.festago.domain.School; -import com.festago.domain.SchoolRepository; -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; @@ -13,8 +15,6 @@ import com.festago.student.dto.StudentVerificateRequest; import com.festago.student.repository.StudentCodeRepository; import com.festago.student.repository.StudentRepository; -import com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/festago/student/domain/Student.java b/backend/src/main/java/com/festago/student/domain/Student.java index a17b1c9da..2b7b46214 100644 --- a/backend/src/main/java/com/festago/student/domain/Student.java +++ b/backend/src/main/java/com/festago/student/domain/Student.java @@ -1,10 +1,10 @@ package com.festago.student.domain; -import com.festago.domain.BaseTimeEntity; -import com.festago.domain.School; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; -import com.festago.zmember.domain.Member; +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/student/domain/StudentCode.java b/backend/src/main/java/com/festago/student/domain/StudentCode.java index 3f4786f95..947e58a61 100644 --- a/backend/src/main/java/com/festago/student/domain/StudentCode.java +++ b/backend/src/main/java/com/festago/student/domain/StudentCode.java @@ -1,10 +1,10 @@ package com.festago.student.domain; -import com.festago.domain.BaseTimeEntity; -import com.festago.domain.School; -import com.festago.exception.ErrorCode; -import com.festago.exception.InternalServerException; -import com.festago.zmember.domain.Member; +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/student/domain/VerificationCode.java b/backend/src/main/java/com/festago/student/domain/VerificationCode.java index 4bc1a3841..2236a9b24 100644 --- a/backend/src/main/java/com/festago/student/domain/VerificationCode.java +++ b/backend/src/main/java/com/festago/student/domain/VerificationCode.java @@ -1,7 +1,7 @@ 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; diff --git a/backend/src/main/java/com/festago/student/domain/VerificationMailPayload.java b/backend/src/main/java/com/festago/student/domain/VerificationMailPayload.java index ab2e069c6..e6e159d06 100644 --- a/backend/src/main/java/com/festago/student/domain/VerificationMailPayload.java +++ b/backend/src/main/java/com/festago/student/domain/VerificationMailPayload.java @@ -1,7 +1,7 @@ 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/student/repository/StudentCodeRepository.java b/backend/src/main/java/com/festago/student/repository/StudentCodeRepository.java index 27b89c15c..6afe6cbd2 100644 --- a/backend/src/main/java/com/festago/student/repository/StudentCodeRepository.java +++ b/backend/src/main/java/com/festago/student/repository/StudentCodeRepository.java @@ -1,8 +1,8 @@ package com.festago.student.repository; +import com.festago.member.domain.Member; import com.festago.student.domain.StudentCode; import com.festago.student.domain.VerificationCode; -import com.festago.zmember.domain.Member; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/com/festago/ticket/application/TicketService.java b/backend/src/main/java/com/festago/ticket/application/TicketService.java index 756fcf8a3..79a8ef17b 100644 --- a/backend/src/main/java/com/festago/ticket/application/TicketService.java +++ b/backend/src/main/java/com/festago/ticket/application/TicketService.java @@ -1,7 +1,7 @@ package com.festago.ticket.application; -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.stage.domain.Stage; import com.festago.stage.repository.StageRepository; import com.festago.ticket.domain.Ticket; diff --git a/backend/src/main/java/com/festago/ticket/domain/Ticket.java b/backend/src/main/java/com/festago/ticket/domain/Ticket.java index e029bc065..5ed3c789d 100644 --- a/backend/src/main/java/com/festago/ticket/domain/Ticket.java +++ b/backend/src/main/java/com/festago/ticket/domain/Ticket.java @@ -1,11 +1,11 @@ package com.festago.ticket.domain; -import com.festago.domain.BaseTimeEntity; -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.member.domain.Member; import com.festago.stage.domain.Stage; import com.festago.ticketing.domain.MemberTicket; -import com.festago.zmember.domain.Member; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/backend/src/main/java/com/festago/ticket/domain/TicketAmount.java b/backend/src/main/java/com/festago/ticket/domain/TicketAmount.java index 1b1bd6a77..8b2a0fa99 100644 --- a/backend/src/main/java/com/festago/ticket/domain/TicketAmount.java +++ b/backend/src/main/java/com/festago/ticket/domain/TicketAmount.java @@ -1,8 +1,8 @@ package com.festago.ticket.domain; -import com.festago.domain.BaseTimeEntity; -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; diff --git a/backend/src/main/java/com/festago/ticket/domain/TicketEntryTime.java b/backend/src/main/java/com/festago/ticket/domain/TicketEntryTime.java index 4aafa1742..3a0500f6d 100644 --- a/backend/src/main/java/com/festago/ticket/domain/TicketEntryTime.java +++ b/backend/src/main/java/com/festago/ticket/domain/TicketEntryTime.java @@ -1,8 +1,8 @@ package com.festago.ticket.domain; -import com.festago.domain.BaseTimeEntity; -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/ticketing/application/MemberTicketService.java b/backend/src/main/java/com/festago/ticketing/application/MemberTicketService.java index 91514789d..ef4b2d0d4 100644 --- a/backend/src/main/java/com/festago/ticketing/application/MemberTicketService.java +++ b/backend/src/main/java/com/festago/ticketing/application/MemberTicketService.java @@ -4,14 +4,14 @@ import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; -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 com.festago.zmember.repository.MemberRepository; import java.time.Clock; import java.time.Duration; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/festago/ticketing/application/TicketingService.java b/backend/src/main/java/com/festago/ticketing/application/TicketingService.java index 5a72a7466..81893faf8 100644 --- a/backend/src/main/java/com/festago/ticketing/application/TicketingService.java +++ b/backend/src/main/java/com/festago/ticketing/application/TicketingService.java @@ -1,8 +1,10 @@ package com.festago.ticketing.application; -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; @@ -11,8 +13,6 @@ import com.festago.ticketing.dto.TicketingRequest; import com.festago.ticketing.dto.TicketingResponse; import com.festago.ticketing.repository.MemberTicketRepository; -import com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; import java.time.Clock; import java.time.LocalDateTime; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/festago/ticketing/domain/EntryState.java b/backend/src/main/java/com/festago/ticketing/domain/EntryState.java index 8030cd06c..76c68a288 100644 --- a/backend/src/main/java/com/festago/ticketing/domain/EntryState.java +++ b/backend/src/main/java/com/festago/ticketing/domain/EntryState.java @@ -1,7 +1,7 @@ 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/ticketing/domain/MemberTicket.java b/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java index 4ea15c06c..cf7a5bc5e 100644 --- a/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java +++ b/backend/src/main/java/com/festago/ticketing/domain/MemberTicket.java @@ -1,9 +1,9 @@ package com.festago.ticketing.domain; -import com.festago.domain.BaseTimeEntity; +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 com.festago.zmember.domain.Member; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/backend/src/main/java/com/festago/ticketing/dto/MemberTicketFestivalResponse.java b/backend/src/main/java/com/festago/ticketing/dto/MemberTicketFestivalResponse.java index aa70a7133..0b3779cf0 100644 --- a/backend/src/main/java/com/festago/ticketing/dto/MemberTicketFestivalResponse.java +++ b/backend/src/main/java/com/festago/ticketing/dto/MemberTicketFestivalResponse.java @@ -1,6 +1,6 @@ package com.festago.ticketing.dto; -import com.festago.zfestival.domain.Festival; +import com.festago.festival.domain.Festival; public record MemberTicketFestivalResponse( Long id, diff --git a/backend/src/main/java/com/festago/ticketing/repository/MemberTicketRepository.java b/backend/src/main/java/com/festago/ticketing/repository/MemberTicketRepository.java index 218cf169c..4608b6208 100644 --- a/backend/src/main/java/com/festago/ticketing/repository/MemberTicketRepository.java +++ b/backend/src/main/java/com/festago/ticketing/repository/MemberTicketRepository.java @@ -1,8 +1,8 @@ package com.festago.ticketing.repository; +import com.festago.member.domain.Member; import com.festago.stage.domain.Stage; import com.festago.ticketing.domain.MemberTicket; -import com.festago.zmember.domain.Member; import java.util.List; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/com/festago/zentry/application/EntryCodeExtractor.java b/backend/src/main/java/com/festago/zentry/application/EntryCodeExtractor.java deleted file mode 100644 index 815853fc8..000000000 --- a/backend/src/main/java/com/festago/zentry/application/EntryCodeExtractor.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.festago.zentry.application; - -import com.festago.zentry.domain.EntryCodePayload; - -public interface EntryCodeExtractor { - - EntryCodePayload extract(String code); -} diff --git a/backend/src/test/java/com/festago/application/EntryServiceTest.java b/backend/src/test/java/com/festago/application/EntryServiceTest.java index f175ed023..962c1a3af 100644 --- a/backend/src/test/java/com/festago/application/EntryServiceTest.java +++ b/backend/src/test/java/com/festago/application/EntryServiceTest.java @@ -7,8 +7,17 @@ import static org.mockito.BDDMockito.anyLong; import static org.mockito.BDDMockito.given; -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; @@ -18,15 +27,6 @@ import com.festago.ticketing.domain.EntryState; import com.festago.ticketing.domain.MemberTicket; import com.festago.ticketing.repository.MemberTicketRepository; -import com.festago.zentry.application.EntryCodeManager; -import com.festago.zentry.application.EntryService; -import com.festago.zentry.domain.EntryCode; -import com.festago.zentry.domain.EntryCodePayload; -import com.festago.zentry.dto.EntryCodeResponse; -import com.festago.zentry.dto.TicketValidationRequest; -import com.festago.zentry.dto.TicketValidationResponse; -import com.festago.zfestival.domain.Festival; -import com.festago.zmember.domain.Member; 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 b345f6438..edd5cab95 100644 --- a/backend/src/test/java/com/festago/application/FestivalServiceTest.java +++ b/backend/src/test/java/com/festago/application/FestivalServiceTest.java @@ -5,20 +5,20 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; -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 com.festago.zfestival.application.FestivalService; -import com.festago.zfestival.domain.Festival; -import com.festago.zfestival.dto.FestivalCreateRequest; -import com.festago.zfestival.dto.FestivalDetailResponse; -import com.festago.zfestival.dto.FestivalDetailStageResponse; -import com.festago.zfestival.dto.FestivalResponse; -import com.festago.zfestival.dto.FestivalsResponse; -import com.festago.zfestival.repository.FestivalRepository; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/test/java/com/festago/application/MemberTicketServiceTest.java b/backend/src/test/java/com/festago/application/MemberTicketServiceTest.java index af7dd5100..4fa00125e 100644 --- a/backend/src/test/java/com/festago/application/MemberTicketServiceTest.java +++ b/backend/src/test/java/com/festago/application/MemberTicketServiceTest.java @@ -7,8 +7,10 @@ import static org.mockito.BDDMockito.anyLong; import static org.mockito.BDDMockito.given; -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; @@ -18,8 +20,6 @@ import com.festago.ticketing.dto.MemberTicketResponse; import com.festago.ticketing.dto.MemberTicketsResponse; import com.festago.ticketing.repository.MemberTicketRepository; -import com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; 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 304db3b5d..a2261cd22 100644 --- a/backend/src/test/java/com/festago/application/StageServiceTest.java +++ b/backend/src/test/java/com/festago/application/StageServiceTest.java @@ -5,14 +5,14 @@ import static org.mockito.BDDMockito.anyLong; import static org.mockito.BDDMockito.given; +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 com.festago.zfestival.domain.Festival; -import com.festago.zfestival.repository.FestivalRepository; import java.time.LocalDateTime; import java.util.Optional; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/application/StudentServiceTest.java b/backend/src/test/java/com/festago/application/StudentServiceTest.java index b3671f8be..41e94d388 100644 --- a/backend/src/test/java/com/festago/application/StudentServiceTest.java +++ b/backend/src/test/java/com/festago/application/StudentServiceTest.java @@ -6,10 +6,12 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.BDDMockito.given; -import com.festago.domain.School; -import com.festago.domain.SchoolRepository; -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; @@ -20,8 +22,6 @@ import com.festago.student.repository.StudentCodeRepository; import com.festago.student.repository.StudentRepository; import com.festago.support.MemberFixture; -import com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; 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/application/integration/FestivalServiceIntegrationTest.java b/backend/src/test/java/com/festago/application/integration/FestivalServiceIntegrationTest.java index 6dd8b6501..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,6 +2,14 @@ import static org.assertj.core.api.Assertions.assertThat; +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; @@ -10,14 +18,6 @@ import com.festago.ticket.domain.Ticket; import com.festago.ticket.domain.TicketType; import com.festago.ticket.repository.TicketRepository; -import com.festago.zfestival.application.FestivalService; -import com.festago.zfestival.domain.Festival; -import com.festago.zfestival.dto.FestivalCreateRequest; -import com.festago.zfestival.dto.FestivalDetailResponse; -import com.festago.zfestival.dto.FestivalDetailStageResponse; -import com.festago.zfestival.dto.FestivalDetailTicketResponse; -import com.festago.zfestival.dto.FestivalResponse; -import com.festago.zfestival.repository.FestivalRepository; 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 f8249eec1..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,6 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; +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; @@ -12,10 +16,6 @@ import com.festago.ticketing.application.MemberTicketService; import com.festago.ticketing.dto.MemberTicketsResponse; import com.festago.ticketing.repository.MemberTicketRepository; -import com.festago.zfestival.domain.Festival; -import com.festago.zfestival.repository.FestivalRepository; -import com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; 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 45b705cff..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.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 com.festago.zfestival.repository.FestivalRepository; 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 2bd597c04..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,7 +4,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.doReturn; -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; @@ -16,8 +18,6 @@ import com.festago.ticket.dto.TicketCreateResponse; import com.festago.ticket.repository.TicketAmountRepository; import com.festago.ticket.repository.TicketRepository; -import com.festago.zfestival.domain.Festival; -import com.festago.zfestival.repository.FestivalRepository; 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 f387288c7..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.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 com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; 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 6f0f88924..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.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.zadmin.domain.Admin; -import com.festago.zadmin.repository.AdminRepository; +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 a25e1f307..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,16 +6,14 @@ 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.member.domain.Member; import com.festago.support.MemberFixture; -import com.festago.zmember.domain.Member; 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/auth/application/AuthServiceTest.java b/backend/src/test/java/com/festago/auth/application/AuthServiceTest.java index e53416e8e..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,10 +10,10 @@ import com.festago.auth.domain.SocialType; import com.festago.auth.domain.UserInfo; import com.festago.auth.dto.LoginMemberDto; -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 com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; 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/integration/AuthFacadeServiceIntegrationTest.java b/backend/src/test/java/com/festago/auth/application/integration/AuthFacadeServiceIntegrationTest.java index cdb3fe8a9..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,9 +7,9 @@ import com.festago.auth.application.AuthFacadeService; import com.festago.auth.domain.SocialType; import com.festago.auth.dto.LoginRequest; +import com.festago.member.domain.Member; +import com.festago.member.repository.MemberRepository; import com.festago.support.MemberFixture; -import com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; import jakarta.persistence.EntityManager; import java.util.List; import org.junit.jupiter.api.DisplayNameGeneration; 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 52079d046..f8444ca41 100644 --- a/backend/src/test/java/com/festago/domain/EntryCodeTest.java +++ b/backend/src/test/java/com/festago/domain/EntryCodeTest.java @@ -3,8 +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.zentry.domain.EntryCode; +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 8c809ef36..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,7 @@ 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; diff --git a/backend/src/test/java/com/festago/domain/FestivalTest.java b/backend/src/test/java/com/festago/domain/FestivalTest.java index 93fea41c9..98ecd9c57 100644 --- a/backend/src/test/java/com/festago/domain/FestivalTest.java +++ b/backend/src/test/java/com/festago/domain/FestivalTest.java @@ -3,9 +3,9 @@ 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 com.festago.zfestival.domain.Festival; import java.time.LocalDate; import java.time.LocalDateTime; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/com/festago/domain/MemberRepositoryTest.java b/backend/src/test/java/com/festago/domain/MemberRepositoryTest.java index 78d43be06..6e6e2e927 100644 --- a/backend/src/test/java/com/festago/domain/MemberRepositoryTest.java +++ b/backend/src/test/java/com/festago/domain/MemberRepositoryTest.java @@ -3,9 +3,9 @@ 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 com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; import jakarta.persistence.EntityManager; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/com/festago/domain/MemberTest.java b/backend/src/test/java/com/festago/domain/MemberTest.java index 3a8055441..e88b98641 100644 --- a/backend/src/test/java/com/festago/domain/MemberTest.java +++ b/backend/src/test/java/com/festago/domain/MemberTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.festago.member.domain.Member; import com.festago.support.MemberFixture; -import com.festago.zmember.domain.Member; 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/MemberTicketRepositoryTest.java b/backend/src/test/java/com/festago/domain/MemberTicketRepositoryTest.java index adfa71f02..0f08a1b2d 100644 --- a/backend/src/test/java/com/festago/domain/MemberTicketRepositoryTest.java +++ b/backend/src/test/java/com/festago/domain/MemberTicketRepositoryTest.java @@ -2,7 +2,12 @@ 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; @@ -12,10 +17,6 @@ import com.festago.ticket.repository.TicketRepository; import com.festago.ticketing.domain.MemberTicket; import com.festago.ticketing.repository.MemberTicketRepository; -import com.festago.zfestival.domain.Festival; -import com.festago.zfestival.repository.FestivalRepository; -import com.festago.zmember.domain.Member; -import com.festago.zmember.repository.MemberRepository; 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 1bee66a17..9189725ca 100644 --- a/backend/src/test/java/com/festago/domain/MemberTicketTest.java +++ b/backend/src/test/java/com/festago/domain/MemberTicketTest.java @@ -5,13 +5,13 @@ 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 com.festago.zfestival.domain.Festival; -import com.festago.zmember.domain.Member; 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/StageRepositoryTest.java b/backend/src/test/java/com/festago/domain/StageRepositoryTest.java index 49e9c5f7a..088d15562 100644 --- a/backend/src/test/java/com/festago/domain/StageRepositoryTest.java +++ b/backend/src/test/java/com/festago/domain/StageRepositoryTest.java @@ -3,6 +3,8 @@ 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; @@ -11,8 +13,6 @@ import com.festago.ticket.domain.Ticket; import com.festago.ticket.domain.TicketType; import com.festago.ticket.repository.TicketRepository; -import com.festago.zfestival.domain.Festival; -import com.festago.zfestival.repository.FestivalRepository; 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 b7b039b11..b1873ef1d 100644 --- a/backend/src/test/java/com/festago/domain/StageTest.java +++ b/backend/src/test/java/com/festago/domain/StageTest.java @@ -3,10 +3,10 @@ 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 com.festago.zfestival.domain.Festival; 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/TicketAmountTest.java b/backend/src/test/java/com/festago/domain/TicketAmountTest.java index 89927c945..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,7 @@ 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; diff --git a/backend/src/test/java/com/festago/domain/TicketEntryTimeTest.java b/backend/src/test/java/com/festago/domain/TicketEntryTimeTest.java index c47d6e3d8..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,7 @@ 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; diff --git a/backend/src/test/java/com/festago/domain/TicketRepositoryTest.java b/backend/src/test/java/com/festago/domain/TicketRepositoryTest.java index dec0ad1d4..bb92b7494 100644 --- a/backend/src/test/java/com/festago/domain/TicketRepositoryTest.java +++ b/backend/src/test/java/com/festago/domain/TicketRepositoryTest.java @@ -2,6 +2,8 @@ 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; @@ -10,8 +12,6 @@ import com.festago.ticket.domain.Ticket; import com.festago.ticket.domain.TicketType; import com.festago.ticket.repository.TicketRepository; -import com.festago.zfestival.domain.Festival; -import com.festago.zfestival.repository.FestivalRepository; 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 d83c807c0..e972aa9d4 100644 --- a/backend/src/test/java/com/festago/domain/TicketTest.java +++ b/backend/src/test/java/com/festago/domain/TicketTest.java @@ -4,7 +4,9 @@ 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; @@ -12,8 +14,6 @@ import com.festago.support.TicketFixture; import com.festago.ticket.domain.Ticket; import com.festago.ticketing.domain.MemberTicket; -import com.festago.zfestival.domain.Festival; -import com.festago.zmember.domain.Member; 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 e8deb8ce8..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,7 @@ 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; diff --git a/backend/src/test/java/com/festago/dto/FestivalCreateRequestTest.java b/backend/src/test/java/com/festago/dto/FestivalCreateRequestTest.java index 5e02bda5e..723a5ecb4 100644 --- a/backend/src/test/java/com/festago/dto/FestivalCreateRequestTest.java +++ b/backend/src/test/java/com/festago/dto/FestivalCreateRequestTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.festago.zfestival.domain.Festival; -import com.festago.zfestival.dto.FestivalCreateRequest; +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 1811ae89d..45fb0f6bf 100644 --- a/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeExtractorTest.java +++ b/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeExtractorTest.java @@ -3,10 +3,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import com.festago.exception.BadRequestException; -import com.festago.exception.InternalServerException; -import com.festago.zentry.domain.EntryCodePayload; -import com.festago.zentry.infrastructure.JwtEntryCodeExtractor; +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 821c324f2..6152092ae 100644 --- a/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeProviderTest.java +++ b/backend/src/test/java/com/festago/infrastructure/JwtEntryCodeProviderTest.java @@ -3,12 +3,12 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; -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 com.festago.zentry.application.EntryCodeProvider; -import com.festago.zentry.domain.EntryCodePayload; -import com.festago.zentry.infrastructure.JwtEntryCodeProvider; 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 de2adf990..a0fd0f50f 100644 --- a/backend/src/test/java/com/festago/presentation/AdminControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/AdminControllerTest.java @@ -10,13 +10,17 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; +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.dto.ErrorResponse; -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; @@ -26,10 +30,6 @@ import com.festago.ticket.domain.TicketType; import com.festago.ticket.dto.TicketCreateRequest; import com.festago.ticket.dto.TicketCreateResponse; -import com.festago.zadmin.application.AdminService; -import com.festago.zfestival.application.FestivalService; -import com.festago.zfestival.dto.FestivalCreateRequest; -import com.festago.zfestival.dto.FestivalResponse; 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 60ccfb3f3..4959c32c6 100644 --- a/backend/src/test/java/com/festago/presentation/FestivalControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/FestivalControllerTest.java @@ -8,11 +8,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; +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 com.festago.zfestival.application.FestivalService; -import com.festago.zfestival.dto.FestivalDetailResponse; -import com.festago.zfestival.dto.FestivalResponse; -import com.festago.zfestival.dto.FestivalsResponse; import java.nio.charset.StandardCharsets; import java.time.LocalDate; import java.util.Collections; diff --git a/backend/src/test/java/com/festago/presentation/MemberControllerTest.java b/backend/src/test/java/com/festago/presentation/MemberControllerTest.java index 449929424..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.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 com.festago.zmember.application.MemberService; -import com.festago.zmember.dto.MemberProfileResponse; 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 a1093f055..bcdd823f6 100644 --- a/backend/src/test/java/com/festago/presentation/MemberTicketControllerTest.java +++ b/backend/src/test/java/com/festago/presentation/MemberTicketControllerTest.java @@ -13,6 +13,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; +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; @@ -24,8 +26,6 @@ import com.festago.ticketing.dto.MemberTicketsResponse; import com.festago.ticketing.dto.TicketingRequest; import com.festago.ticketing.dto.TicketingResponse; -import com.festago.zentry.application.EntryService; -import com.festago.zentry.dto.EntryCodeResponse; 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 d4d52b754..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.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 com.festago.zentry.application.EntryService; -import com.festago.zentry.dto.TicketValidationRequest; -import com.festago.zentry.dto.TicketValidationResponse; 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/support/FestivalFixture.java b/backend/src/test/java/com/festago/support/FestivalFixture.java index beae11ac4..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.zfestival.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 299af6026..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.zmember.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 406e9ff5c..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.member.domain.Member; import com.festago.stage.domain.Stage; import com.festago.ticket.domain.TicketType; import com.festago.ticketing.domain.MemberTicket; -import com.festago.zmember.domain.Member; 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 3874a10dd..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.festival.domain.Festival; import com.festago.stage.domain.Stage; -import com.festago.zfestival.domain.Festival; 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;