diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/AuthApplication.java b/liberty-auth-service/src/main/java/com/liberty52/auth/AuthApplication.java index 6a9c2350..9fa57ef2 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/AuthApplication.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/AuthApplication.java @@ -16,53 +16,53 @@ @Slf4j public class AuthApplication { - public static void main(String[] args) { - SpringApplication app = new SpringApplication(AuthApplication.class); - Environment env = app.run(args).getEnvironment(); - logApplicationStartup(env); - } + public static void main(String[] args) { + SpringApplication app = new SpringApplication(AuthApplication.class); + Environment env = app.run(args).getEnvironment(); + logApplicationStartup(env); + } - private static void logApplicationStartup(Environment env) { - String protocol = Optional.ofNullable(env.getProperty("server.ssl.key-store")).map(key -> "https").orElse("http"); - String serverPort = env.getProperty("server.port"); - String contextPath = Optional - .ofNullable(env.getProperty("server.servlet.context-path")) - .filter(StringUtils::isNotBlank) - .orElse("/"); - String hostAddress = "localhost"; - try { - hostAddress = InetAddress.getLocalHost().getHostAddress(); - } catch (UnknownHostException e) { - log.warn("The host name could not be determined, using `localhost` as fallback"); - } - log.info( - CRLFLogConverter.CRLF_SAFE_MARKER, - "\n----------------------------------------------------------\n\t" + - "Application '{}' is running! Access URLs:\n\t" + - "Local: \t\t{}://localhost:{}{}\n\t" + - "External: \t{}://{}:{}{}\n\t" + - "Profile(s): \t{}\n----------------------------------------------------------", - env.getProperty("spring.application.name"), - protocol, - serverPort, - contextPath, - protocol, - hostAddress, - serverPort, - contextPath, - env.getActiveProfiles().length == 0 ? env.getDefaultProfiles() : env.getActiveProfiles() - ); + private static void logApplicationStartup(Environment env) { + String protocol = Optional.ofNullable(env.getProperty("server.ssl.key-store")).map(key -> "https").orElse("http"); + String serverPort = env.getProperty("server.port"); + String contextPath = Optional + .ofNullable(env.getProperty("server.servlet.context-path")) + .filter(StringUtils::isNotBlank) + .orElse("/"); + String hostAddress = "localhost"; + try { + hostAddress = InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + log.warn("The host name could not be determined, using `localhost` as fallback"); + } + log.info( + CRLFLogConverter.CRLF_SAFE_MARKER, + "\n----------------------------------------------------------\n\t" + + "Application '{}' is running! Access URLs:\n\t" + + "Local: \t\t{}://localhost:{}{}\n\t" + + "External: \t{}://{}:{}{}\n\t" + + "Profile(s): \t{}\n----------------------------------------------------------", + env.getProperty("spring.application.name"), + protocol, + serverPort, + contextPath, + protocol, + hostAddress, + serverPort, + contextPath, + env.getActiveProfiles().length == 0 ? env.getDefaultProfiles() : env.getActiveProfiles() + ); - String configServerStatus = env.getProperty("configserver.status"); - if (configServerStatus == null) { - configServerStatus = "Not found or not setup for this application"; - } - log.info( - CRLFLogConverter.CRLF_SAFE_MARKER, - "\n----------------------------------------------------------\n\t" + - "Config Server: \t{}\n----------------------------------------------------------", - configServerStatus - ); - } + String configServerStatus = env.getProperty("configserver.status"); + if (configServerStatus == null) { + configServerStatus = "Not found or not setup for this application"; + } + log.info( + CRLFLogConverter.CRLF_SAFE_MARKER, + "\n----------------------------------------------------------\n\t" + + "Config Server: \t{}\n----------------------------------------------------------", + configServerStatus + ); + } } diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/adapter/S3UploaderImpl.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/adapter/S3UploaderImpl.java index a8429f34..659e69bb 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/adapter/S3UploaderImpl.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/adapter/S3UploaderImpl.java @@ -113,4 +113,4 @@ private String getExtension(MultipartFile multipartFile) throws NullValueExcepti return multipartFile.getOriginalFilename().substring(extensionIndex); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/config/WebConfig.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/config/WebConfig.java index 93ae336d..2dbb9b43 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/config/WebConfig.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/config/WebConfig.java @@ -14,4 +14,3 @@ public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(new RequestLoggingInterceptor()); } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/AbstractApiException.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/AbstractApiException.java index 217a86e0..d6bec581 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/AbstractApiException.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/AbstractApiException.java @@ -24,4 +24,4 @@ public AbstractApiException(AuthErrorCode errorCode, String msg) { errorName = errorCode.getErrorName(); errorMessage = msg; } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/AuthErrorCode.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/AuthErrorCode.java index 7d448274..877b696c 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/AuthErrorCode.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/AuthErrorCode.java @@ -29,4 +29,4 @@ public enum AuthErrorCode implements ErrorCode{ public String getErrorName() { return this.name(); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/ErrorResponse.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/ErrorResponse.java index c9b4be2a..22a7f50f 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/ErrorResponse.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/exception/external/ErrorResponse.java @@ -36,4 +36,4 @@ public String toString() { ", path='" + path + '\'' + '}'; } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/intercepter/RequestLoggingInterceptor.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/intercepter/RequestLoggingInterceptor.java index 5d677e20..950a9e34 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/intercepter/RequestLoggingInterceptor.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/intercepter/RequestLoggingInterceptor.java @@ -21,4 +21,4 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { log.info("Response Status: {}", response.getStatus()); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/jwt/JwtAuthenticationProcessingFilter.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/jwt/JwtAuthenticationProcessingFilter.java index 9e1d52bf..25e1d866 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/jwt/JwtAuthenticationProcessingFilter.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/jwt/JwtAuthenticationProcessingFilter.java @@ -59,4 +59,3 @@ private String reIssueRefreshToken(Auth user) { return reIssuedRefreshToken; } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/jwt/JwtService.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/jwt/JwtService.java index 04b569fa..733c08f4 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/jwt/JwtService.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/jwt/JwtService.java @@ -155,4 +155,3 @@ public String createTokensAndAddHeaders(Auth auth, boolean isAutoLogin, HttpServ return refreshToken; } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/CustomOAuth2User.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/CustomOAuth2User.java index e218e79f..bb58f42e 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/CustomOAuth2User.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/CustomOAuth2User.java @@ -24,4 +24,3 @@ public CustomOAuth2User(Collection authorities, this.role = role; } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/CustomOAuth2UserService.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/CustomOAuth2UserService.java index 7c9ad465..9774dc42 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/CustomOAuth2UserService.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/CustomOAuth2UserService.java @@ -101,4 +101,3 @@ private Auth saveUser(OAuthAttributes attributes, SocialLoginType socialType) { return createdUser; } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/NaverOAuth2UserInfo.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/NaverOAuth2UserInfo.java index 5e106853..eb117d89 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/NaverOAuth2UserInfo.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/NaverOAuth2UserInfo.java @@ -55,4 +55,3 @@ public String getName() { return (String) response.get(NAVER_NAME_KEY); } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2LoginFailureHandler.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2LoginFailureHandler.java index 00d192ad..393e7bbc 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2LoginFailureHandler.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2LoginFailureHandler.java @@ -20,4 +20,3 @@ public void onAuthenticationFailure(HttpServletRequest request, HttpServletRespo log.info("소셜 로그인에 실패했습니다. 에러 메시지 : {}", exception.getMessage()); } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2LoginSuccessHandler.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2LoginSuccessHandler.java index 01c6eff2..9c013415 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2LoginSuccessHandler.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2LoginSuccessHandler.java @@ -42,4 +42,3 @@ private Tokens loginSuccess(HttpServletResponse response, CustomOAuth2User oAuth return new Tokens(authorizationTypePrefix + accessToken, refreshToken); } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2UserInfo.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2UserInfo.java index baba0c0c..8888278e 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2UserInfo.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuth2UserInfo.java @@ -20,4 +20,3 @@ public OAuth2UserInfo(Map attributes) { public abstract String getName(); } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuthAttributes.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuthAttributes.java index e655ed83..101bc7c7 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuthAttributes.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/oauth2/OAuthAttributes.java @@ -71,4 +71,3 @@ public Auth toAuthEntity(OAuth2UserInfo oauth2UserInfo) { .build(); } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/AdminRoleUtils.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/AdminRoleUtils.java index 00a45dcb..b40ed9ea 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/AdminRoleUtils.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/AdminRoleUtils.java @@ -9,4 +9,4 @@ public static void checkRole(String role) { throw new InvalidAdminRoleException(role); } } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/EmailPageFormatter.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/EmailPageFormatter.java index 3be4cb08..73a26c3e 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/EmailPageFormatter.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/EmailPageFormatter.java @@ -144,7 +144,7 @@ public class EmailPageFormatter { + ""; /** - * + * * @param mainText 주요 문구 * @param subText 서브 문구 * @param name 고객 이름 diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/PasswordUtil.java b/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/PasswordUtil.java index 0c356471..18c8709a 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/PasswordUtil.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/global/utils/PasswordUtil.java @@ -26,4 +26,3 @@ public static String generateRandomPassword() { return password.toString(); } } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/notice/repository/NoticeRepository.java b/liberty-auth-service/src/main/java/com/liberty52/auth/notice/repository/NoticeRepository.java index 05a65717..efe6502d 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/notice/repository/NoticeRepository.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/notice/repository/NoticeRepository.java @@ -12,4 +12,4 @@ public interface NoticeRepository extends JpaRepository { Page findAllByOrderByCreatedAtDesc(Pageable pageable); -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/notice/service/NoticeCreateServiceImpl.java b/liberty-auth-service/src/main/java/com/liberty52/auth/notice/service/NoticeCreateServiceImpl.java index cd310618..900bafe2 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/notice/service/NoticeCreateServiceImpl.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/notice/service/NoticeCreateServiceImpl.java @@ -12,9 +12,9 @@ @RequiredArgsConstructor @Transactional public class NoticeCreateServiceImpl implements NoticeCreateService { - + private final NoticeRepository noticeRepository; - + @Override public void createNoticeByAdmin(String role, NoticeCreateRequestDto dto) { AdminRoleUtils.checkRole(role); diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/notice/web/rest/NoticeDeleteController.java b/liberty-auth-service/src/main/java/com/liberty52/auth/notice/web/rest/NoticeDeleteController.java index 0a1c812e..281bcd0e 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/notice/web/rest/NoticeDeleteController.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/notice/web/rest/NoticeDeleteController.java @@ -18,4 +18,4 @@ public ResponseEntity deleteNoticeByAdmin(@RequestHeader("LB-Role") String noticeDeleteService.deleteNoticeByAdmin(role, noticeId); return ResponseEntity.noContent().build(); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/question/repository/QuestionReplyRepository.java b/liberty-auth-service/src/main/java/com/liberty52/auth/question/repository/QuestionReplyRepository.java index 7e934336..8c71cc4a 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/question/repository/QuestionReplyRepository.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/question/repository/QuestionReplyRepository.java @@ -4,4 +4,4 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface QuestionReplyRepository extends JpaRepository { -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/question/repository/QuestionRepository.java b/liberty-auth-service/src/main/java/com/liberty52/auth/question/repository/QuestionRepository.java index 4b0f63e2..207d4f38 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/question/repository/QuestionRepository.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/question/repository/QuestionRepository.java @@ -13,4 +13,4 @@ public interface QuestionRepository extends JpaRepository { Page findAllByWriterId(String writerId, PageRequest pageable); void deleteAllByWriterId(String writerId); -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/user/entity/Role.java b/liberty-auth-service/src/main/java/com/liberty52/auth/user/entity/Role.java index 1e4c5cc9..dc0f89b3 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/user/entity/Role.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/user/entity/Role.java @@ -11,4 +11,3 @@ public enum Role { private final String key; } - diff --git a/liberty-auth-service/src/main/java/com/liberty52/auth/user/repository/SocialLoginRepository.java b/liberty-auth-service/src/main/java/com/liberty52/auth/user/repository/SocialLoginRepository.java index 58b12a8d..3df5b644 100644 --- a/liberty-auth-service/src/main/java/com/liberty52/auth/user/repository/SocialLoginRepository.java +++ b/liberty-auth-service/src/main/java/com/liberty52/auth/user/repository/SocialLoginRepository.java @@ -8,4 +8,3 @@ public interface SocialLoginRepository extends JpaRepository { Optional findByEmail(String email); } - diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/AuthApplicationTests.java b/liberty-auth-service/src/test/java/com/liberty52/auth/AuthApplicationTests.java index 191cf900..104a2f20 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/AuthApplicationTests.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/AuthApplicationTests.java @@ -6,8 +6,8 @@ @SpringBootTest(classes = AuthApplication.class) class AuthApplicationTests { - @Test - void contextLoads() { - } + @Test + void contextLoads() { + } } diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/config/RedisTestContainer.java b/liberty-auth-service/src/test/java/com/liberty52/auth/config/RedisTestContainer.java index 40b2e978..b5f2141a 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/config/RedisTestContainer.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/config/RedisTestContainer.java @@ -25,4 +25,4 @@ public class RedisTestContainer { System.setProperty("spring.data.redis.host", REDIS_CONTAINER.getHost()); System.setProperty("spring.data.redis.port", REDIS_CONTAINER.getMappedPort(6379).toString()); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/CustomerInfoRetrieveServiceImplTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/CustomerInfoRetrieveServiceImplTest.java index bce12827..2b3e6fa7 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/CustomerInfoRetrieveServiceImplTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/CustomerInfoRetrieveServiceImplTest.java @@ -50,4 +50,4 @@ void basicPath() { void InvalidAdminRoleException() { assertThrows(InvalidAdminRoleException.class, () -> service.retrieveCustomerInfoByAdmin(Role.USER.name(), PageRequest.of(0, 1))); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/EmailSignUpServiceImplTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/EmailSignUpServiceImplTest.java index 77bd6693..fa1c0a30 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/EmailSignUpServiceImplTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/EmailSignUpServiceImplTest.java @@ -9,4 +9,4 @@ class EmailSignUpServiceImplTest { @Autowired private EmailSignUpService emailSignUpService; -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/MemberDeleteServiceMockTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/MemberDeleteServiceMockTest.java index 93d151bc..f5a2c54a 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/MemberDeleteServiceMockTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/MemberDeleteServiceMockTest.java @@ -39,4 +39,4 @@ void deleteByUserId () throws Exception{ //then assertThat(result).isNotPresent(); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/NoticeModifyServiceImplTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/NoticeModifyServiceImplTest.java index ec2c2e0e..ebde798f 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/NoticeModifyServiceImplTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/NoticeModifyServiceImplTest.java @@ -100,4 +100,4 @@ private String randomContent() { private String randomString(int min, int max) { return "?".repeat(new Random().nextInt(min, max)); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/NoticeRetrieveServiceImplTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/NoticeRetrieveServiceImplTest.java index cb46310b..c2395850 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/NoticeRetrieveServiceImplTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/NoticeRetrieveServiceImplTest.java @@ -107,4 +107,4 @@ void test_retrieveNoticeDetailByAdmin_when_wrongNoticeId_throw_NoticeNotFoundByI ); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/PasswordMailServiceImplTestImpl.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/PasswordMailServiceImplTestImpl.java index abd18c0f..d9c3a8e8 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/PasswordMailServiceImplTestImpl.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/PasswordMailServiceImplTestImpl.java @@ -69,4 +69,4 @@ void test_updatePassword() throws Exception { } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/ProfileRetrieveServiceImplTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/ProfileRetrieveServiceImplTest.java index 63f96038..9344208d 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/ProfileRetrieveServiceImplTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/ProfileRetrieveServiceImplTest.java @@ -77,4 +77,4 @@ void retrieveReviewerProfile () throws Exception{ } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/UserNoticeRetrieveServiceImplTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/UserNoticeRetrieveServiceImplTest.java index bd6a8b78..14ebc8b7 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/UserNoticeRetrieveServiceImplTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/applicationservice/UserNoticeRetrieveServiceImplTest.java @@ -93,4 +93,4 @@ void retrieveUserNoticeDetail_NoticeNotFoundById () throws Exception{ } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/controller/CustomerInfoRetrieveControllerTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/controller/CustomerInfoRetrieveControllerTest.java index a910b811..b4b66fa4 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/controller/CustomerInfoRetrieveControllerTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/controller/CustomerInfoRetrieveControllerTest.java @@ -103,4 +103,4 @@ CustomerInfoListResponseDto nextGiven(List elements, in .willReturn(dto); return dto; } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/controller/ProfileRetrieveControllerTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/controller/ProfileRetrieveControllerTest.java index b4b7a93b..dd365c18 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/controller/ProfileRetrieveControllerTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/controller/ProfileRetrieveControllerTest.java @@ -76,4 +76,4 @@ void retrieveReviewerProfile () throws Exception{ actions.andDo(print()); } -} \ No newline at end of file +} diff --git a/liberty-auth-service/src/test/java/com/liberty52/auth/service/repository/AuthRepositoryTest.java b/liberty-auth-service/src/test/java/com/liberty52/auth/service/repository/AuthRepositoryTest.java index d2bae27c..79a3807b 100644 --- a/liberty-auth-service/src/test/java/com/liberty52/auth/service/repository/AuthRepositoryTest.java +++ b/liberty-auth-service/src/test/java/com/liberty52/auth/service/repository/AuthRepositoryTest.java @@ -52,4 +52,4 @@ void findAuthAndSocialLoginByEmail () throws Exception{ } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/global/annotation/validation/NullableNotBlankValidator.java b/liberty-main-service/src/main/java/com/liberty52/main/global/annotation/validation/NullableNotBlankValidator.java index 86166a09..a1017f32 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/global/annotation/validation/NullableNotBlankValidator.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/global/annotation/validation/NullableNotBlankValidator.java @@ -22,4 +22,4 @@ public boolean isValid(String value, ConstraintValidatorContext context) { return false; } } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/global/annotation/validation/NullableNotNegativeValidator.java b/liberty-main-service/src/main/java/com/liberty52/main/global/annotation/validation/NullableNotNegativeValidator.java index a0c97fd0..39491a6e 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/global/annotation/validation/NullableNotNegativeValidator.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/global/annotation/validation/NullableNotNegativeValidator.java @@ -22,4 +22,4 @@ public boolean isValid(Number value, ConstraintValidatorContext context) { return false; } } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/global/config/WebConfig.java b/liberty-main-service/src/main/java/com/liberty52/main/global/config/WebConfig.java index 905c096b..2e8edf8d 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/global/config/WebConfig.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/global/config/WebConfig.java @@ -20,4 +20,3 @@ public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(new RequestLoggingInterceptor()); } } - diff --git a/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/AbstractApiException.java b/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/AbstractApiException.java index eab83111..0211dad9 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/AbstractApiException.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/AbstractApiException.java @@ -25,4 +25,4 @@ public AbstractApiException(ProductErrorCode errorCode, String errorMessage) { this.errorName = errorCode.getErrorName(); this.errorMessage = errorMessage; } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/ErrorResponse.java b/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/ErrorResponse.java index 1d46730f..71578dbd 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/ErrorResponse.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/ErrorResponse.java @@ -57,4 +57,4 @@ public String toString() { ", path='" + path + '\'' + '}'; } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/ProductErrorCode.java b/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/ProductErrorCode.java index 16f79d50..d324d48e 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/ProductErrorCode.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/ProductErrorCode.java @@ -30,4 +30,4 @@ public enum ProductErrorCode implements ErrorCode { public String getErrorName() { return this.name(); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/badrequest/SameOrderStatusRequestException.java b/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/badrequest/SameOrderStatusRequestException.java index 8d7750d2..c4d48ab1 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/badrequest/SameOrderStatusRequestException.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/global/exception/external/badrequest/SameOrderStatusRequestException.java @@ -11,4 +11,4 @@ public SameOrderStatusRequestException() { super("현재와 같은 상태 변경 요청입니다."); logger.error("SameOrderStatusRequestException: {}, {}, {}", getHttpStatus(), getErrorMessage(), getErrorCode()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/global/intercepter/RequestLoggingInterceptor.java b/liberty-main-service/src/main/java/com/liberty52/main/global/intercepter/RequestLoggingInterceptor.java index df52ad1d..95d24211 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/global/intercepter/RequestLoggingInterceptor.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/global/intercepter/RequestLoggingInterceptor.java @@ -15,4 +15,4 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons log.info("Request Info: {}::{}, Response Status: {}", request.getMethod(), request.getRequestURL(), response.getStatus()); return true; } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/CartItemSchedulerService.java b/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/CartItemSchedulerService.java index 96905f39..0eaa5019 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/CartItemSchedulerService.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/CartItemSchedulerService.java @@ -2,4 +2,4 @@ public interface CartItemSchedulerService { void deleteNonMemberCart(); -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/LicenseOptionDetailStockManageServiceImpl.java b/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/LicenseOptionDetailStockManageServiceImpl.java index a38221bd..254871af 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/LicenseOptionDetailStockManageServiceImpl.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/LicenseOptionDetailStockManageServiceImpl.java @@ -1,9 +1,5 @@ package com.liberty52.main.service.applicationservice.impl; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - import com.liberty52.main.global.annotation.DistributedLock; import com.liberty52.main.global.exception.external.badrequest.BadRequestException; import com.liberty52.main.global.exception.external.notfound.ResourceNotFoundException; @@ -11,54 +7,56 @@ import com.liberty52.main.service.applicationservice.LicenseOptionDetailStockManageService; import com.liberty52.main.service.entity.license.LicenseOptionDetail; import com.liberty52.main.service.repository.LicenseOptionDetailRepository; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; @Slf4j @Service @RequiredArgsConstructor public class LicenseOptionDetailStockManageServiceImpl implements LicenseOptionDetailStockManageService { - private final LicenseOptionDetailRepository licenseOptionDetailRepository; - - @Override - @Transactional(propagation = Propagation.REQUIRED) - @DistributedLock(key = "#licenseOptionDetailId") - public Result decrement(String licenseOptionDetailId, int quantity) { - return Result.runCatching(() -> { - var licenseOptionDetail = this.findById(licenseOptionDetailId); - licenseOptionDetail.sold(quantity) - .orElseThrow(() -> new BadRequestException(licenseOptionDetail.getArtName() + " 옵션의 재고량이 부족하여 구매할 수 없습니다.")); - return licenseOptionDetail; - }); - } - - @Override - @Transactional(propagation = Propagation.REQUIRED) - @DistributedLock(key = "#licenseOptionDetailId") - public Result increment(String licenseOptionDetailId, int quantity) { - return Result.runCatching(() -> { - var licenseOptionDetail = this.findById(licenseOptionDetailId); - licenseOptionDetail.rollbackStock(quantity); - return licenseOptionDetail; - }); - } - - @Override - @Transactional(propagation = Propagation.REQUIRED) - @DistributedLock(key = "#licenseOptionDetailId") - public Result rollback(String licenseOptionDetailId, int quantity) { - return Result.runCatching(() -> { - var licenseOptionDetail = this.findById(licenseOptionDetailId); - if (licenseOptionDetail.getStock() > 0) { - licenseOptionDetail.rollbackStock(quantity); - } - return licenseOptionDetail; - }); - } - - private LicenseOptionDetail findById(String id) { - return licenseOptionDetailRepository.findById(id) - .orElseThrow(() -> new ResourceNotFoundException("license option detail", "id", id)); - } + private final LicenseOptionDetailRepository licenseOptionDetailRepository; + + @Override + @Transactional(propagation = Propagation.REQUIRED) + @DistributedLock(key = "#licenseOptionDetailId") + public Result decrement(String licenseOptionDetailId, int quantity) { + return Result.runCatching(() -> { + var licenseOptionDetail = this.findById(licenseOptionDetailId); + licenseOptionDetail.sold(quantity) + .orElseThrow(() -> new BadRequestException(licenseOptionDetail.getArtName() + " 옵션의 재고량이 부족하여 구매할 수 없습니다.")); + return licenseOptionDetail; + }); + } + + @Override + @Transactional(propagation = Propagation.REQUIRED) + @DistributedLock(key = "#licenseOptionDetailId") + public Result increment(String licenseOptionDetailId, int quantity) { + return Result.runCatching(() -> { + var licenseOptionDetail = this.findById(licenseOptionDetailId); + licenseOptionDetail.rollbackStock(quantity); + return licenseOptionDetail; + }); + } + + @Override + @Transactional(propagation = Propagation.REQUIRED) + @DistributedLock(key = "#licenseOptionDetailId") + public Result rollback(String licenseOptionDetailId, int quantity) { + return Result.runCatching(() -> { + var licenseOptionDetail = this.findById(licenseOptionDetailId); + if (licenseOptionDetail.getStock() > 0) { + licenseOptionDetail.rollbackStock(quantity); + } + return licenseOptionDetail; + }); + } + + private LicenseOptionDetail findById(String id) { + return licenseOptionDetailRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException("license option detail", "id", id)); + } } diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/OptionDetailMultipleStockManageServiceImpl.java b/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/OptionDetailMultipleStockManageServiceImpl.java index c9e68504..47eebdb4 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/OptionDetailMultipleStockManageServiceImpl.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/OptionDetailMultipleStockManageServiceImpl.java @@ -6,9 +6,7 @@ import com.liberty52.main.service.applicationservice.OptionDetailStockManageService; import com.liberty52.main.service.entity.OptionDetail; import com.liberty52.main.service.entity.license.LicenseOptionDetail; - import lombok.RequiredArgsConstructor; - import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -51,21 +49,21 @@ public Result> decrement(List optionDetailIds, int qu }); } - @Override - @Transactional(propagation = Propagation.REQUIRED) - public Result decrementLicense(String licenseOptionDetailId, int quantity) { - return Result.runCatching(() -> { - List rollbackList = new ArrayList<>(); - try { - var licenseOptionDetail = licenseOptionDetailStockManageService.decrement(licenseOptionDetailId, quantity).getOrThrow(); - rollbackList.add(licenseOptionDetail); - return licenseOptionDetail; - } catch (Exception e) { - rollbackList.forEach( - it -> licenseOptionDetailStockManageService.rollback(it.getId(), quantity).getOrThrow()); - throw e; - } - }); + @Override + @Transactional(propagation = Propagation.REQUIRED) + public Result decrementLicense(String licenseOptionDetailId, int quantity) { + return Result.runCatching(() -> { + List rollbackList = new ArrayList<>(); + try { + var licenseOptionDetail = licenseOptionDetailStockManageService.decrement(licenseOptionDetailId, quantity).getOrThrow(); + rollbackList.add(licenseOptionDetail); + return licenseOptionDetail; + } catch (Exception e) { + rollbackList.forEach( + it -> licenseOptionDetailStockManageService.rollback(it.getId(), quantity).getOrThrow()); + throw e; + } + }); - } + } } diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/OrderCreateServiceImpl.java b/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/OrderCreateServiceImpl.java index fba0672f..27746e22 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/OrderCreateServiceImpl.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/OrderCreateServiceImpl.java @@ -191,7 +191,7 @@ private Product getProduct(OrderCreateRequestDto dto) { } private LicenseOptionDetail getLicenseOptionDetail(OrderCreateRequestDto dto) { - String licenseOptionDetailId = dto.getProductDto().getLicenseOptionDetailId(); + String licenseOptionDetailId = dto.getProductDto().getLicenseOptionDetailId(); LicenseOptionDetail licenseOptionDetail = licenseOptionDetailRepository.findById(licenseOptionDetailId) .orElseThrow(() -> new ResourceNotFoundException(RESOURCE_NAME_LICENSE_OPTION_DETAIL, PARAM_NAME_LICENSE_OPTION_DETAIL_NAME, licenseOptionDetailId)); diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/controller/OrderAdminController.java b/liberty-main-service/src/main/java/com/liberty52/main/service/controller/OrderAdminController.java index 106c2b47..0dad2b8b 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/controller/OrderAdminController.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/controller/OrderAdminController.java @@ -129,4 +129,3 @@ public AdminAddOrderDeliveryDto.Response addOrderDeliveryByAdmin( return orderDeliveryService.add(orderId, dto); } } - diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/controller/dto/AdminReviewRetrieveResponse.java b/liberty-main-service/src/main/java/com/liberty52/main/service/controller/dto/AdminReviewRetrieveResponse.java index 6d12076f..3f985e51 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/controller/dto/AdminReviewRetrieveResponse.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/controller/dto/AdminReviewRetrieveResponse.java @@ -59,4 +59,4 @@ public ReviewContent(String reviewId, Integer rating, String content, String aut this.imageUrls = imageUrls; } } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/controller/dto/VBankDto.java b/liberty-main-service/src/main/java/com/liberty52/main/service/controller/dto/VBankDto.java index 9f4ffda1..b9315481 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/controller/dto/VBankDto.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/controller/dto/VBankDto.java @@ -29,4 +29,4 @@ public static VBankDto fromEntity(VBank vBank) { .updatedAt(vBank.getUpdatedAt()) .build(); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/entity/Cart.java b/liberty-main-service/src/main/java/com/liberty52/main/service/entity/Cart.java index f5246e3a..56add221 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/entity/Cart.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/entity/Cart.java @@ -45,4 +45,3 @@ public void updateExpiryDate(LocalDate expiryDate) { } } - diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/entity/CustomProductOption.java b/liberty-main-service/src/main/java/com/liberty52/main/service/entity/CustomProductOption.java index edad74cd..53aa5f19 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/entity/CustomProductOption.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/entity/CustomProductOption.java @@ -57,4 +57,4 @@ private void dissociateOptionDetail() { this.optionDetail = null; } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/entity/OptionDetail.java b/liberty-main-service/src/main/java/com/liberty52/main/service/entity/OptionDetail.java index 66b41872..bdf50100 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/entity/OptionDetail.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/entity/OptionDetail.java @@ -77,4 +77,4 @@ public void rollbackStock(int quantity) { this.stock += quantity; } } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/entity/ProductOption.java b/liberty-main-service/src/main/java/com/liberty52/main/service/entity/ProductOption.java index a1a9fc48..5758a03a 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/entity/ProductOption.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/entity/ProductOption.java @@ -63,4 +63,4 @@ public void modify(String name, Boolean require, Boolean onSale) { public void updateOnSale() { onSale = !onSale; } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CartItemRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CartItemRepository.java index a190ba90..e7a89c06 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CartItemRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CartItemRepository.java @@ -10,4 +10,4 @@ */ public interface CartItemRepository extends JpaRepository { List findByAuthId(String authId); -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CartRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CartRepository.java index e56502da..f0565316 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CartRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CartRepository.java @@ -14,4 +14,4 @@ public interface CartRepository extends JpaRepository { List findByExpiryDateLessThan(LocalDate expiryDate); -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CustomProductOptionRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CustomProductOptionRepository.java index 178dc811..6353c5b5 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CustomProductOptionRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/CustomProductOptionRepository.java @@ -4,4 +4,4 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface CustomProductOptionRepository extends JpaRepository { -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/LicenseOptionDetailRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/LicenseOptionDetailRepository.java index b1181a73..d8a08927 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/LicenseOptionDetailRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/LicenseOptionDetailRepository.java @@ -4,4 +4,4 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface LicenseOptionDetailRepository extends JpaRepository { -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/LicenseOptionRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/LicenseOptionRepository.java index be7d1e83..ef52ecd3 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/LicenseOptionRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/LicenseOptionRepository.java @@ -9,4 +9,4 @@ public interface LicenseOptionRepository extends JpaRepository findByName(String name); Optional findByProductId(String productId); -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/OptionDetailRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/OptionDetailRepository.java index 4f02ae38..06458522 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/OptionDetailRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/OptionDetailRepository.java @@ -9,4 +9,4 @@ public interface OptionDetailRepository extends JpaRepository findByIdAndProductOption_Id(String id, String ProductOptionId); Optional findByName(String name); -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ProductOptionRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ProductOptionRepository.java index 600e2214..b058abe5 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ProductOptionRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ProductOptionRepository.java @@ -7,4 +7,4 @@ public interface ProductOptionRepository extends JpaRepository { Optional findByIdAndProduct_Id(String id, String productId); -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ProductRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ProductRepository.java index 1ee1e67d..3d2b799c 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ProductRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ProductRepository.java @@ -15,4 +15,3 @@ public interface ProductRepository extends JpaRepository { Page findByProductStateNot(ProductState productState, Pageable pageable); } - diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ReplyRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ReplyRepository.java index 2094147b..3ab47055 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ReplyRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ReplyRepository.java @@ -4,4 +4,4 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface ReplyRepository extends JpaRepository { -} \ No newline at end of file +} diff --git a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ReviewRepository.java b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ReviewRepository.java index 035dfae5..bad65099 100644 --- a/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ReviewRepository.java +++ b/liberty-main-service/src/main/java/com/liberty52/main/service/repository/ReviewRepository.java @@ -12,4 +12,4 @@ public interface ReviewRepository extends JpaRepository { Optional findByCustomProduct(CustomProduct customProduct); List findByCustomProduct_Product(Product product); -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/ProductApplicationTests.java b/liberty-main-service/src/test/java/com/liberty52/main/ProductApplicationTests.java index a959274e..1b3d72e5 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/ProductApplicationTests.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/ProductApplicationTests.java @@ -6,8 +6,8 @@ @SpringBootTest class ProductApplicationTests { - @Test - void contextLoads() { - } + @Test + void contextLoads() { + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/CartItemRemoveServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/CartItemRemoveServiceImplTest.java index d15c68d5..35d41bdb 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/CartItemRemoveServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/CartItemRemoveServiceImplTest.java @@ -161,4 +161,4 @@ private CustomProduct createCartItem() { return customProductRepository.save(customProduct); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/OrderRetrieveServiceTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/OrderRetrieveServiceTest.java index 5c5dc167..c973ba6f 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/OrderRetrieveServiceTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/OrderRetrieveServiceTest.java @@ -194,4 +194,4 @@ void test_retrieveOrderDetailByAdmin_throw_CannotAccessOrderException() { ); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ProductInfoRetrieveServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ProductInfoRetrieveServiceImplTest.java index 517c576d..2b6942d8 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ProductInfoRetrieveServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ProductInfoRetrieveServiceImplTest.java @@ -2,4 +2,4 @@ class ProductInfoRetrieveServiceImplTest { -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewCreateServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewCreateServiceImplTest.java index 7afaf124..2fff504f 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewCreateServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewCreateServiceImplTest.java @@ -146,4 +146,4 @@ void validateReviewAlreadyExist() { () -> reviewCreateService.createReview(MOCK_AUTH_ID, dto, testImageList)); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewModifyServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewModifyServiceImplTest.java index a953f89a..ceb91ec4 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewModifyServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewModifyServiceImplTest.java @@ -133,4 +133,4 @@ void modifyReview() { Assertions.assertEquals(content, review.getContent()); Assertions.assertEquals(addCount, review.getReviewImages().size()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewReplyCreateServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewReplyCreateServiceImplTest.java index abbcdd98..69937b74 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewReplyCreateServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewReplyCreateServiceImplTest.java @@ -79,4 +79,4 @@ void CREATE_REPLY_FAIL_ResourceNotFoundException() throws Exception { } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewRetrieveServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewRetrieveServiceImplTest.java index 18c41e35..d6754d24 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewRetrieveServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/ReviewRetrieveServiceImplTest.java @@ -113,4 +113,4 @@ void retrieveReviewDetailByAdmin() { assertThat(replyContent.getContent()).isEqualTo("맛있따" + i); } } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/DeliveryOptionModifyServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/DeliveryOptionModifyServiceImplTest.java index 6b9c8eb7..3d5ff974 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/DeliveryOptionModifyServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/DeliveryOptionModifyServiceImplTest.java @@ -37,4 +37,4 @@ void updateDefaultDeliveryFee() throws Exception { Assertions.assertNotNull(dto); Assertions.assertEquals(200_000, dto.getFee()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/DeliveryOptionRetrieveServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/DeliveryOptionRetrieveServiceImplTest.java index 2d4b7d70..e89a3208 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/DeliveryOptionRetrieveServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/DeliveryOptionRetrieveServiceImplTest.java @@ -37,4 +37,4 @@ void getDefaultDeliveryFee() { Assertions.assertEquals(100000, dto.getFee()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/ImageGenerationServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/ImageGenerationServiceImplTest.java index 7ae7219d..e78506fd 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/ImageGenerationServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/ImageGenerationServiceImplTest.java @@ -5,4 +5,4 @@ class ImageGenerationServiceImplTest { void generate() { // post man 테스트로 대체. } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderCancelServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderCancelServiceImplTest.java index eb13e784..dcf8eca1 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderCancelServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderCancelServiceImplTest.java @@ -223,4 +223,4 @@ void test_refundCustomerOrder_when_requesterIsNotAdmin_throw_InvalidRoleExceptio ); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderCreateServiceImplUnitTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderCreateServiceImplUnitTest.java index 0e111b31..52c45cbe 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderCreateServiceImplUnitTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderCreateServiceImplUnitTest.java @@ -17,7 +17,6 @@ import com.liberty52.main.service.entity.CustomProduct; import com.liberty52.main.service.entity.OptionDetail; import com.liberty52.main.service.entity.Product; -import com.liberty52.main.service.entity.license.CustomLicenseOption; import com.liberty52.main.service.entity.license.LicenseOption; import com.liberty52.main.service.entity.license.LicenseOptionDetail; import com.liberty52.main.service.entity.payment.CardPayment; diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderRetrieveServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderRetrieveServiceImplTest.java index ecbe352d..c2ac3129 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderRetrieveServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/OrderRetrieveServiceImplTest.java @@ -355,4 +355,4 @@ void retrieveCanceledOrderDetailByAdmin() { assertEquals("reason", result.getCanceledInfo().getReason()); assertNotNull(result.getCanceledInfo().getCanceledAt()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/ProductDeliveryOptionServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/ProductDeliveryOptionServiceImplTest.java index c9297a6d..319f598e 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/ProductDeliveryOptionServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/ProductDeliveryOptionServiceImplTest.java @@ -393,4 +393,4 @@ void update_noProductDeliveryOption() { ); } } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankCreateServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankCreateServiceImplTest.java index 7ab5017a..0522e541 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankCreateServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankCreateServiceImplTest.java @@ -94,4 +94,4 @@ void createVBank_throw_alreadyExistVBank() { } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankDeleteServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankDeleteServiceImplTest.java index 5cc4430e..9a41e92c 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankDeleteServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankDeleteServiceImplTest.java @@ -93,4 +93,4 @@ void deleteVBank_throw_HaveToExistAtLeastOne() throws Exception { Assertions.assertTrue(exception.getErrorMessage().contains("가상계좌는 반드시 1개 이상 존재해야 합니다.")); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankModifyServiceImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankModifyServiceImplTest.java index 1233b286..32aedd1e 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankModifyServiceImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/impl/VBankModifyServiceImplTest.java @@ -93,4 +93,4 @@ void updateVBank_throw_Bank_BadRequest() throws Exception { } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageCreateMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageCreateMockTest.java index c1f22f70..cc351c23 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageCreateMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageCreateMockTest.java @@ -53,4 +53,4 @@ void createLicenseImageTest() { assertEquals("mockImageUrl", captor.getValue().getLicenseImageUrl()); assertEquals(10, captor.getValue().getStock().intValue()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageDeleteMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageDeleteMockTest.java index 0c263ab7..0e0324d6 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageDeleteMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageDeleteMockTest.java @@ -51,4 +51,4 @@ void deleteLicenseImageTest() { verify(licenseImageRepository).delete(any(LicenseImage.class)); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageModifyMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageModifyMockTest.java index db9919eb..d04d9cfb 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageModifyMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageModifyMockTest.java @@ -96,4 +96,4 @@ void modifyLicenseImageTestWhenImageIsNull() { assertEquals(dto.getStock(), licenseImage.getStock()); assertEquals("previousImageUrl", licenseImage.getLicenseImageUrl()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageRetrieveMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageRetrieveMockTest.java index 388ed4be..2a31ffae 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageRetrieveMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseImageRetrieveMockTest.java @@ -21,90 +21,90 @@ @ExtendWith(MockitoExtension.class) class LicenseImageRetrieveMockTest { - @InjectMocks - LicenseImageRetrieveServiceImpl licenseImageRetrieveService; + @InjectMocks + LicenseImageRetrieveServiceImpl licenseImageRetrieveService; - @Mock - LicenseImageRepository licenseImageRepository; + @Mock + LicenseImageRepository licenseImageRepository; - @Test - void retrieveLicenseImagesTest() { - // Given - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - LicenseImage mockLicense = LicenseImage.builder() - .artistName("testArtistName") - .artName("testArtName") - .startDate(startDate) - .endDate(endDate) - .licenseImageUrl("mockImageUrl") - .stock(10) - .build(); - given(licenseImageRepository.findByStartDateLessThanEqualAndEndDateGreaterThanEqual(LocalDate.now(), - LocalDate.now())).willReturn(Collections.singletonList(mockLicense)); - // When - List result = licenseImageRetrieveService.retrieveLicenseImages(); + @Test + void retrieveLicenseImagesTest() { + // Given + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + LicenseImage mockLicense = LicenseImage.builder() + .artistName("testArtistName") + .artName("testArtName") + .startDate(startDate) + .endDate(endDate) + .licenseImageUrl("mockImageUrl") + .stock(10) + .build(); + given(licenseImageRepository.findByStartDateLessThanEqualAndEndDateGreaterThanEqual(LocalDate.now(), + LocalDate.now())).willReturn(Collections.singletonList(mockLicense)); + // When + List result = licenseImageRetrieveService.retrieveLicenseImages(); - verify(licenseImageRepository, times(1)).findByStartDateLessThanEqualAndEndDateGreaterThanEqual(any(), any()); - assertEquals(1, result.size()); - assertEquals("testArtistName", result.get(0).getArtistName()); - assertEquals("testArtName", result.get(0).getArtName()); - assertEquals(startDate, result.get(0).getStartDate()); - assertEquals(endDate, result.get(0).getEndDate()); - assertEquals("mockImageUrl", result.get(0).getImageUrl()); - assertEquals(10, result.get(0).getStock()); - } + verify(licenseImageRepository, times(1)).findByStartDateLessThanEqualAndEndDateGreaterThanEqual(any(), any()); + assertEquals(1, result.size()); + assertEquals("testArtistName", result.get(0).getArtistName()); + assertEquals("testArtName", result.get(0).getArtName()); + assertEquals(startDate, result.get(0).getStartDate()); + assertEquals(endDate, result.get(0).getEndDate()); + assertEquals("mockImageUrl", result.get(0).getImageUrl()); + assertEquals(10, result.get(0).getStock()); + } - @Test - void retrieveLicenseImagesByAdminTest() { - // Given - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - LicenseImage mockLicense = LicenseImage.builder() - .artistName("testArtistName") - .artName("testArtName") - .startDate(startDate) - .endDate(endDate) - .licenseImageUrl("mockImageUrl") - .stock(10) - .build(); - given(licenseImageRepository.findAll()).willReturn(Collections.singletonList(mockLicense)); + @Test + void retrieveLicenseImagesByAdminTest() { + // Given + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + LicenseImage mockLicense = LicenseImage.builder() + .artistName("testArtistName") + .artName("testArtName") + .startDate(startDate) + .endDate(endDate) + .licenseImageUrl("mockImageUrl") + .stock(10) + .build(); + given(licenseImageRepository.findAll()).willReturn(Collections.singletonList(mockLicense)); - // When - List result = licenseImageRetrieveService.retrieveLicenseImagesByAdmin(ADMIN); + // When + List result = licenseImageRetrieveService.retrieveLicenseImagesByAdmin(ADMIN); - // Then: 검증 로직 추가 (예: findAll 메소드 호출 확인 및 반환 값 확인) - verify(licenseImageRepository, times(1)).findAll(); - assertEquals(1, result.size()); - assertEquals("testArtistName", result.get(0).getArtistName()); - } + // Then: 검증 로직 추가 (예: findAll 메소드 호출 확인 및 반환 값 확인) + verify(licenseImageRepository, times(1)).findAll(); + assertEquals(1, result.size()); + assertEquals("testArtistName", result.get(0).getArtistName()); + } - @Test - void retrieveLicenseImageDetailsByAdminTest() { - // Given - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - LicenseImage mockLicense = LicenseImage.builder() - .artistName("testArtistName") - .artName("testArtName") - .startDate(startDate) - .endDate(endDate) - .licenseImageUrl("mockImageUrl") - .stock(10) - .build(); - given(licenseImageRepository.findById(any())).willReturn(java.util.Optional.of(mockLicense)); + @Test + void retrieveLicenseImageDetailsByAdminTest() { + // Given + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + LicenseImage mockLicense = LicenseImage.builder() + .artistName("testArtistName") + .artName("testArtName") + .startDate(startDate) + .endDate(endDate) + .licenseImageUrl("mockImageUrl") + .stock(10) + .build(); + given(licenseImageRepository.findById(any())).willReturn(java.util.Optional.of(mockLicense)); - // When - LicenseImageRetrieveByAdminDto result = licenseImageRetrieveService.retrieveLicenseImageDetailsByAdmin(ADMIN, - "testId"); + // When + LicenseImageRetrieveByAdminDto result = licenseImageRetrieveService.retrieveLicenseImageDetailsByAdmin(ADMIN, + "testId"); - // Then: 검증 로직 추가 (예: findAll 메소드 호출 확인 및 반환 값 확인) - verify(licenseImageRepository, times(1)).findById(any()); - assertEquals("testArtistName", result.getArtistName()); - assertEquals("testArtName", result.getArtName()); - assertEquals(startDate, result.getStartDate()); - assertEquals(endDate, result.getEndDate()); - assertEquals("mockImageUrl", result.getLicenseImageUrl()); - assertEquals(10, result.getStock()); - } + // Then: 검증 로직 추가 (예: findAll 메소드 호출 확인 및 반환 값 확인) + verify(licenseImageRepository, times(1)).findById(any()); + assertEquals("testArtistName", result.getArtistName()); + assertEquals("testArtName", result.getArtName()); + assertEquals(startDate, result.getStartDate()); + assertEquals(endDate, result.getEndDate()); + assertEquals("mockImageUrl", result.getLicenseImageUrl()); + assertEquals(10, result.getStock()); + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionCreateMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionCreateMockTest.java index 9764529b..8c7b2284 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionCreateMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionCreateMockTest.java @@ -25,72 +25,72 @@ @ExtendWith(MockitoExtension.class) class LicenseOptionCreateMockTest { - @InjectMocks - LicenseOptionCreateServiceImpl licenseOptionCreateService; + @InjectMocks + LicenseOptionCreateServiceImpl licenseOptionCreateService; - @Mock - ProductRepository productRepository; + @Mock + ProductRepository productRepository; - @Mock - LicenseOptionRepository licenseOptionRepository; + @Mock + LicenseOptionRepository licenseOptionRepository; - @Test - void createLicenseOptionByAdminTest() { - // Given - LicenseOptionCreateRequestDto dto = new LicenseOptionCreateRequestDto("testName"); - String productId = "testProductId"; + @Test + void createLicenseOptionByAdminTest() { + // Given + LicenseOptionCreateRequestDto dto = new LicenseOptionCreateRequestDto("testName"); + String productId = "testProductId"; - Product mockProduct = mock(Product.class); - when(productRepository.findById(productId)).thenReturn(Optional.of(mockProduct)); + Product mockProduct = mock(Product.class); + when(productRepository.findById(productId)).thenReturn(Optional.of(mockProduct)); - // When - licenseOptionCreateService.createLicenseOptionByAdmin(ADMIN, dto, productId); - licenseOptionRepository.save(LicenseOption.create(dto.getName())); + // When + licenseOptionCreateService.createLicenseOptionByAdmin(ADMIN, dto, productId); + licenseOptionRepository.save(LicenseOption.create(dto.getName())); - // Then - ArgumentCaptor captor = ArgumentCaptor.forClass(LicenseOption.class); - verify(licenseOptionRepository, times(1)).save(captor.capture()); + // Then + ArgumentCaptor captor = ArgumentCaptor.forClass(LicenseOption.class); + verify(licenseOptionRepository, times(1)).save(captor.capture()); - assertEquals("testName", captor.getValue().getName()); - } + assertEquals("testName", captor.getValue().getName()); + } - @Test - void createLicenseOptionByAdminTest_ProductNotFound() { - // Given - LicenseOptionCreateRequestDto dto = new LicenseOptionCreateRequestDto("testName"); - String productId = "testProductId"; - // When - when(productRepository.findById(productId)).thenReturn(Optional.empty()); - // Then - assertThrows(ResourceNotFoundException.class, - () -> licenseOptionCreateService.createLicenseOptionByAdmin(ADMIN, dto, productId)); - } + @Test + void createLicenseOptionByAdminTest_ProductNotFound() { + // Given + LicenseOptionCreateRequestDto dto = new LicenseOptionCreateRequestDto("testName"); + String productId = "testProductId"; + // When + when(productRepository.findById(productId)).thenReturn(Optional.empty()); + // Then + assertThrows(ResourceNotFoundException.class, + () -> licenseOptionCreateService.createLicenseOptionByAdmin(ADMIN, dto, productId)); + } - @Test - void createLicenseOptionByAdminTest_ProductIsCustom() { - // Given - LicenseOptionCreateRequestDto dto = new LicenseOptionCreateRequestDto("testName"); - String productId = "testProductId"; - Product mockProduct = mock(Product.class); - when(productRepository.findById(productId)).thenReturn(Optional.of(mockProduct)); - when(mockProduct.isCustom()).thenReturn(true); - // When - // Then - assertThrows(BadRequestException.class, - () -> licenseOptionCreateService.createLicenseOptionByAdmin(ADMIN, dto, productId)); - } + @Test + void createLicenseOptionByAdminTest_ProductIsCustom() { + // Given + LicenseOptionCreateRequestDto dto = new LicenseOptionCreateRequestDto("testName"); + String productId = "testProductId"; + Product mockProduct = mock(Product.class); + when(productRepository.findById(productId)).thenReturn(Optional.of(mockProduct)); + when(mockProduct.isCustom()).thenReturn(true); + // When + // Then + assertThrows(BadRequestException.class, + () -> licenseOptionCreateService.createLicenseOptionByAdmin(ADMIN, dto, productId)); + } - @Test - void createLicenseOptionByAdminTest_Already_License_Option_is_Existed() { - // Given - LicenseOptionCreateRequestDto dto = new LicenseOptionCreateRequestDto("testName"); - String productId = "testProductId"; - Product mockProduct = mock(Product.class); - when(productRepository.findById(productId)).thenReturn(Optional.of(mockProduct)); - when(licenseOptionRepository.findByProductId(productId)).thenReturn(Optional.of(mock(LicenseOption.class))); - // When - // Then - assertThrows(BadRequestException.class, - () -> licenseOptionCreateService.createLicenseOptionByAdmin(ADMIN, dto, productId)); - } + @Test + void createLicenseOptionByAdminTest_Already_License_Option_is_Existed() { + // Given + LicenseOptionCreateRequestDto dto = new LicenseOptionCreateRequestDto("testName"); + String productId = "testProductId"; + Product mockProduct = mock(Product.class); + when(productRepository.findById(productId)).thenReturn(Optional.of(mockProduct)); + when(licenseOptionRepository.findByProductId(productId)).thenReturn(Optional.of(mock(LicenseOption.class))); + // When + // Then + assertThrows(BadRequestException.class, + () -> licenseOptionCreateService.createLicenseOptionByAdmin(ADMIN, dto, productId)); + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionDetailCreateMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionDetailCreateMockTest.java index 589bc96f..e3568716 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionDetailCreateMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionDetailCreateMockTest.java @@ -27,101 +27,101 @@ @ExtendWith(MockitoExtension.class) class LicenseOptionDetailCreateMockTest { - @InjectMocks - LicenseOptionDetailCreateServiceImpl licenseOptionDetailCreateService; - - @Mock - LicenseOptionRepository licenseOptionRepository; - - @Mock - LicenseOptionDetailRepository licenseOptionDetailRepository; - - @Mock - S3UploaderApi s3Uploader; - - @Test - void createLicenseOptionDetailByAdminTest() { - // Given - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - String licenseOptionId = "testLicenseOptionId"; - LicenseOptionDetailCreateDto dto = LicenseOptionDetailCreateDto.create - ("testArtName", "testArtistName", 100, true, 1000, startDate, endDate); - MultipartFile artImageFile = mock(MultipartFile.class); - LicenseOption mockLicenseOption = mock(LicenseOption.class); - - when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.of(mockLicenseOption)); - when(s3Uploader.upload(artImageFile)).thenReturn("testArtUrl"); - - // When - licenseOptionDetailCreateService.createLicenseOptionDetailByAdmin(ADMIN, dto, licenseOptionId, artImageFile); - - // Then - ArgumentCaptor captor = ArgumentCaptor.forClass(LicenseOptionDetail.class); - verify(licenseOptionDetailRepository, times(1)).save(captor.capture()); - LicenseOptionDetail savedLicenseOptionDetail = captor.getValue(); - assertEquals(dto.getArtName(), savedLicenseOptionDetail.getArtName()); - assertEquals(dto.getArtistName(), savedLicenseOptionDetail.getArtistName()); - assertEquals(dto.getStock(), savedLicenseOptionDetail.getStock()); - assertEquals(dto.getOnSale(), savedLicenseOptionDetail.getOnSale()); - assertEquals(dto.getPrice(), savedLicenseOptionDetail.getPrice()); - assertEquals("testArtUrl", savedLicenseOptionDetail.getArtUrl()); - } - - @Test - void createLicenseOptionDetailByAdmin_WhenLicenseOptionNotFound_ThrowException() { - // Given - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - String licenseOptionId = "testLicenseOptionId"; - LicenseOptionDetailCreateDto dto = LicenseOptionDetailCreateDto.create - ("testArtName", "testArtistName", 100, true, 1000, startDate, endDate); - MultipartFile artImageFile = mock(MultipartFile.class); - - when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.empty()); - - // When - // Then - assertThrows(RuntimeException.class, () -> { - licenseOptionDetailCreateService.createLicenseOptionDetailByAdmin(ADMIN, dto, licenseOptionId, - artImageFile); - }); - } - - @Test - void createLicenseOptionDetailByAdmin_WhenRoleIsNotAdmin() { - // Given - String licenseOptionId = "testLicenseOptionId"; - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - LicenseOptionDetailCreateDto dto = LicenseOptionDetailCreateDto.create - ("testArtName", "testArtistName", 100, true, 1000, startDate, endDate); - MultipartFile artImageFile = mock(MultipartFile.class); - - // When - // Then - assertThrows(RuntimeException.class, () -> { - licenseOptionDetailCreateService.createLicenseOptionDetailByAdmin("USER", dto, licenseOptionId, - artImageFile); - }); - } - - @Test - void createLicenseOptionDetailByAdmin_WhenArtImageFileIsNull() { - // Given - String licenseOptionId = "testLicenseOptionId"; - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - LicenseOptionDetailCreateDto dto = LicenseOptionDetailCreateDto.create - ("testArtName", "testArtistName", 100, true, 1000, startDate, endDate); - MultipartFile artImageFile = null; - LicenseOption mockLicenseOption = mock(LicenseOption.class); - - when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.of(mockLicenseOption)); - // When - // Then - assertThrows(BadRequestException.class, - () -> licenseOptionDetailCreateService.createLicenseOptionDetailByAdmin(ADMIN, dto, licenseOptionId, artImageFile)); - - } + @InjectMocks + LicenseOptionDetailCreateServiceImpl licenseOptionDetailCreateService; + + @Mock + LicenseOptionRepository licenseOptionRepository; + + @Mock + LicenseOptionDetailRepository licenseOptionDetailRepository; + + @Mock + S3UploaderApi s3Uploader; + + @Test + void createLicenseOptionDetailByAdminTest() { + // Given + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + String licenseOptionId = "testLicenseOptionId"; + LicenseOptionDetailCreateDto dto = LicenseOptionDetailCreateDto.create + ("testArtName", "testArtistName", 100, true, 1000, startDate, endDate); + MultipartFile artImageFile = mock(MultipartFile.class); + LicenseOption mockLicenseOption = mock(LicenseOption.class); + + when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.of(mockLicenseOption)); + when(s3Uploader.upload(artImageFile)).thenReturn("testArtUrl"); + + // When + licenseOptionDetailCreateService.createLicenseOptionDetailByAdmin(ADMIN, dto, licenseOptionId, artImageFile); + + // Then + ArgumentCaptor captor = ArgumentCaptor.forClass(LicenseOptionDetail.class); + verify(licenseOptionDetailRepository, times(1)).save(captor.capture()); + LicenseOptionDetail savedLicenseOptionDetail = captor.getValue(); + assertEquals(dto.getArtName(), savedLicenseOptionDetail.getArtName()); + assertEquals(dto.getArtistName(), savedLicenseOptionDetail.getArtistName()); + assertEquals(dto.getStock(), savedLicenseOptionDetail.getStock()); + assertEquals(dto.getOnSale(), savedLicenseOptionDetail.getOnSale()); + assertEquals(dto.getPrice(), savedLicenseOptionDetail.getPrice()); + assertEquals("testArtUrl", savedLicenseOptionDetail.getArtUrl()); + } + + @Test + void createLicenseOptionDetailByAdmin_WhenLicenseOptionNotFound_ThrowException() { + // Given + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + String licenseOptionId = "testLicenseOptionId"; + LicenseOptionDetailCreateDto dto = LicenseOptionDetailCreateDto.create + ("testArtName", "testArtistName", 100, true, 1000, startDate, endDate); + MultipartFile artImageFile = mock(MultipartFile.class); + + when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.empty()); + + // When + // Then + assertThrows(RuntimeException.class, () -> { + licenseOptionDetailCreateService.createLicenseOptionDetailByAdmin(ADMIN, dto, licenseOptionId, + artImageFile); + }); + } + + @Test + void createLicenseOptionDetailByAdmin_WhenRoleIsNotAdmin() { + // Given + String licenseOptionId = "testLicenseOptionId"; + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + LicenseOptionDetailCreateDto dto = LicenseOptionDetailCreateDto.create + ("testArtName", "testArtistName", 100, true, 1000, startDate, endDate); + MultipartFile artImageFile = mock(MultipartFile.class); + + // When + // Then + assertThrows(RuntimeException.class, () -> { + licenseOptionDetailCreateService.createLicenseOptionDetailByAdmin("USER", dto, licenseOptionId, + artImageFile); + }); + } + + @Test + void createLicenseOptionDetailByAdmin_WhenArtImageFileIsNull() { + // Given + String licenseOptionId = "testLicenseOptionId"; + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + LicenseOptionDetailCreateDto dto = LicenseOptionDetailCreateDto.create + ("testArtName", "testArtistName", 100, true, 1000, startDate, endDate); + MultipartFile artImageFile = null; + LicenseOption mockLicenseOption = mock(LicenseOption.class); + + when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.of(mockLicenseOption)); + // When + // Then + assertThrows(BadRequestException.class, + () -> licenseOptionDetailCreateService.createLicenseOptionDetailByAdmin(ADMIN, dto, licenseOptionId, artImageFile)); + + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionDetailModifyMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionDetailModifyMockTest.java index 38c4e4c9..7879fc5b 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionDetailModifyMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionDetailModifyMockTest.java @@ -23,85 +23,85 @@ @ExtendWith(MockitoExtension.class) class LicenseOptionDetailModifyMockTest { - @InjectMocks - LicenseOptionDetailModifyServiceImpl licenseOptionDetailModifyService; - - @Mock - LicenseOptionDetailRepository licenseOptionDetailRepository; - - @Mock - S3UploaderApi s3Uploader; - - @Test - void modifyLicenseOptionDetailByAdminTest() { - // Given - String licenseOptionDetailId = "testLicenseOptionDetailId"; - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - LicenseOptionDetailModifyDto dto = new LicenseOptionDetailModifyDto("ArtName", "ArtistName", 10, 1000, true, - startDate, endDate); - MultipartFile artImageFile = mock(MultipartFile.class); - - LicenseOptionDetail mockLicenseOptionDetail = mock(LicenseOptionDetail.class); - when(licenseOptionDetailRepository.findById(licenseOptionDetailId)).thenReturn( - Optional.of(mockLicenseOptionDetail)); - when(s3Uploader.upload(artImageFile)).thenReturn("modifiedArtUrl"); - - // When - licenseOptionDetailModifyService.modifyLicenseOptionDetailByAdmin(ADMIN, licenseOptionDetailId, dto, - artImageFile); - - // Then - verify(mockLicenseOptionDetail, times(1)).modifyLicenseOptionDetail(dto); - verify(mockLicenseOptionDetail, times(1)).modifyLicenseArtUrl("modifiedArtUrl"); - } - - @Test - void modifyLicenseOptionDetailByAdmin_When_LicenseOptionDetailNotFoundTest() { - // Given - String licenseOptionDetailId = "testLicenseOptionDetailId"; - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - LicenseOptionDetailModifyDto dto = new LicenseOptionDetailModifyDto("ArtName", "ArtistName", 10, 1000, true, - startDate, endDate); - MultipartFile artImageFile = mock(MultipartFile.class); - - when(licenseOptionDetailRepository.findById(licenseOptionDetailId)).thenReturn(Optional.empty()); - - assertThrows( - ResourceNotFoundException.class, - () -> licenseOptionDetailModifyService.modifyLicenseOptionDetailByAdmin(ADMIN, licenseOptionDetailId, dto, - artImageFile)); - } - - @Test - void modifyLicenseOptionDetailOnSailStateByAdminTest() { - // Given - String licenseOptionDetailId = "testLicenseOptionDetailId"; - - LicenseOptionDetail mockLicenseOptionDetail = mock(LicenseOptionDetail.class); - when(licenseOptionDetailRepository.findById(licenseOptionDetailId)).thenReturn( - Optional.of(mockLicenseOptionDetail)); - - // When - licenseOptionDetailModifyService.modifyLicenseOptionDetailOnSailStateByAdmin(ADMIN, licenseOptionDetailId); - - // Then - verify(mockLicenseOptionDetail, times(1)).updateOnSale(); - } - - @Test - void modifyLicenseOptionDetailOnSailStateByAdmin_When_LicenseOptionDetailNotFoundTest() { - // Given - String licenseOptionDetailId = "testLicenseOptionDetailId"; - - when(licenseOptionDetailRepository.findById(licenseOptionDetailId)).thenReturn(Optional.empty()); - - // When - // Then - assertThrows( - ResourceNotFoundException.class, - () -> licenseOptionDetailModifyService.modifyLicenseOptionDetailOnSailStateByAdmin(ADMIN, - licenseOptionDetailId)); - } + @InjectMocks + LicenseOptionDetailModifyServiceImpl licenseOptionDetailModifyService; + + @Mock + LicenseOptionDetailRepository licenseOptionDetailRepository; + + @Mock + S3UploaderApi s3Uploader; + + @Test + void modifyLicenseOptionDetailByAdminTest() { + // Given + String licenseOptionDetailId = "testLicenseOptionDetailId"; + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + LicenseOptionDetailModifyDto dto = new LicenseOptionDetailModifyDto("ArtName", "ArtistName", 10, 1000, true, + startDate, endDate); + MultipartFile artImageFile = mock(MultipartFile.class); + + LicenseOptionDetail mockLicenseOptionDetail = mock(LicenseOptionDetail.class); + when(licenseOptionDetailRepository.findById(licenseOptionDetailId)).thenReturn( + Optional.of(mockLicenseOptionDetail)); + when(s3Uploader.upload(artImageFile)).thenReturn("modifiedArtUrl"); + + // When + licenseOptionDetailModifyService.modifyLicenseOptionDetailByAdmin(ADMIN, licenseOptionDetailId, dto, + artImageFile); + + // Then + verify(mockLicenseOptionDetail, times(1)).modifyLicenseOptionDetail(dto); + verify(mockLicenseOptionDetail, times(1)).modifyLicenseArtUrl("modifiedArtUrl"); + } + + @Test + void modifyLicenseOptionDetailByAdmin_When_LicenseOptionDetailNotFoundTest() { + // Given + String licenseOptionDetailId = "testLicenseOptionDetailId"; + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + LicenseOptionDetailModifyDto dto = new LicenseOptionDetailModifyDto("ArtName", "ArtistName", 10, 1000, true, + startDate, endDate); + MultipartFile artImageFile = mock(MultipartFile.class); + + when(licenseOptionDetailRepository.findById(licenseOptionDetailId)).thenReturn(Optional.empty()); + + assertThrows( + ResourceNotFoundException.class, + () -> licenseOptionDetailModifyService.modifyLicenseOptionDetailByAdmin(ADMIN, licenseOptionDetailId, dto, + artImageFile)); + } + + @Test + void modifyLicenseOptionDetailOnSailStateByAdminTest() { + // Given + String licenseOptionDetailId = "testLicenseOptionDetailId"; + + LicenseOptionDetail mockLicenseOptionDetail = mock(LicenseOptionDetail.class); + when(licenseOptionDetailRepository.findById(licenseOptionDetailId)).thenReturn( + Optional.of(mockLicenseOptionDetail)); + + // When + licenseOptionDetailModifyService.modifyLicenseOptionDetailOnSailStateByAdmin(ADMIN, licenseOptionDetailId); + + // Then + verify(mockLicenseOptionDetail, times(1)).updateOnSale(); + } + + @Test + void modifyLicenseOptionDetailOnSailStateByAdmin_When_LicenseOptionDetailNotFoundTest() { + // Given + String licenseOptionDetailId = "testLicenseOptionDetailId"; + + when(licenseOptionDetailRepository.findById(licenseOptionDetailId)).thenReturn(Optional.empty()); + + // When + // Then + assertThrows( + ResourceNotFoundException.class, + () -> licenseOptionDetailModifyService.modifyLicenseOptionDetailOnSailStateByAdmin(ADMIN, + licenseOptionDetailId)); + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionModifyMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionModifyMockTest.java index bff1a5b9..e0ccd2e4 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionModifyMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseOptionModifyMockTest.java @@ -20,38 +20,38 @@ @ExtendWith(MockitoExtension.class) class LicenseOptionModifyMockTest { - @InjectMocks - LicenseOptionModifyServiceImpl licenseOptionModifyService; + @InjectMocks + LicenseOptionModifyServiceImpl licenseOptionModifyService; - @Mock - LicenseOptionRepository licenseOptionRepository; + @Mock + LicenseOptionRepository licenseOptionRepository; - @Test - void modifyLicenseOptionByAdminTest() { - // Given - String licenseOptionId = "testLicenseOptionId"; - LicenseOptionModifyRequestDto dto = new LicenseOptionModifyRequestDto("modifiedName"); + @Test + void modifyLicenseOptionByAdminTest() { + // Given + String licenseOptionId = "testLicenseOptionId"; + LicenseOptionModifyRequestDto dto = new LicenseOptionModifyRequestDto("modifiedName"); - LicenseOption mockLicenseOption = mock(LicenseOption.class); - when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.of(mockLicenseOption)); + LicenseOption mockLicenseOption = mock(LicenseOption.class); + when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.of(mockLicenseOption)); - // When - licenseOptionModifyService.modifyLicenseOptionByAdmin(ADMIN, licenseOptionId, dto); + // When + licenseOptionModifyService.modifyLicenseOptionByAdmin(ADMIN, licenseOptionId, dto); - // Then - verify(mockLicenseOption, times(1)).modifyLicenseOption(dto.getName()); - } + // Then + verify(mockLicenseOption, times(1)).modifyLicenseOption(dto.getName()); + } - @Test - void modifyLicenseOptionByAdminTest_LicenseOptionNotFound() { - // Given - String licenseOptionId = "testLicenseOptionId"; - LicenseOptionModifyRequestDto dto = new LicenseOptionModifyRequestDto("modifiedName"); + @Test + void modifyLicenseOptionByAdminTest_LicenseOptionNotFound() { + // Given + String licenseOptionId = "testLicenseOptionId"; + LicenseOptionModifyRequestDto dto = new LicenseOptionModifyRequestDto("modifiedName"); - when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.empty()); + when(licenseOptionRepository.findById(licenseOptionId)).thenReturn(Optional.empty()); - // Then - assertThrows(ResourceNotFoundException.class, - () -> licenseOptionModifyService.modifyLicenseOptionByAdmin(ADMIN, licenseOptionId, dto)); - } + // Then + assertThrows(ResourceNotFoundException.class, + () -> licenseOptionModifyService.modifyLicenseOptionByAdmin(ADMIN, licenseOptionId, dto)); + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseProductInfoRetrieveMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseProductInfoRetrieveMockTest.java index 2aca4b3e..3547c147 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseProductInfoRetrieveMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/LicenseProductInfoRetrieveMockTest.java @@ -31,110 +31,110 @@ @ExtendWith(MockitoExtension.class) class LicenseProductInfoRetrieveMockTest { - @InjectMocks - LicenseProductInfoRetrieveServiceImpl licenseProductInfoRetrieveService; - - @Mock - ProductRepository productRepository; - - @Test - void retrieveLicenseProductOptionInfoListByAdminTest() { - // Given - String productId = "testProductId"; - boolean onSale = true; - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - LicenseOptionDetail licenseOptionDetail1 = LicenseOptionDetail.create("testArtName1", "testArtistName1", 100, - true, "testArtUrl1", 1000, startDate, endDate); - LicenseOptionDetail licenseOptionDetail2 = LicenseOptionDetail.create("testArtName2", "testArtistName2", 100, - true, "testArtUrl2", 1000, startDate, endDate); - - Product mockProduct = mock(Product.class); - when(productRepository.findById(productId)).thenReturn(Optional.of(mockProduct)); - - List licenseOptionDetails = Arrays.asList(licenseOptionDetail1, licenseOptionDetail2); - - LicenseOption licenseOption1 = mock(LicenseOption.class); - when(licenseOption1.getLicenseOptionDetails()).thenReturn(licenseOptionDetails); - when(licenseOption1.getId()).thenReturn("testOption1"); - - when(mockProduct.getLicenseOption()).thenReturn(licenseOption1); - - // When - LicenseOptionInfoResponseDto result = licenseProductInfoRetrieveService.retrieveLicenseProductOptionInfoListByAdmin( - ADMIN, productId, onSale); - - // Then - assertEquals("testOption1", result.getLicenseOptionId()); - assertEquals("testArtName1", result.getLicenseOptionDetailList().get(0).getArtName()); - assertEquals(startDate, result.getLicenseOptionDetailList().get(0).getStartDate()); - assertEquals(endDate, result.getLicenseOptionDetailList().get(0).getEndDate()); - assertEquals("testArtName2", result.getLicenseOptionDetailList().get(1).getArtName()); - } - - @Test - void retrieveLicenseProductOptionInfoListByAdmin_When_Product_Not_Found_Test() { - // Given - String productId = "testProductId"; - boolean onSale = true; - - when(productRepository.findById(productId)).thenReturn(Optional.empty()); - - // When - // Then - assertThrows(ResourceNotFoundException.class, - () -> licenseProductInfoRetrieveService.retrieveLicenseProductOptionInfoListByAdmin(ADMIN, productId, - onSale)); - } - - @Test - void retrieveLicenseProductOptionInfoTest() { - // Given - String productId = "testProductId"; - boolean onSale = true; - LocalDate startDate = LocalDate.of(2023, 1, 1); - LocalDate endDate = startDate.plusDays(10); - - Product product = Product.create("Liberty 52_Frame", ProductState.ON_SALE, 100L, true); - - ProductOption option1 = ProductOption.create("거치 방식", true, true); - option1.associate(product); - OptionDetail detailEasel = OptionDetail.create("이젤 거치형", 100, true, 100); - detailEasel.associate(option1); - OptionDetail detailWall = OptionDetail.create("벽걸이형", 100, true, 100); - detailWall.associate(option1); - - LicenseOption licenseOption = LicenseOption.create("라이센스"); - licenseOption.associate(product); - LicenseOptionDetail licenseOptionDetail1 = LicenseOptionDetail.create("testArtName1", "testArtistName1", 100, - true, "testArtUrl1", 1000, startDate, endDate); - licenseOptionDetail1.associate(licenseOption); - LicenseOptionDetail licenseOptionDetail2 = LicenseOptionDetail.create("testArtName2", "testArtistName2", 100, - true, "testArtUrl2", 1000, startDate, endDate); - licenseOptionDetail2.associate(licenseOption); - - when(productRepository.findById(productId)).thenReturn(Optional.of(product)); - - // When - LicenseOptionResponseDto result = licenseProductInfoRetrieveService.retrieveLicenseProductOptionInfo(productId); - - // Then - assertEquals("라이센스", result.getName()); - assertEquals(licenseOption.getLicenseOptionDetails().size(), result.getOptionItems().size()); - - assertEquals(licenseOptionDetail1.getId(), result.getOptionItems().get(0).getId()); - assertEquals(licenseOptionDetail1.getArtistName(), result.getOptionItems().get(0).getArtistName()); - assertEquals(licenseOptionDetail1.getArtName(), result.getOptionItems().get(0).getArtName()); - assertEquals(licenseOptionDetail1.getPrice(), result.getOptionItems().get(0).getPrice()); - assertEquals(licenseOptionDetail1.getStock(), result.getOptionItems().get(0).getStock()); - assertEquals(licenseOptionDetail1.getArtUrl(), result.getOptionItems().get(0).getArtUrl()); - - assertEquals(licenseOptionDetail2.getId(), result.getOptionItems().get(1).getId()); - assertEquals(licenseOptionDetail2.getArtistName(), result.getOptionItems().get(1).getArtistName()); - assertEquals(licenseOptionDetail2.getArtName(), result.getOptionItems().get(1).getArtName()); - assertEquals(licenseOptionDetail2.getPrice(), result.getOptionItems().get(1).getPrice()); - assertEquals(licenseOptionDetail2.getStock(), result.getOptionItems().get(1).getStock()); - assertEquals(licenseOptionDetail2.getArtUrl(), result.getOptionItems().get(1).getArtUrl()); - } + @InjectMocks + LicenseProductInfoRetrieveServiceImpl licenseProductInfoRetrieveService; + + @Mock + ProductRepository productRepository; + + @Test + void retrieveLicenseProductOptionInfoListByAdminTest() { + // Given + String productId = "testProductId"; + boolean onSale = true; + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + LicenseOptionDetail licenseOptionDetail1 = LicenseOptionDetail.create("testArtName1", "testArtistName1", 100, + true, "testArtUrl1", 1000, startDate, endDate); + LicenseOptionDetail licenseOptionDetail2 = LicenseOptionDetail.create("testArtName2", "testArtistName2", 100, + true, "testArtUrl2", 1000, startDate, endDate); + + Product mockProduct = mock(Product.class); + when(productRepository.findById(productId)).thenReturn(Optional.of(mockProduct)); + + List licenseOptionDetails = Arrays.asList(licenseOptionDetail1, licenseOptionDetail2); + + LicenseOption licenseOption1 = mock(LicenseOption.class); + when(licenseOption1.getLicenseOptionDetails()).thenReturn(licenseOptionDetails); + when(licenseOption1.getId()).thenReturn("testOption1"); + + when(mockProduct.getLicenseOption()).thenReturn(licenseOption1); + + // When + LicenseOptionInfoResponseDto result = licenseProductInfoRetrieveService.retrieveLicenseProductOptionInfoListByAdmin( + ADMIN, productId, onSale); + + // Then + assertEquals("testOption1", result.getLicenseOptionId()); + assertEquals("testArtName1", result.getLicenseOptionDetailList().get(0).getArtName()); + assertEquals(startDate, result.getLicenseOptionDetailList().get(0).getStartDate()); + assertEquals(endDate, result.getLicenseOptionDetailList().get(0).getEndDate()); + assertEquals("testArtName2", result.getLicenseOptionDetailList().get(1).getArtName()); + } + + @Test + void retrieveLicenseProductOptionInfoListByAdmin_When_Product_Not_Found_Test() { + // Given + String productId = "testProductId"; + boolean onSale = true; + + when(productRepository.findById(productId)).thenReturn(Optional.empty()); + + // When + // Then + assertThrows(ResourceNotFoundException.class, + () -> licenseProductInfoRetrieveService.retrieveLicenseProductOptionInfoListByAdmin(ADMIN, productId, + onSale)); + } + + @Test + void retrieveLicenseProductOptionInfoTest() { + // Given + String productId = "testProductId"; + boolean onSale = true; + LocalDate startDate = LocalDate.of(2023, 1, 1); + LocalDate endDate = startDate.plusDays(10); + + Product product = Product.create("Liberty 52_Frame", ProductState.ON_SALE, 100L, true); + + ProductOption option1 = ProductOption.create("거치 방식", true, true); + option1.associate(product); + OptionDetail detailEasel = OptionDetail.create("이젤 거치형", 100, true, 100); + detailEasel.associate(option1); + OptionDetail detailWall = OptionDetail.create("벽걸이형", 100, true, 100); + detailWall.associate(option1); + + LicenseOption licenseOption = LicenseOption.create("라이센스"); + licenseOption.associate(product); + LicenseOptionDetail licenseOptionDetail1 = LicenseOptionDetail.create("testArtName1", "testArtistName1", 100, + true, "testArtUrl1", 1000, startDate, endDate); + licenseOptionDetail1.associate(licenseOption); + LicenseOptionDetail licenseOptionDetail2 = LicenseOptionDetail.create("testArtName2", "testArtistName2", 100, + true, "testArtUrl2", 1000, startDate, endDate); + licenseOptionDetail2.associate(licenseOption); + + when(productRepository.findById(productId)).thenReturn(Optional.of(product)); + + // When + LicenseOptionResponseDto result = licenseProductInfoRetrieveService.retrieveLicenseProductOptionInfo(productId); + + // Then + assertEquals("라이센스", result.getName()); + assertEquals(licenseOption.getLicenseOptionDetails().size(), result.getOptionItems().size()); + + assertEquals(licenseOptionDetail1.getId(), result.getOptionItems().get(0).getId()); + assertEquals(licenseOptionDetail1.getArtistName(), result.getOptionItems().get(0).getArtistName()); + assertEquals(licenseOptionDetail1.getArtName(), result.getOptionItems().get(0).getArtName()); + assertEquals(licenseOptionDetail1.getPrice(), result.getOptionItems().get(0).getPrice()); + assertEquals(licenseOptionDetail1.getStock(), result.getOptionItems().get(0).getStock()); + assertEquals(licenseOptionDetail1.getArtUrl(), result.getOptionItems().get(0).getArtUrl()); + + assertEquals(licenseOptionDetail2.getId(), result.getOptionItems().get(1).getId()); + assertEquals(licenseOptionDetail2.getArtistName(), result.getOptionItems().get(1).getArtistName()); + assertEquals(licenseOptionDetail2.getArtName(), result.getOptionItems().get(1).getArtName()); + assertEquals(licenseOptionDetail2.getPrice(), result.getOptionItems().get(1).getPrice()); + assertEquals(licenseOptionDetail2.getStock(), result.getOptionItems().get(1).getStock()); + assertEquals(licenseOptionDetail2.getArtUrl(), result.getOptionItems().get(1).getArtUrl()); + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionDeleteMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionDeleteMockTest.java index fc67a3e1..cd86b066 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionDeleteMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionDeleteMockTest.java @@ -18,35 +18,35 @@ @ExtendWith(MockitoExtension.class) class ProductIntroductionDeleteMockTest { - @InjectMocks - ProductIntroductionDeleteServiceImpl productIntroductionDeleteService; - - @Mock - ProductRepository productRepository; - - @Test - void deleteProductIntroductionTest() { - // Given - String productId = "testProductId"; - Product mockProduct = mock(Product.class); - given(productRepository.findById(anyString())).willReturn(Optional.of(mockProduct)); - - // When - productIntroductionDeleteService.deleteProductIntroduction(ADMIN, productId); - - // Then: 검증 로직 추가 (예: createContent 메소드 호출 확인) - verify(mockProduct).deleteContent(); - } - - @Test - void deleteProductIntroductionTestWhenProductIsNull() { - // Given - String productId = "testProductId"; - // When - given(productRepository.findById(anyString())).willReturn(Optional.empty()); - // Then: 검증 로직 추가 (예: 이미지가 등록되어 있을 때 예외가 발생하는지 확인) - assertThrows(ResourceNotFoundException.class, - () -> productIntroductionDeleteService.deleteProductIntroduction(ADMIN, productId)); - } + @InjectMocks + ProductIntroductionDeleteServiceImpl productIntroductionDeleteService; + + @Mock + ProductRepository productRepository; + + @Test + void deleteProductIntroductionTest() { + // Given + String productId = "testProductId"; + Product mockProduct = mock(Product.class); + given(productRepository.findById(anyString())).willReturn(Optional.of(mockProduct)); + + // When + productIntroductionDeleteService.deleteProductIntroduction(ADMIN, productId); + + // Then: 검증 로직 추가 (예: createContent 메소드 호출 확인) + verify(mockProduct).deleteContent(); + } + + @Test + void deleteProductIntroductionTestWhenProductIsNull() { + // Given + String productId = "testProductId"; + // When + given(productRepository.findById(anyString())).willReturn(Optional.empty()); + // Then: 검증 로직 추가 (예: 이미지가 등록되어 있을 때 예외가 발생하는지 확인) + assertThrows(ResourceNotFoundException.class, + () -> productIntroductionDeleteService.deleteProductIntroduction(ADMIN, productId)); + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionSaveImgMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionSaveImgMockTest.java index 7a89cac7..064543b0 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionSaveImgMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionSaveImgMockTest.java @@ -15,24 +15,24 @@ @ExtendWith(MockitoExtension.class) class ProductIntroductionSaveImgMockTest { - @InjectMocks - ProductIntroductionImgSaveServiceImpl productIntroductionImgSaveService; - @Mock - S3UploaderApi s3Uploader; + @InjectMocks + ProductIntroductionImgSaveServiceImpl productIntroductionImgSaveService; + @Mock + S3UploaderApi s3Uploader; - @Test - void saveProductIntroductionImageTest() { - MultipartFile productIntroductionTestImage = mock(MultipartFile.class); - // Given - when(s3Uploader.upload(productIntroductionTestImage)).thenReturn("MockImageUrl"); + @Test + void saveProductIntroductionImageTest() { + MultipartFile productIntroductionTestImage = mock(MultipartFile.class); + // Given + when(s3Uploader.upload(productIntroductionTestImage)).thenReturn("MockImageUrl"); - // When - String url = productIntroductionImgSaveService.saveProductIntroductionImageByAdmin(ADMIN, - productIntroductionTestImage); + // When + String url = productIntroductionImgSaveService.saveProductIntroductionImageByAdmin(ADMIN, + productIntroductionTestImage); - // Then: 검증 로직 추가 (예: createContent 메소드 호출 확인) - verify(s3Uploader).upload(productIntroductionTestImage); - assertEquals("MockImageUrl", url); - } + // Then: 검증 로직 추가 (예: createContent 메소드 호출 확인) + verify(s3Uploader).upload(productIntroductionTestImage); + assertEquals("MockImageUrl", url); + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionUpsertMockTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionUpsertMockTest.java index 91880730..e9f6c3c2 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionUpsertMockTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/ProductIntroductionUpsertMockTest.java @@ -18,37 +18,37 @@ @ExtendWith(MockitoExtension.class) class ProductIntroductionUpsertMockTest { - @InjectMocks - ProductIntroductionUpsertServiceImpl productIntroductionUpsertService; - - @Mock - ProductRepository productRepository; - - @Test - void upsertProductIntroductionTest() { - // Given - String productId = "testProductId"; - String content = "testContent"; - Product mockProduct = mock(Product.class); - given(productRepository.findById(anyString())).willReturn(Optional.of(mockProduct)); - - // When - productIntroductionUpsertService.upsertProductIntroductionByAdmin(ADMIN, productId, content); - - // Then: 검증 로직 추가 (예: createContent 메소드 호출 확인) - verify(mockProduct).createContent(content); - } - - @Test - void upsertProductIntroductionTestWhenProductIsNull() { - // Given - String productId = "testProductId"; - String content = "testContent"; - // When - given(productRepository.findById(anyString())).willReturn(Optional.empty()); - // Then: 검증 로직 추가 (예: 이미지가 등록되어 있을 때 예외가 발생하는지 확인) - assertThrows(ResourceNotFoundException.class, - () -> productIntroductionUpsertService.upsertProductIntroductionByAdmin(ADMIN, productId, content)); - } + @InjectMocks + ProductIntroductionUpsertServiceImpl productIntroductionUpsertService; + + @Mock + ProductRepository productRepository; + + @Test + void upsertProductIntroductionTest() { + // Given + String productId = "testProductId"; + String content = "testContent"; + Product mockProduct = mock(Product.class); + given(productRepository.findById(anyString())).willReturn(Optional.of(mockProduct)); + + // When + productIntroductionUpsertService.upsertProductIntroductionByAdmin(ADMIN, productId, content); + + // Then: 검증 로직 추가 (예: createContent 메소드 호출 확인) + verify(mockProduct).createContent(content); + } + + @Test + void upsertProductIntroductionTestWhenProductIsNull() { + // Given + String productId = "testProductId"; + String content = "testContent"; + // When + given(productRepository.findById(anyString())).willReturn(Optional.empty()); + // Then: 검증 로직 추가 (예: 이미지가 등록되어 있을 때 예외가 발생하는지 확인) + assertThrows(ResourceNotFoundException.class, + () -> productIntroductionUpsertService.upsertProductIntroductionByAdmin(ADMIN, productId, content)); + } } diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/DeliveryOptionAdminControllerTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/DeliveryOptionAdminControllerTest.java index ee9265e3..fb97265e 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/DeliveryOptionAdminControllerTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/DeliveryOptionAdminControllerTest.java @@ -109,4 +109,4 @@ void updatedDefaultDeliveryFee_whenFeeIsNull() throws Exception { .andDo(print()) .andExpect(status().isBadRequest()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/DeliveryOptionControllerTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/DeliveryOptionControllerTest.java index 11be5373..ca712678 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/DeliveryOptionControllerTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/DeliveryOptionControllerTest.java @@ -43,4 +43,4 @@ void getDefaultDeliveryFee() throws Exception { .andExpect(jsonPath("$.feeUpdatedAt").value(now.toString())); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ImageControllerTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ImageControllerTest.java index 3a5d0a2a..21d70ba5 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ImageControllerTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ImageControllerTest.java @@ -113,4 +113,4 @@ void success() throws Exception { .andExpect(jsonPath("$.beforeUrl").value(exp.beforeUrl())) .andExpect(jsonPath("$.afterUrl").value(exp.afterUrl())); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ReviewControllerTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ReviewControllerTest.java index dd09957d..d91f3e82 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ReviewControllerTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ReviewControllerTest.java @@ -71,4 +71,4 @@ void reviewRetrieveTest() throws Exception { } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ReviewReplyAdminControllerTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ReviewReplyAdminControllerTest.java index 6bf50aeb..01b7b334 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ReviewReplyAdminControllerTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/ReviewReplyAdminControllerTest.java @@ -72,7 +72,7 @@ void CREATE_REPLY_FAIL_STATUS_FORBIDDEN_InvalidRoleException() throws Exception .when(reviewReplyCreateService) .createReviewReplyByAdmin(any(), any(), any(), any()); - given(exceptionHandler.handleGlobalException(any(), any())) + given(exceptionHandler.handleGlobalException(any(), any())) .willReturn( ResponseEntity.status(HttpStatus.FORBIDDEN) .body(ErrorResponse.createErrorResponse(exception, String.format(createReplyUrl, mockReviewId))) @@ -104,7 +104,7 @@ void CREATE_REPLY_FAIL_STATUS_NOT_FOUND_ResourceNotFoundException() throws Excep .when(reviewReplyCreateService) .createReviewReplyByAdmin(any(), any(), any(), any()); - given(exceptionHandler.handleGlobalException(any(), any())) + given(exceptionHandler.handleGlobalException(any(), any())) .willReturn( ResponseEntity.status(exception.getHttpStatus()) .body(ErrorResponse.createErrorResponse(exception, String.format(createReplyUrl, mockReviewId))) @@ -129,4 +129,4 @@ void CREATE_REPLY_FAIL_STATUS_NOT_FOUND_ResourceNotFoundException() throws Excep } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/VBankAdminControllerTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/VBankAdminControllerTest.java index 74311393..be59b624 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/controller/VBankAdminControllerTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/controller/VBankAdminControllerTest.java @@ -130,4 +130,4 @@ void deleteVBank() throws Exception { .andExpect(status().isOk()); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/entity/OrdersEntityTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/entity/OrdersEntityTest.java index 63302006..df8146d6 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/entity/OrdersEntityTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/entity/OrdersEntityTest.java @@ -91,4 +91,4 @@ public void deleteS3Image() { } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/repository/OrderQueryDslRepositoryImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/repository/OrderQueryDslRepositoryImplTest.java index 13165fab..0fae8027 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/repository/OrderQueryDslRepositoryImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/repository/OrderQueryDslRepositoryImplTest.java @@ -77,4 +77,4 @@ void ready_filtering_test() throws Exception { } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/repository/ReviewQueryDslRepositoryImplTest.java b/liberty-main-service/src/test/java/com/liberty52/main/service/repository/ReviewQueryDslRepositoryImplTest.java index a9d978db..25d8c795 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/repository/ReviewQueryDslRepositoryImplTest.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/repository/ReviewQueryDslRepositoryImplTest.java @@ -67,4 +67,4 @@ void photoFilterTest_NotFiltering() throws Exception { assertThat(response.getContents().size()).isSameAs(10); } -} \ No newline at end of file +} diff --git a/liberty-main-service/src/test/java/com/liberty52/main/service/utils/TestInitiator.java b/liberty-main-service/src/test/java/com/liberty52/main/service/utils/TestInitiator.java index e561eba6..ae656576 100644 --- a/liberty-main-service/src/test/java/com/liberty52/main/service/utils/TestInitiator.java +++ b/liberty-main-service/src/test/java/com/liberty52/main/service/utils/TestInitiator.java @@ -95,4 +95,4 @@ public static String initDataForTestingOrder(EntityManager em) { } -} \ No newline at end of file +}