From 4e3e2c765a40ef5d8d9090f8a7dd7c01378b239e Mon Sep 17 00:00:00 2001 From: can019 Date: Wed, 10 Sep 2025 15:54:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20mapper=20=EB=B0=8F=20global?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icebang/UserServiceApplication.java | 2 +- .../{ => domain/auth}/mapper/AuthMapper.java | 2 +- .../auth/service/AuthCredentialAdapter.java | 2 +- .../domain/auth/service/AuthService.java | 2 +- .../mapper/OrganizationMapper.java | 2 +- .../service/OrganizationService.java | 2 +- .../schedule}/mapper/ScheduleMapper.java | 2 +- .../schedule/runner/SchedulerInitializer.java | 2 +- .../{ => domain/user}/mapper/UserMapper.java | 2 +- .../domain/user/service/UserService.java | 14 +----------- .../com/gltkorea/icebang/entity/Users.java | 22 ------------------- .../aop/logging/LoggingAspect.java | 2 +- .../{ => global}/config/WebConfig.java | 2 +- .../typehandler/StringListTypeHandler.java | 2 +- .../config/scheduler/SchedulerConfig.java | 2 +- .../config/security/SecurityConfig.java | 4 ++-- .../security/endpoints/SecurityEndpoints.java | 2 +- .../{ => global}/filter/LoggingFilter.java | 2 +- .../resources/mybatis/mapper/AuthMapper.xml | 2 +- .../mybatis/mapper/OrganizationMapper.xml | 2 +- .../mybatis/mapper/ScheduleMapper.xml | 2 +- 21 files changed, 21 insertions(+), 55 deletions(-) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => domain/auth}/mapper/AuthMapper.java (91%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => domain/organization}/mapper/OrganizationMapper.java (93%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => domain/schedule}/mapper/ScheduleMapper.java (81%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => domain/user}/mapper/UserMapper.java (85%) delete mode 100644 apps/user-service/src/main/java/com/gltkorea/icebang/entity/Users.java rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => global}/aop/logging/LoggingAspect.java (97%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => global}/config/WebConfig.java (95%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => global}/config/mybatis/typehandler/StringListTypeHandler.java (95%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => global}/config/scheduler/SchedulerConfig.java (94%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => global}/config/security/SecurityConfig.java (97%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => global}/config/security/endpoints/SecurityEndpoints.java (93%) rename apps/user-service/src/main/java/com/gltkorea/icebang/{ => global}/filter/LoggingFilter.java (96%) diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/UserServiceApplication.java b/apps/user-service/src/main/java/com/gltkorea/icebang/UserServiceApplication.java index 002a6bc4..0f589c16 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/UserServiceApplication.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/UserServiceApplication.java @@ -9,7 +9,7 @@ @EnableScheduling @EnableBatchProcessing @SpringBootApplication -@MapperScan("com.gltkorea.icebang.mapper") +@MapperScan("com.gltkorea.icebang.**.mapper") public class UserServiceApplication { public static void main(String[] args) { diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/AuthMapper.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/mapper/AuthMapper.java similarity index 91% rename from apps/user-service/src/main/java/com/gltkorea/icebang/mapper/AuthMapper.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/mapper/AuthMapper.java index 4480daf0..e1be1588 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/AuthMapper.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/mapper/AuthMapper.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.mapper; +package com.gltkorea.icebang.domain.auth.mapper; import org.apache.ibatis.annotations.Mapper; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/service/AuthCredentialAdapter.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/service/AuthCredentialAdapter.java index e3268314..9e34ab48 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/service/AuthCredentialAdapter.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/service/AuthCredentialAdapter.java @@ -5,8 +5,8 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import com.gltkorea.icebang.domain.auth.mapper.AuthMapper; import com.gltkorea.icebang.domain.auth.model.AuthCredential; -import com.gltkorea.icebang.mapper.AuthMapper; import lombok.RequiredArgsConstructor; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/service/AuthService.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/service/AuthService.java index 18010ed5..6dc08e11 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/service/AuthService.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/auth/service/AuthService.java @@ -6,9 +6,9 @@ import com.gltkorea.icebang.common.utils.RandomPasswordGenerator; import com.gltkorea.icebang.domain.auth.dto.RegisterDto; +import com.gltkorea.icebang.domain.auth.mapper.AuthMapper; import com.gltkorea.icebang.domain.email.dto.EmailRequest; import com.gltkorea.icebang.domain.email.service.EmailService; -import com.gltkorea.icebang.mapper.AuthMapper; import lombok.RequiredArgsConstructor; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/OrganizationMapper.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/mapper/OrganizationMapper.java similarity index 93% rename from apps/user-service/src/main/java/com/gltkorea/icebang/mapper/OrganizationMapper.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/mapper/OrganizationMapper.java index a7624bc6..2a28c5aa 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/OrganizationMapper.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/mapper/OrganizationMapper.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.mapper; +package com.gltkorea.icebang.domain.organization.mapper; import java.math.BigInteger; import java.util.List; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/service/OrganizationService.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/service/OrganizationService.java index 84bcc54c..d739abea 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/service/OrganizationService.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/service/OrganizationService.java @@ -9,9 +9,9 @@ import com.gltkorea.icebang.domain.department.dto.DepartmentCardDo; import com.gltkorea.icebang.domain.organization.dto.OrganizationCardDto; import com.gltkorea.icebang.domain.organization.dto.OrganizationOptionDto; +import com.gltkorea.icebang.domain.organization.mapper.OrganizationMapper; import com.gltkorea.icebang.domain.position.dto.PositionCardDto; import com.gltkorea.icebang.domain.roles.dto.RoleCardDto; -import com.gltkorea.icebang.mapper.OrganizationMapper; import lombok.RequiredArgsConstructor; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/ScheduleMapper.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/schedule/mapper/ScheduleMapper.java similarity index 81% rename from apps/user-service/src/main/java/com/gltkorea/icebang/mapper/ScheduleMapper.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/domain/schedule/mapper/ScheduleMapper.java index 7220dc9e..b7c6337e 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/ScheduleMapper.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/schedule/mapper/ScheduleMapper.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.mapper; +package com.gltkorea.icebang.domain.schedule.mapper; import java.util.List; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/schedule/runner/SchedulerInitializer.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/schedule/runner/SchedulerInitializer.java index 7f96bba8..b4232ecc 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/schedule/runner/SchedulerInitializer.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/schedule/runner/SchedulerInitializer.java @@ -6,9 +6,9 @@ import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; +import com.gltkorea.icebang.domain.schedule.mapper.ScheduleMapper; import com.gltkorea.icebang.domain.schedule.model.Schedule; import com.gltkorea.icebang.domain.schedule.service.DynamicSchedulerService; -import com.gltkorea.icebang.mapper.ScheduleMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/UserMapper.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/user/mapper/UserMapper.java similarity index 85% rename from apps/user-service/src/main/java/com/gltkorea/icebang/mapper/UserMapper.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/domain/user/mapper/UserMapper.java index 734fe8d5..bf9d9942 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/UserMapper.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/user/mapper/UserMapper.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.mapper; +package com.gltkorea.icebang.domain.user.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/user/service/UserService.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/user/service/UserService.java index fcf87ac9..4f163a72 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/user/service/UserService.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/user/service/UserService.java @@ -3,10 +3,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.gltkorea.icebang.domain.auth.dto.RegisterDto; import com.gltkorea.icebang.domain.user.dto.CheckEmailRequest; -import com.gltkorea.icebang.entity.Users; -import com.gltkorea.icebang.mapper.UserMapper; +import com.gltkorea.icebang.domain.user.mapper.UserMapper; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -16,16 +14,6 @@ public class UserService { private final UserMapper userMapper; - public void registerUser(RegisterDto registerDto) { - Users user = - Users.builder() - .name(registerDto.getName()) - .email(registerDto.getEmail()) - .password(registerDto.getPassword()) - .status("PENDING") - .build(); - } - @Transactional(readOnly = true) public Boolean isExistEmail(@Valid CheckEmailRequest request) { return userMapper.existsByEmail(request.getEmail()); diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/entity/Users.java b/apps/user-service/src/main/java/com/gltkorea/icebang/entity/Users.java deleted file mode 100644 index 44f30244..00000000 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/entity/Users.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gltkorea.icebang.entity; - -import java.math.BigInteger; -import java.time.LocalDateTime; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; - -@Data -@Builder -@AllArgsConstructor -@Deprecated -public class Users { - private BigInteger id; - private String name; - private String email; - private String password; - private String status; - private LocalDateTime createdAt; - private LocalDateTime updatedAt; -} diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/aop/logging/LoggingAspect.java b/apps/user-service/src/main/java/com/gltkorea/icebang/global/aop/logging/LoggingAspect.java similarity index 97% rename from apps/user-service/src/main/java/com/gltkorea/icebang/aop/logging/LoggingAspect.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/global/aop/logging/LoggingAspect.java index 0441820d..79d102f7 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/aop/logging/LoggingAspect.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/global/aop/logging/LoggingAspect.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.aop.logging; +package com.gltkorea.icebang.global.aop.logging; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/config/WebConfig.java b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/WebConfig.java similarity index 95% rename from apps/user-service/src/main/java/com/gltkorea/icebang/config/WebConfig.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/global/config/WebConfig.java index 1ed10098..3cbcafef 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/config/WebConfig.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.config; +package com.gltkorea.icebang.global.config; import java.time.Duration; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/config/mybatis/typehandler/StringListTypeHandler.java b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/mybatis/typehandler/StringListTypeHandler.java similarity index 95% rename from apps/user-service/src/main/java/com/gltkorea/icebang/config/mybatis/typehandler/StringListTypeHandler.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/global/config/mybatis/typehandler/StringListTypeHandler.java index 4363124c..f49733e3 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/config/mybatis/typehandler/StringListTypeHandler.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/mybatis/typehandler/StringListTypeHandler.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.config.mybatis.typehandler; +package com.gltkorea.icebang.global.config.mybatis.typehandler; import java.sql.CallableStatement; import java.sql.PreparedStatement; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/config/scheduler/SchedulerConfig.java b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/scheduler/SchedulerConfig.java similarity index 94% rename from apps/user-service/src/main/java/com/gltkorea/icebang/config/scheduler/SchedulerConfig.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/global/config/scheduler/SchedulerConfig.java index 592eb0d7..ebb64aee 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/config/scheduler/SchedulerConfig.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/scheduler/SchedulerConfig.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.config.scheduler; +package com.gltkorea.icebang.global.config.scheduler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/config/security/SecurityConfig.java b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/security/SecurityConfig.java similarity index 97% rename from apps/user-service/src/main/java/com/gltkorea/icebang/config/security/SecurityConfig.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/global/config/security/SecurityConfig.java index bde09f6e..884553b3 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/config/security/SecurityConfig.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/security/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.config.security; +package com.gltkorea.icebang.global.config.security; import java.security.SecureRandom; @@ -19,8 +19,8 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import com.gltkorea.icebang.config.security.endpoints.SecurityEndpoints; import com.gltkorea.icebang.domain.auth.service.AuthCredentialAdapter; +import com.gltkorea.icebang.global.config.security.endpoints.SecurityEndpoints; import lombok.RequiredArgsConstructor; diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/config/security/endpoints/SecurityEndpoints.java b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/security/endpoints/SecurityEndpoints.java similarity index 93% rename from apps/user-service/src/main/java/com/gltkorea/icebang/config/security/endpoints/SecurityEndpoints.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/global/config/security/endpoints/SecurityEndpoints.java index 5236edef..9c7e0162 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/config/security/endpoints/SecurityEndpoints.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/global/config/security/endpoints/SecurityEndpoints.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.config.security.endpoints; +package com.gltkorea.icebang.global.config.security.endpoints; public enum SecurityEndpoints { PUBLIC( diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/filter/LoggingFilter.java b/apps/user-service/src/main/java/com/gltkorea/icebang/global/filter/LoggingFilter.java similarity index 96% rename from apps/user-service/src/main/java/com/gltkorea/icebang/filter/LoggingFilter.java rename to apps/user-service/src/main/java/com/gltkorea/icebang/global/filter/LoggingFilter.java index e8dda321..116d87ed 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/filter/LoggingFilter.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/global/filter/LoggingFilter.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.filter; +package com.gltkorea.icebang.global.filter; import java.io.IOException; import java.util.UUID; diff --git a/apps/user-service/src/main/resources/mybatis/mapper/AuthMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/AuthMapper.xml index 154dbb39..2b3baeb1 100644 --- a/apps/user-service/src/main/resources/mybatis/mapper/AuthMapper.xml +++ b/apps/user-service/src/main/resources/mybatis/mapper/AuthMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/apps/user-service/src/main/resources/mybatis/mapper/ScheduleMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/ScheduleMapper.xml index 50d6b15c..db520326 100644 --- a/apps/user-service/src/main/resources/mybatis/mapper/ScheduleMapper.xml +++ b/apps/user-service/src/main/resources/mybatis/mapper/ScheduleMapper.xml @@ -1,7 +1,7 @@ - + SELECT EXISTS( @@ -13,7 +13,7 @@ - SELECT u.id, u.email, @@ -30,17 +30,17 @@ LIMIT 1 - + INSERT INTO user (name, email, password) VALUES (#{name}, #{email}, #{password}); - + INSERT INTO user_organization (user_id, organization_id, department_id, position_id, status) VALUES (#{id}, #{orgId}, #{deptId}, #{positionId}, #{status}); - + INSERT INTO user_role (user_organization_id, role_id) VALUES diff --git a/apps/user-service/src/main/resources/mybatis/mapper/OrganizationMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/OrganizationMapper.xml index 2cc8801d..40abe4d5 100644 --- a/apps/user-service/src/main/resources/mybatis/mapper/OrganizationMapper.xml +++ b/apps/user-service/src/main/resources/mybatis/mapper/OrganizationMapper.xml @@ -2,10 +2,10 @@ - + SELECT + diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/TestUserServiceApplication.java b/apps/user-service/src/test/java/site/icebang/TestUserServiceApplication.java similarity index 90% rename from apps/user-service/src/test/java/com/gltkorea/icebang/TestUserServiceApplication.java rename to apps/user-service/src/test/java/site/icebang/TestUserServiceApplication.java index f53fa0a9..ba8c2403 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/TestUserServiceApplication.java +++ b/apps/user-service/src/test/java/site/icebang/TestUserServiceApplication.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang; +package site.icebang; import org.springframework.boot.SpringApplication; diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/TestcontainersConfiguration.java b/apps/user-service/src/test/java/site/icebang/TestcontainersConfiguration.java similarity index 83% rename from apps/user-service/src/test/java/com/gltkorea/icebang/TestcontainersConfiguration.java rename to apps/user-service/src/test/java/site/icebang/TestcontainersConfiguration.java index bbe8ed02..b9eb7b76 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/TestcontainersConfiguration.java +++ b/apps/user-service/src/test/java/site/icebang/TestcontainersConfiguration.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang; +package site.icebang; import org.springframework.boot.test.context.TestConfiguration; diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/scenario/ContextLoadE2eTests.java b/apps/user-service/src/test/java/site/icebang/e2e/scenario/ContextLoadE2eTests.java similarity index 54% rename from apps/user-service/src/test/java/com/gltkorea/icebang/e2e/scenario/ContextLoadE2eTests.java rename to apps/user-service/src/test/java/site/icebang/e2e/scenario/ContextLoadE2eTests.java index ad6bfbf0..29e5857c 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/scenario/ContextLoadE2eTests.java +++ b/apps/user-service/src/test/java/site/icebang/e2e/scenario/ContextLoadE2eTests.java @@ -1,8 +1,8 @@ -package com.gltkorea.icebang.e2e.scenario; +package site.icebang.e2e.scenario; import org.junit.jupiter.api.Test; -import com.gltkorea.icebang.e2e.setup.support.E2eTestSupport; +import site.icebang.e2e.setup.support.E2eTestSupport; class ContextLoadE2eTests extends E2eTestSupport { diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java b/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java similarity index 99% rename from apps/user-service/src/test/java/com/gltkorea/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java rename to apps/user-service/src/test/java/site/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java index 762d5ca4..a873d2d5 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java +++ b/apps/user-service/src/test/java/site/icebang/e2e/scenario/UserRegistrationFlowE2eTest.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.e2e.scenario; +package site.icebang.e2e.scenario; import static org.assertj.core.api.Assertions.*; @@ -13,7 +13,7 @@ import org.springframework.http.*; import org.springframework.test.context.jdbc.Sql; -import com.gltkorea.icebang.e2e.setup.support.E2eTestSupport; +import site.icebang.e2e.setup.support.E2eTestSupport; @Sql( value = "classpath:sql/01-insert-internal-users.sql", diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/annotation/E2eTest.java b/apps/user-service/src/test/java/site/icebang/e2e/setup/annotation/E2eTest.java similarity index 88% rename from apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/annotation/E2eTest.java rename to apps/user-service/src/test/java/site/icebang/e2e/setup/annotation/E2eTest.java index 0f087064..e7d3ef09 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/annotation/E2eTest.java +++ b/apps/user-service/src/test/java/site/icebang/e2e/setup/annotation/E2eTest.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.e2e.setup.annotation; +package site.icebang.e2e.setup.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/config/E2eTestConfiguration.java b/apps/user-service/src/test/java/site/icebang/e2e/setup/config/E2eTestConfiguration.java similarity index 97% rename from apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/config/E2eTestConfiguration.java rename to apps/user-service/src/test/java/site/icebang/e2e/setup/config/E2eTestConfiguration.java index 4ee26803..4976d0b8 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/config/E2eTestConfiguration.java +++ b/apps/user-service/src/test/java/site/icebang/e2e/setup/config/E2eTestConfiguration.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.e2e.setup.config; +package site.icebang.e2e.setup.config; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/support/E2eTestSupport.java b/apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupport.java similarity index 91% rename from apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/support/E2eTestSupport.java rename to apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupport.java index b72ac031..c2d10870 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/support/E2eTestSupport.java +++ b/apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupport.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.e2e.setup.support; +package site.icebang.e2e.setup.support; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -9,8 +9,8 @@ import org.springframework.web.context.WebApplicationContext; import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper; -import com.gltkorea.icebang.e2e.setup.annotation.E2eTest; -import com.gltkorea.icebang.e2e.setup.config.E2eTestConfiguration; +import site.icebang.e2e.setup.annotation.E2eTest; +import site.icebang.e2e.setup.config.E2eTestConfiguration; @Import(E2eTestConfiguration.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/support/E2eTestSupportTest.java b/apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupportTest.java similarity index 90% rename from apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/support/E2eTestSupportTest.java rename to apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupportTest.java index 33bfd4dc..f9fe164e 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/e2e/setup/support/E2eTestSupportTest.java +++ b/apps/user-service/src/test/java/site/icebang/e2e/setup/support/E2eTestSupportTest.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.e2e.setup.support; +package site.icebang.e2e.setup.support; import static org.assertj.core.api.Assertions.assertThat; diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/annotation/IntegrationTest.java b/apps/user-service/src/test/java/site/icebang/integration/setup/annotation/IntegrationTest.java similarity index 87% rename from apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/annotation/IntegrationTest.java rename to apps/user-service/src/test/java/site/icebang/integration/setup/annotation/IntegrationTest.java index ec111866..77dfddf9 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/annotation/IntegrationTest.java +++ b/apps/user-service/src/test/java/site/icebang/integration/setup/annotation/IntegrationTest.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.integration.setup.annotation; +package site.icebang.integration.setup.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/config/RestDocsConfiguration.java b/apps/user-service/src/test/java/site/icebang/integration/setup/config/RestDocsConfiguration.java similarity index 94% rename from apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/config/RestDocsConfiguration.java rename to apps/user-service/src/test/java/site/icebang/integration/setup/config/RestDocsConfiguration.java index eeb97ffc..f60de9cc 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/config/RestDocsConfiguration.java +++ b/apps/user-service/src/test/java/site/icebang/integration/setup/config/RestDocsConfiguration.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.integration.setup.config; +package site.icebang.integration.setup.config; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/support/IntegrationTestSupport.java b/apps/user-service/src/test/java/site/icebang/integration/setup/support/IntegrationTestSupport.java similarity index 84% rename from apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/support/IntegrationTestSupport.java rename to apps/user-service/src/test/java/site/icebang/integration/setup/support/IntegrationTestSupport.java index 037f37e5..ca28cd37 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/setup/support/IntegrationTestSupport.java +++ b/apps/user-service/src/test/java/site/icebang/integration/setup/support/IntegrationTestSupport.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.integration.setup.support; +package site.icebang.integration.setup.support; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; @@ -9,8 +9,9 @@ import org.springframework.test.web.servlet.MockMvc; import com.fasterxml.jackson.databind.ObjectMapper; -import com.gltkorea.icebang.integration.setup.annotation.IntegrationTest; -import com.gltkorea.icebang.integration.setup.config.RestDocsConfiguration; + +import site.icebang.integration.setup.annotation.IntegrationTest; +import site.icebang.integration.setup.config.RestDocsConfiguration; @IntegrationTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/tests/auth/AuthApiIntegrationTest.java b/apps/user-service/src/test/java/site/icebang/integration/tests/auth/AuthApiIntegrationTest.java similarity index 96% rename from apps/user-service/src/test/java/com/gltkorea/icebang/integration/tests/auth/AuthApiIntegrationTest.java rename to apps/user-service/src/test/java/site/icebang/integration/tests/auth/AuthApiIntegrationTest.java index 0d1e5d19..5c538105 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/tests/auth/AuthApiIntegrationTest.java +++ b/apps/user-service/src/test/java/site/icebang/integration/tests/auth/AuthApiIntegrationTest.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.integration.tests.auth; +package site.icebang.integration.tests.auth; import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; import static com.epages.restdocs.apispec.ResourceDocumentation.*; @@ -18,7 +18,8 @@ import org.springframework.transaction.annotation.Transactional; import com.epages.restdocs.apispec.ResourceSnippetParameters; -import com.gltkorea.icebang.integration.setup.support.IntegrationTestSupport; + +import site.icebang.integration.setup.support.IntegrationTestSupport; @Sql( value = "classpath:sql/01-insert-internal-users.sql", diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/tests/organization/OrganizationApiIntegrationTest.java b/apps/user-service/src/test/java/site/icebang/integration/tests/organization/OrganizationApiIntegrationTest.java similarity index 98% rename from apps/user-service/src/test/java/com/gltkorea/icebang/integration/tests/organization/OrganizationApiIntegrationTest.java rename to apps/user-service/src/test/java/site/icebang/integration/tests/organization/OrganizationApiIntegrationTest.java index 5d458146..666a8ea5 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/integration/tests/organization/OrganizationApiIntegrationTest.java +++ b/apps/user-service/src/test/java/site/icebang/integration/tests/organization/OrganizationApiIntegrationTest.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.integration.tests.organization; +package site.icebang.integration.tests.organization; import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; import static com.epages.restdocs.apispec.ResourceDocumentation.*; @@ -17,7 +17,8 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.fasterxml.jackson.databind.JsonNode; -import com.gltkorea.icebang.integration.setup.support.IntegrationTestSupport; + +import site.icebang.integration.setup.support.IntegrationTestSupport; @Sql( value = { diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/unit/setup/annotation/UnitTest.java b/apps/user-service/src/test/java/site/icebang/unit/setup/annotation/UnitTest.java similarity index 88% rename from apps/user-service/src/test/java/com/gltkorea/icebang/unit/setup/annotation/UnitTest.java rename to apps/user-service/src/test/java/site/icebang/unit/setup/annotation/UnitTest.java index cb2f975c..65afc91b 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/unit/setup/annotation/UnitTest.java +++ b/apps/user-service/src/test/java/site/icebang/unit/setup/annotation/UnitTest.java @@ -1,4 +1,4 @@ -package com.gltkorea.icebang.unit.setup.annotation; +package site.icebang.unit.setup.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/apps/user-service/src/test/java/com/gltkorea/icebang/unit/setup/support/UnitTestSupport.java b/apps/user-service/src/test/java/site/icebang/unit/setup/support/UnitTestSupport.java similarity index 60% rename from apps/user-service/src/test/java/com/gltkorea/icebang/unit/setup/support/UnitTestSupport.java rename to apps/user-service/src/test/java/site/icebang/unit/setup/support/UnitTestSupport.java index 9bc71657..3977703c 100644 --- a/apps/user-service/src/test/java/com/gltkorea/icebang/unit/setup/support/UnitTestSupport.java +++ b/apps/user-service/src/test/java/site/icebang/unit/setup/support/UnitTestSupport.java @@ -1,6 +1,6 @@ -package com.gltkorea.icebang.unit.setup.support; +package site.icebang.unit.setup.support; -import com.gltkorea.icebang.unit.setup.annotation.UnitTest; +import site.icebang.unit.setup.annotation.UnitTest; @UnitTest public abstract class UnitTestSupport {