From 24e69f27f0c48be18ded91709e073df1e3ad2802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A3=BC=EC=84=B1?= <32183520@dankook.ac.kr> Date: Wed, 17 Jan 2024 16:13:13 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[BE]=20chore(#35):=20Redis=20=EC=9D=98?= =?UTF-8?q?=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/build.gradle b/backend/build.gradle index 2136b2115..f7e6c02e1 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -59,6 +59,9 @@ dependencies { // Webflux implementation 'org.springframework.boot:spring-boot-starter-webflux' + + // Redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis' } tasks.named('test') { From a8a341dda4fea22ce5ca237d0c0caeb0b428347d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A3=BC=EC=84=B1?= <32183520@dankook.ac.kr> Date: Thu, 18 Jan 2024 09:49:52 +0900 Subject: [PATCH 2/5] =?UTF-8?q?refactor(#35):=20mysql=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * mysql 관련 도메인 mysql 패키지로 묶어주기 * JpaConfig 설정 추가 --- .../auth/response/AuthLoginPageResponse.java | 2 +- .../controller/auth/response/AuthLoginResponse.java | 2 +- .../backend/auth/api/service/auth/AuthService.java | 6 ++---- .../backend/auth/api/service/oauth/OAuthService.java | 5 ++--- .../service/oauth/adapter/github/GithubAdapter.java | 2 +- .../auth/api/service/oauth/response/OAuthResponse.java | 2 +- .../security/filter/JwtAuthenticationFilter.java | 4 ++-- .../example/backend/domain/mysql/config/JpaConfig.java | 10 ++++++++++ .../backend/domain/{ => mysql}/define/user/User.java | 6 +++--- .../define/user/constant/UserPlatformType.java | 2 +- .../{ => mysql}/define/user/constant/UserRole.java | 2 +- .../define/user/repository/UserRepository.java | 4 ++-- .../test/java/com/example/backend/auth/TestConfig.java | 6 +++--- .../backend/auth/api/service/jwt/JwtServiceTest.java | 9 ++------- .../auth/api/service/oauth/OAuthServiceTest.java | 2 +- .../oauth/adapter/github/GithubAdapterTest.java | 3 +-- .../auth/config/security/SecurityConfigTest.java | 6 +++--- .../define/user/repository/UserRepositoryTest.java | 3 ++- 18 files changed, 39 insertions(+), 37 deletions(-) create mode 100644 backend/src/main/java/com/example/backend/domain/mysql/config/JpaConfig.java rename backend/src/main/java/com/example/backend/domain/{ => mysql}/define/user/User.java (94%) rename backend/src/main/java/com/example/backend/domain/{ => mysql}/define/user/constant/UserPlatformType.java (82%) rename backend/src/main/java/com/example/backend/domain/{ => mysql}/define/user/constant/UserRole.java (79%) rename backend/src/main/java/com/example/backend/domain/{ => mysql}/define/user/repository/UserRepository.java (72%) diff --git a/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginPageResponse.java b/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginPageResponse.java index db8a0c88e..b94e8dbfd 100644 --- a/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginPageResponse.java +++ b/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginPageResponse.java @@ -1,6 +1,6 @@ package com.example.backend.auth.api.controller.auth.response; -import com.example.backend.domain.define.user.constant.UserPlatformType; +import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginResponse.java b/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginResponse.java index 4be7868f7..3a50ed2db 100644 --- a/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginResponse.java +++ b/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginResponse.java @@ -1,6 +1,6 @@ package com.example.backend.auth.api.controller.auth.response; -import com.example.backend.domain.define.user.constant.UserRole; +import com.example.backend.domain.mysql.define.user.constant.UserRole; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/auth/api/service/auth/AuthService.java b/backend/src/main/java/com/example/backend/auth/api/service/auth/AuthService.java index 91b79a59f..6ac9e1277 100644 --- a/backend/src/main/java/com/example/backend/auth/api/service/auth/AuthService.java +++ b/backend/src/main/java/com/example/backend/auth/api/service/auth/AuthService.java @@ -3,15 +3,13 @@ import com.example.backend.auth.api.controller.auth.response.AuthLoginResponse; import com.example.backend.auth.api.service.oauth.OAuthService; import com.example.backend.auth.api.service.oauth.response.OAuthResponse; -import com.example.backend.domain.define.user.constant.UserPlatformType; -import com.example.backend.domain.define.user.repository.UserRepository; +import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; +import com.example.backend.domain.mysql.define.user.repository.UserRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Slf4j @Service @Transactional(readOnly = true) diff --git a/backend/src/main/java/com/example/backend/auth/api/service/oauth/OAuthService.java b/backend/src/main/java/com/example/backend/auth/api/service/oauth/OAuthService.java index f9094d817..3a4777d02 100644 --- a/backend/src/main/java/com/example/backend/auth/api/service/oauth/OAuthService.java +++ b/backend/src/main/java/com/example/backend/auth/api/service/oauth/OAuthService.java @@ -6,17 +6,16 @@ import com.example.backend.auth.api.service.oauth.builder.OAuthURLBuilder; import com.example.backend.auth.api.service.oauth.builder.github.GithubURLBuilder; import com.example.backend.auth.api.service.oauth.response.OAuthResponse; -import com.example.backend.domain.define.user.constant.UserPlatformType; +import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.example.backend.domain.define.user.constant.UserPlatformType.GITHUB; +import static com.example.backend.domain.mysql.define.user.constant.UserPlatformType.GITHUB; @Slf4j @Service diff --git a/backend/src/main/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapter.java b/backend/src/main/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapter.java index a70b84fcc..650623b8e 100644 --- a/backend/src/main/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapter.java +++ b/backend/src/main/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapter.java @@ -14,7 +14,7 @@ import java.net.URI; -import static com.example.backend.domain.define.user.constant.UserPlatformType.GITHUB; +import static com.example.backend.domain.mysql.define.user.constant.UserPlatformType.GITHUB; @Slf4j @Component diff --git a/backend/src/main/java/com/example/backend/auth/api/service/oauth/response/OAuthResponse.java b/backend/src/main/java/com/example/backend/auth/api/service/oauth/response/OAuthResponse.java index 726eb46ce..ca23d423e 100644 --- a/backend/src/main/java/com/example/backend/auth/api/service/oauth/response/OAuthResponse.java +++ b/backend/src/main/java/com/example/backend/auth/api/service/oauth/response/OAuthResponse.java @@ -1,6 +1,6 @@ package com.example.backend.auth.api.service.oauth.response; -import com.example.backend.domain.define.user.constant.UserPlatformType; +import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/auth/config/security/filter/JwtAuthenticationFilter.java b/backend/src/main/java/com/example/backend/auth/config/security/filter/JwtAuthenticationFilter.java index 2e6709f7d..765e9434e 100644 --- a/backend/src/main/java/com/example/backend/auth/config/security/filter/JwtAuthenticationFilter.java +++ b/backend/src/main/java/com/example/backend/auth/config/security/filter/JwtAuthenticationFilter.java @@ -4,8 +4,8 @@ import com.example.backend.common.exception.ExceptionMessage; import com.example.backend.common.exception.jwt.JwtException; import com.example.backend.common.response.JsonResult; -import com.example.backend.domain.define.user.User; -import com.example.backend.domain.define.user.constant.UserRole; +import com.example.backend.domain.mysql.define.user.User; +import com.example.backend.domain.mysql.define.user.constant.UserRole; import com.fasterxml.jackson.databind.ObjectMapper; import io.jsonwebtoken.*; import io.jsonwebtoken.security.SignatureException; diff --git a/backend/src/main/java/com/example/backend/domain/mysql/config/JpaConfig.java b/backend/src/main/java/com/example/backend/domain/mysql/config/JpaConfig.java new file mode 100644 index 000000000..622a05e1c --- /dev/null +++ b/backend/src/main/java/com/example/backend/domain/mysql/config/JpaConfig.java @@ -0,0 +1,10 @@ +package com.example.backend.domain.mysql.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@Configuration +@EnableTransactionManagement +public class JpaConfig { + +} diff --git a/backend/src/main/java/com/example/backend/domain/define/user/User.java b/backend/src/main/java/com/example/backend/domain/mysql/define/user/User.java similarity index 94% rename from backend/src/main/java/com/example/backend/domain/define/user/User.java rename to backend/src/main/java/com/example/backend/domain/mysql/define/user/User.java index 964989c2e..1dfe232d7 100644 --- a/backend/src/main/java/com/example/backend/domain/define/user/User.java +++ b/backend/src/main/java/com/example/backend/domain/mysql/define/user/User.java @@ -1,7 +1,7 @@ -package com.example.backend.domain.define.user; +package com.example.backend.domain.mysql.define.user; -import com.example.backend.domain.define.user.constant.UserPlatformType; -import com.example.backend.domain.define.user.constant.UserRole; +import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; +import com.example.backend.domain.mysql.define.user.constant.UserRole; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/backend/src/main/java/com/example/backend/domain/define/user/constant/UserPlatformType.java b/backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserPlatformType.java similarity index 82% rename from backend/src/main/java/com/example/backend/domain/define/user/constant/UserPlatformType.java rename to backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserPlatformType.java index 28666e70b..cbe8c40da 100644 --- a/backend/src/main/java/com/example/backend/domain/define/user/constant/UserPlatformType.java +++ b/backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserPlatformType.java @@ -1,4 +1,4 @@ -package com.example.backend.domain.define.user.constant; +package com.example.backend.domain.mysql.define.user.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/domain/define/user/constant/UserRole.java b/backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserRole.java similarity index 79% rename from backend/src/main/java/com/example/backend/domain/define/user/constant/UserRole.java rename to backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserRole.java index 0a1e1e5d1..496e6a043 100644 --- a/backend/src/main/java/com/example/backend/domain/define/user/constant/UserRole.java +++ b/backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserRole.java @@ -1,4 +1,4 @@ -package com.example.backend.domain.define.user.constant; +package com.example.backend.domain.mysql.define.user.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/domain/define/user/repository/UserRepository.java b/backend/src/main/java/com/example/backend/domain/mysql/define/user/repository/UserRepository.java similarity index 72% rename from backend/src/main/java/com/example/backend/domain/define/user/repository/UserRepository.java rename to backend/src/main/java/com/example/backend/domain/mysql/define/user/repository/UserRepository.java index 6b0d97170..adc50ff17 100644 --- a/backend/src/main/java/com/example/backend/domain/define/user/repository/UserRepository.java +++ b/backend/src/main/java/com/example/backend/domain/mysql/define/user/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.example.backend.domain.define.user.repository; +package com.example.backend.domain.mysql.define.user.repository; -import com.example.backend.domain.define.user.User; +import com.example.backend.domain.mysql.define.user.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/backend/src/test/java/com/example/backend/auth/TestConfig.java b/backend/src/test/java/com/example/backend/auth/TestConfig.java index 214e27c72..f6d50bcdc 100644 --- a/backend/src/test/java/com/example/backend/auth/TestConfig.java +++ b/backend/src/test/java/com/example/backend/auth/TestConfig.java @@ -16,9 +16,9 @@ */ -import com.example.backend.domain.define.user.User; -import com.example.backend.domain.define.user.constant.UserPlatformType; -import com.example.backend.domain.define.user.constant.UserRole; +import com.example.backend.domain.mysql.define.user.User; +import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; +import com.example.backend.domain.mysql.define.user.constant.UserRole; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; diff --git a/backend/src/test/java/com/example/backend/auth/api/service/jwt/JwtServiceTest.java b/backend/src/test/java/com/example/backend/auth/api/service/jwt/JwtServiceTest.java index 1dd499dd7..28ac2a27d 100644 --- a/backend/src/test/java/com/example/backend/auth/api/service/jwt/JwtServiceTest.java +++ b/backend/src/test/java/com/example/backend/auth/api/service/jwt/JwtServiceTest.java @@ -1,18 +1,14 @@ package com.example.backend.auth.api.service.jwt; import com.example.backend.auth.TestConfig; -import com.example.backend.common.exception.ExceptionMessage; -import com.example.backend.common.exception.jwt.JwtException; -import com.example.backend.domain.define.user.User; -import com.example.backend.domain.define.user.constant.UserRole; -import com.example.backend.domain.define.user.repository.UserRepository; +import com.example.backend.domain.mysql.define.user.User; +import com.example.backend.domain.mysql.define.user.repository.UserRepository; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import java.util.Date; import java.util.HashMap; @@ -20,7 +16,6 @@ import static org.junit.jupiter.api.Assertions.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.*; class JwtServiceTest extends TestConfig { diff --git a/backend/src/test/java/com/example/backend/auth/api/service/oauth/OAuthServiceTest.java b/backend/src/test/java/com/example/backend/auth/api/service/oauth/OAuthServiceTest.java index 3229c070b..ae706987c 100644 --- a/backend/src/test/java/com/example/backend/auth/api/service/oauth/OAuthServiceTest.java +++ b/backend/src/test/java/com/example/backend/auth/api/service/oauth/OAuthServiceTest.java @@ -13,7 +13,7 @@ import java.util.List; -import static com.example.backend.domain.define.user.constant.UserPlatformType.GITHUB; +import static com.example.backend.domain.mysql.define.user.constant.UserPlatformType.GITHUB; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; diff --git a/backend/src/test/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapterTest.java b/backend/src/test/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapterTest.java index c24f45ac6..5779c3759 100644 --- a/backend/src/test/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapterTest.java +++ b/backend/src/test/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapterTest.java @@ -12,11 +12,10 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import java.net.URI; -import static com.example.backend.domain.define.user.constant.UserPlatformType.GITHUB; +import static com.example.backend.domain.mysql.define.user.constant.UserPlatformType.GITHUB; import static org.junit.jupiter.api.Assertions.*; import static org.assertj.core.api.Assertions.*; diff --git a/backend/src/test/java/com/example/backend/auth/config/security/SecurityConfigTest.java b/backend/src/test/java/com/example/backend/auth/config/security/SecurityConfigTest.java index f2f25cda7..0d98cd958 100644 --- a/backend/src/test/java/com/example/backend/auth/config/security/SecurityConfigTest.java +++ b/backend/src/test/java/com/example/backend/auth/config/security/SecurityConfigTest.java @@ -2,9 +2,9 @@ import com.example.backend.auth.TestConfig; import com.example.backend.auth.api.service.jwt.JwtService; -import com.example.backend.domain.define.user.User; -import com.example.backend.domain.define.user.constant.UserRole; -import com.example.backend.domain.define.user.repository.UserRepository; +import com.example.backend.domain.mysql.define.user.User; +import com.example.backend.domain.mysql.define.user.constant.UserRole; +import com.example.backend.domain.mysql.define.user.repository.UserRepository; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/example/backend/domain/define/user/repository/UserRepositoryTest.java b/backend/src/test/java/com/example/backend/domain/define/user/repository/UserRepositoryTest.java index 380180758..50bf0dd31 100644 --- a/backend/src/test/java/com/example/backend/domain/define/user/repository/UserRepositoryTest.java +++ b/backend/src/test/java/com/example/backend/domain/define/user/repository/UserRepositoryTest.java @@ -1,7 +1,8 @@ package com.example.backend.domain.define.user.repository; import com.example.backend.auth.TestConfig; -import com.example.backend.domain.define.user.User; +import com.example.backend.domain.mysql.define.user.User; +import com.example.backend.domain.mysql.define.user.repository.UserRepository; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; From c208bf072ee5b7ae821f0687fc36d2802ed1e835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A3=BC=EC=84=B1?= <32183520@dankook.ac.kr> Date: Thu, 18 Jan 2024 10:48:06 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[BE]=20chore(#35):=20Redis=20Config=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/redis/config/RedisConfig.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 backend/src/main/java/com/example/backend/domain/redis/config/RedisConfig.java diff --git a/backend/src/main/java/com/example/backend/domain/redis/config/RedisConfig.java b/backend/src/main/java/com/example/backend/domain/redis/config/RedisConfig.java new file mode 100644 index 000000000..8fc4fe52f --- /dev/null +++ b/backend/src/main/java/com/example/backend/domain/redis/config/RedisConfig.java @@ -0,0 +1,25 @@ +package com.example.backend.domain.redis.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; + +@Configuration +@EnableRedisRepositories +public class RedisConfig { + + @Value("${spring.data.redis.host}") + private String host; + + @Value("${spring.data.redis.port}") + private int port; + + // Bean으로 등록해 Redis 연결 - Lettuce 사용 + @Bean + public RedisConnectionFactory redisConnectionFactory() { + return new LettuceConnectionFactory(host, port); + } +} From 245ace0d460ee72058dc34b80da5d890be58df19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A3=BC=EC=84=B1?= <32183520@dankook.ac.kr> Date: Thu, 18 Jan 2024 11:01:06 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[BE]=20test(#35):=20Redis=20=EC=A0=80?= =?UTF-8?q?=EC=9E=A5=20&=20=EC=A1=B0=ED=9A=8C=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/AuthController.java | 2 +- .../domain/redis/define/test/RedisTest.java | 24 ++++++++++++ .../test/repository/RedisTestRepository.java | 7 ++++ .../repository/RedisTestRepositoryTest.java | 39 +++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 backend/src/main/java/com/example/backend/domain/redis/define/test/RedisTest.java create mode 100644 backend/src/main/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepository.java create mode 100644 backend/src/test/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepositoryTest.java diff --git a/backend/src/main/java/com/example/backend/auth/api/controller/auth/AuthController.java b/backend/src/main/java/com/example/backend/auth/api/controller/auth/AuthController.java index 434ee570e..d6c5d0b79 100644 --- a/backend/src/main/java/com/example/backend/auth/api/controller/auth/AuthController.java +++ b/backend/src/main/java/com/example/backend/auth/api/controller/auth/AuthController.java @@ -4,7 +4,7 @@ import com.example.backend.auth.api.service.auth.AuthService; import com.example.backend.auth.api.service.oauth.OAuthService; import com.example.backend.common.response.JsonResult; -import com.example.backend.domain.define.user.constant.UserPlatformType; +import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/backend/src/main/java/com/example/backend/domain/redis/define/test/RedisTest.java b/backend/src/main/java/com/example/backend/domain/redis/define/test/RedisTest.java new file mode 100644 index 000000000..0d69fd238 --- /dev/null +++ b/backend/src/main/java/com/example/backend/domain/redis/define/test/RedisTest.java @@ -0,0 +1,24 @@ +package com.example.backend.domain.redis.define.test; + +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; + +import java.time.LocalDateTime; + +@Getter +@NoArgsConstructor +@RedisHash(value = "test", timeToLive = 60 * 3) // 3분 +public class RedisTest { + @Id + private Long id; + + private String description; + + @Builder + public RedisTest(String description) { + this.description = description; + } +} diff --git a/backend/src/main/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepository.java b/backend/src/main/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepository.java new file mode 100644 index 000000000..26efb77e6 --- /dev/null +++ b/backend/src/main/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepository.java @@ -0,0 +1,7 @@ +package com.example.backend.domain.redis.define.test.repository; + +import com.example.backend.domain.redis.define.test.RedisTest; +import org.springframework.data.repository.CrudRepository; + +public interface RedisTestRepository extends CrudRepository { +} diff --git a/backend/src/test/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepositoryTest.java b/backend/src/test/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepositoryTest.java new file mode 100644 index 000000000..046d72ac7 --- /dev/null +++ b/backend/src/test/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepositoryTest.java @@ -0,0 +1,39 @@ +package com.example.backend.domain.redis.define.test.repository; + +import com.example.backend.auth.TestConfig; +import com.example.backend.domain.redis.define.test.RedisTest; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.as; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + + +class RedisTestRepositoryTest extends TestConfig { + @Autowired + private RedisTestRepository redisTestRepository; + + @AfterEach + void tearDown() { +// redisTestRepository.deleteAll(); + } + + @Test + @DisplayName("Redis 저장 & 조회 테스트") + void redisSaveTest() { + // given + RedisTest savedEntity = redisTestRepository.save(RedisTest.builder() + .description("테스트 입니다.") + .build()); + + // when + RedisTest findEntity = redisTestRepository.findById(savedEntity.getId()).get(); + + // then + assertThat(findEntity).isNotNull(); + assertThat(findEntity.getDescription()).isEqualTo("테스트 입니다."); + } +} \ No newline at end of file From dd958736dc668c43b96e8888150daff0b52760be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A3=BC=EC=84=B1?= <32183520@dankook.ac.kr> Date: Sat, 20 Jan 2024 12:23:46 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[BE]=20refactor(#35):=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/api/controller/auth/AuthController.java | 2 +- .../auth/response/AuthLoginPageResponse.java | 2 +- .../controller/auth/response/AuthLoginResponse.java | 2 +- .../backend/auth/api/service/auth/AuthService.java | 4 ++-- .../backend/auth/api/service/oauth/OAuthService.java | 4 ++-- .../service/oauth/adapter/github/GithubAdapter.java | 2 +- .../auth/api/service/oauth/response/OAuthResponse.java | 2 +- .../security/filter/JwtAuthenticationFilter.java | 4 ++-- .../backend/domain/{redis => }/config/RedisConfig.java | 2 +- .../domain/{redis => }/define/test/RedisTest.java | 2 +- .../define/test/repository/RedisTestRepository.java | 4 ++-- .../backend/domain/{mysql => }/define/user/User.java | 6 +++--- .../define/user/constant/UserPlatformType.java | 2 +- .../{mysql => }/define/user/constant/UserRole.java | 2 +- .../define/user/repository/UserRepository.java | 4 ++-- .../example/backend/domain/mysql/config/JpaConfig.java | 10 ---------- .../test/java/com/example/backend/auth/TestConfig.java | 6 +++--- .../backend/auth/api/service/jwt/JwtServiceTest.java | 4 ++-- .../auth/api/service/oauth/OAuthServiceTest.java | 2 +- .../oauth/adapter/github/GithubAdapterTest.java | 2 +- .../auth/config/security/SecurityConfigTest.java | 6 +++--- .../define/user/repository/UserRepositoryTest.java | 3 +-- .../test/repository/RedisTestRepositoryTest.java | 5 ++--- 23 files changed, 35 insertions(+), 47 deletions(-) rename backend/src/main/java/com/example/backend/domain/{redis => }/config/RedisConfig.java (94%) rename backend/src/main/java/com/example/backend/domain/{redis => }/define/test/RedisTest.java (90%) rename backend/src/main/java/com/example/backend/domain/{redis => }/define/test/repository/RedisTestRepository.java (52%) rename backend/src/main/java/com/example/backend/domain/{mysql => }/define/user/User.java (94%) rename backend/src/main/java/com/example/backend/domain/{mysql => }/define/user/constant/UserPlatformType.java (82%) rename backend/src/main/java/com/example/backend/domain/{mysql => }/define/user/constant/UserRole.java (79%) rename backend/src/main/java/com/example/backend/domain/{mysql => }/define/user/repository/UserRepository.java (72%) delete mode 100644 backend/src/main/java/com/example/backend/domain/mysql/config/JpaConfig.java diff --git a/backend/src/main/java/com/example/backend/auth/api/controller/auth/AuthController.java b/backend/src/main/java/com/example/backend/auth/api/controller/auth/AuthController.java index d6c5d0b79..434ee570e 100644 --- a/backend/src/main/java/com/example/backend/auth/api/controller/auth/AuthController.java +++ b/backend/src/main/java/com/example/backend/auth/api/controller/auth/AuthController.java @@ -4,7 +4,7 @@ import com.example.backend.auth.api.service.auth.AuthService; import com.example.backend.auth.api.service.oauth.OAuthService; import com.example.backend.common.response.JsonResult; -import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; +import com.example.backend.domain.define.user.constant.UserPlatformType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginPageResponse.java b/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginPageResponse.java index b94e8dbfd..db8a0c88e 100644 --- a/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginPageResponse.java +++ b/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginPageResponse.java @@ -1,6 +1,6 @@ package com.example.backend.auth.api.controller.auth.response; -import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; +import com.example.backend.domain.define.user.constant.UserPlatformType; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginResponse.java b/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginResponse.java index 3a50ed2db..4be7868f7 100644 --- a/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginResponse.java +++ b/backend/src/main/java/com/example/backend/auth/api/controller/auth/response/AuthLoginResponse.java @@ -1,6 +1,6 @@ package com.example.backend.auth.api.controller.auth.response; -import com.example.backend.domain.mysql.define.user.constant.UserRole; +import com.example.backend.domain.define.user.constant.UserRole; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/auth/api/service/auth/AuthService.java b/backend/src/main/java/com/example/backend/auth/api/service/auth/AuthService.java index 6ac9e1277..b897e741b 100644 --- a/backend/src/main/java/com/example/backend/auth/api/service/auth/AuthService.java +++ b/backend/src/main/java/com/example/backend/auth/api/service/auth/AuthService.java @@ -3,8 +3,8 @@ import com.example.backend.auth.api.controller.auth.response.AuthLoginResponse; import com.example.backend.auth.api.service.oauth.OAuthService; import com.example.backend.auth.api.service.oauth.response.OAuthResponse; -import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; -import com.example.backend.domain.mysql.define.user.repository.UserRepository; +import com.example.backend.domain.define.user.constant.UserPlatformType; +import com.example.backend.domain.define.user.repository.UserRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/example/backend/auth/api/service/oauth/OAuthService.java b/backend/src/main/java/com/example/backend/auth/api/service/oauth/OAuthService.java index 3a4777d02..da8228899 100644 --- a/backend/src/main/java/com/example/backend/auth/api/service/oauth/OAuthService.java +++ b/backend/src/main/java/com/example/backend/auth/api/service/oauth/OAuthService.java @@ -6,7 +6,7 @@ import com.example.backend.auth.api.service.oauth.builder.OAuthURLBuilder; import com.example.backend.auth.api.service.oauth.builder.github.GithubURLBuilder; import com.example.backend.auth.api.service.oauth.response.OAuthResponse; -import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; +import com.example.backend.domain.define.user.constant.UserPlatformType; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static com.example.backend.domain.mysql.define.user.constant.UserPlatformType.GITHUB; +import static com.example.backend.domain.define.user.constant.UserPlatformType.GITHUB; @Slf4j @Service diff --git a/backend/src/main/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapter.java b/backend/src/main/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapter.java index 650623b8e..a70b84fcc 100644 --- a/backend/src/main/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapter.java +++ b/backend/src/main/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapter.java @@ -14,7 +14,7 @@ import java.net.URI; -import static com.example.backend.domain.mysql.define.user.constant.UserPlatformType.GITHUB; +import static com.example.backend.domain.define.user.constant.UserPlatformType.GITHUB; @Slf4j @Component diff --git a/backend/src/main/java/com/example/backend/auth/api/service/oauth/response/OAuthResponse.java b/backend/src/main/java/com/example/backend/auth/api/service/oauth/response/OAuthResponse.java index ca23d423e..726eb46ce 100644 --- a/backend/src/main/java/com/example/backend/auth/api/service/oauth/response/OAuthResponse.java +++ b/backend/src/main/java/com/example/backend/auth/api/service/oauth/response/OAuthResponse.java @@ -1,6 +1,6 @@ package com.example.backend.auth.api.service.oauth.response; -import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; +import com.example.backend.domain.define.user.constant.UserPlatformType; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/auth/config/security/filter/JwtAuthenticationFilter.java b/backend/src/main/java/com/example/backend/auth/config/security/filter/JwtAuthenticationFilter.java index 765e9434e..2e6709f7d 100644 --- a/backend/src/main/java/com/example/backend/auth/config/security/filter/JwtAuthenticationFilter.java +++ b/backend/src/main/java/com/example/backend/auth/config/security/filter/JwtAuthenticationFilter.java @@ -4,8 +4,8 @@ import com.example.backend.common.exception.ExceptionMessage; import com.example.backend.common.exception.jwt.JwtException; import com.example.backend.common.response.JsonResult; -import com.example.backend.domain.mysql.define.user.User; -import com.example.backend.domain.mysql.define.user.constant.UserRole; +import com.example.backend.domain.define.user.User; +import com.example.backend.domain.define.user.constant.UserRole; import com.fasterxml.jackson.databind.ObjectMapper; import io.jsonwebtoken.*; import io.jsonwebtoken.security.SignatureException; diff --git a/backend/src/main/java/com/example/backend/domain/redis/config/RedisConfig.java b/backend/src/main/java/com/example/backend/domain/config/RedisConfig.java similarity index 94% rename from backend/src/main/java/com/example/backend/domain/redis/config/RedisConfig.java rename to backend/src/main/java/com/example/backend/domain/config/RedisConfig.java index 8fc4fe52f..2351b57d7 100644 --- a/backend/src/main/java/com/example/backend/domain/redis/config/RedisConfig.java +++ b/backend/src/main/java/com/example/backend/domain/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.example.backend.domain.redis.config; +package com.example.backend.domain.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/backend/src/main/java/com/example/backend/domain/redis/define/test/RedisTest.java b/backend/src/main/java/com/example/backend/domain/define/test/RedisTest.java similarity index 90% rename from backend/src/main/java/com/example/backend/domain/redis/define/test/RedisTest.java rename to backend/src/main/java/com/example/backend/domain/define/test/RedisTest.java index 0d69fd238..b2d16fe34 100644 --- a/backend/src/main/java/com/example/backend/domain/redis/define/test/RedisTest.java +++ b/backend/src/main/java/com/example/backend/domain/define/test/RedisTest.java @@ -1,4 +1,4 @@ -package com.example.backend.domain.redis.define.test; +package com.example.backend.domain.define.test; import lombok.Builder; import lombok.Getter; diff --git a/backend/src/main/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepository.java b/backend/src/main/java/com/example/backend/domain/define/test/repository/RedisTestRepository.java similarity index 52% rename from backend/src/main/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepository.java rename to backend/src/main/java/com/example/backend/domain/define/test/repository/RedisTestRepository.java index 26efb77e6..8fdd28d57 100644 --- a/backend/src/main/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepository.java +++ b/backend/src/main/java/com/example/backend/domain/define/test/repository/RedisTestRepository.java @@ -1,6 +1,6 @@ -package com.example.backend.domain.redis.define.test.repository; +package com.example.backend.domain.define.test.repository; -import com.example.backend.domain.redis.define.test.RedisTest; +import com.example.backend.domain.define.test.RedisTest; import org.springframework.data.repository.CrudRepository; public interface RedisTestRepository extends CrudRepository { diff --git a/backend/src/main/java/com/example/backend/domain/mysql/define/user/User.java b/backend/src/main/java/com/example/backend/domain/define/user/User.java similarity index 94% rename from backend/src/main/java/com/example/backend/domain/mysql/define/user/User.java rename to backend/src/main/java/com/example/backend/domain/define/user/User.java index 1dfe232d7..964989c2e 100644 --- a/backend/src/main/java/com/example/backend/domain/mysql/define/user/User.java +++ b/backend/src/main/java/com/example/backend/domain/define/user/User.java @@ -1,7 +1,7 @@ -package com.example.backend.domain.mysql.define.user; +package com.example.backend.domain.define.user; -import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; -import com.example.backend.domain.mysql.define.user.constant.UserRole; +import com.example.backend.domain.define.user.constant.UserPlatformType; +import com.example.backend.domain.define.user.constant.UserRole; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserPlatformType.java b/backend/src/main/java/com/example/backend/domain/define/user/constant/UserPlatformType.java similarity index 82% rename from backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserPlatformType.java rename to backend/src/main/java/com/example/backend/domain/define/user/constant/UserPlatformType.java index cbe8c40da..28666e70b 100644 --- a/backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserPlatformType.java +++ b/backend/src/main/java/com/example/backend/domain/define/user/constant/UserPlatformType.java @@ -1,4 +1,4 @@ -package com.example.backend.domain.mysql.define.user.constant; +package com.example.backend.domain.define.user.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserRole.java b/backend/src/main/java/com/example/backend/domain/define/user/constant/UserRole.java similarity index 79% rename from backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserRole.java rename to backend/src/main/java/com/example/backend/domain/define/user/constant/UserRole.java index 496e6a043..0a1e1e5d1 100644 --- a/backend/src/main/java/com/example/backend/domain/mysql/define/user/constant/UserRole.java +++ b/backend/src/main/java/com/example/backend/domain/define/user/constant/UserRole.java @@ -1,4 +1,4 @@ -package com.example.backend.domain.mysql.define.user.constant; +package com.example.backend.domain.define.user.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/example/backend/domain/mysql/define/user/repository/UserRepository.java b/backend/src/main/java/com/example/backend/domain/define/user/repository/UserRepository.java similarity index 72% rename from backend/src/main/java/com/example/backend/domain/mysql/define/user/repository/UserRepository.java rename to backend/src/main/java/com/example/backend/domain/define/user/repository/UserRepository.java index adc50ff17..6b0d97170 100644 --- a/backend/src/main/java/com/example/backend/domain/mysql/define/user/repository/UserRepository.java +++ b/backend/src/main/java/com/example/backend/domain/define/user/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.example.backend.domain.mysql.define.user.repository; +package com.example.backend.domain.define.user.repository; -import com.example.backend.domain.mysql.define.user.User; +import com.example.backend.domain.define.user.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/example/backend/domain/mysql/config/JpaConfig.java b/backend/src/main/java/com/example/backend/domain/mysql/config/JpaConfig.java deleted file mode 100644 index 622a05e1c..000000000 --- a/backend/src/main/java/com/example/backend/domain/mysql/config/JpaConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.backend.domain.mysql.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@Configuration -@EnableTransactionManagement -public class JpaConfig { - -} diff --git a/backend/src/test/java/com/example/backend/auth/TestConfig.java b/backend/src/test/java/com/example/backend/auth/TestConfig.java index f6d50bcdc..214e27c72 100644 --- a/backend/src/test/java/com/example/backend/auth/TestConfig.java +++ b/backend/src/test/java/com/example/backend/auth/TestConfig.java @@ -16,9 +16,9 @@ */ -import com.example.backend.domain.mysql.define.user.User; -import com.example.backend.domain.mysql.define.user.constant.UserPlatformType; -import com.example.backend.domain.mysql.define.user.constant.UserRole; +import com.example.backend.domain.define.user.User; +import com.example.backend.domain.define.user.constant.UserPlatformType; +import com.example.backend.domain.define.user.constant.UserRole; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; diff --git a/backend/src/test/java/com/example/backend/auth/api/service/jwt/JwtServiceTest.java b/backend/src/test/java/com/example/backend/auth/api/service/jwt/JwtServiceTest.java index 28ac2a27d..fc0307a27 100644 --- a/backend/src/test/java/com/example/backend/auth/api/service/jwt/JwtServiceTest.java +++ b/backend/src/test/java/com/example/backend/auth/api/service/jwt/JwtServiceTest.java @@ -1,8 +1,8 @@ package com.example.backend.auth.api.service.jwt; import com.example.backend.auth.TestConfig; -import com.example.backend.domain.mysql.define.user.User; -import com.example.backend.domain.mysql.define.user.repository.UserRepository; +import com.example.backend.domain.define.user.User; +import com.example.backend.domain.define.user.repository.UserRepository; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import org.junit.jupiter.api.AfterEach; diff --git a/backend/src/test/java/com/example/backend/auth/api/service/oauth/OAuthServiceTest.java b/backend/src/test/java/com/example/backend/auth/api/service/oauth/OAuthServiceTest.java index ae706987c..3229c070b 100644 --- a/backend/src/test/java/com/example/backend/auth/api/service/oauth/OAuthServiceTest.java +++ b/backend/src/test/java/com/example/backend/auth/api/service/oauth/OAuthServiceTest.java @@ -13,7 +13,7 @@ import java.util.List; -import static com.example.backend.domain.mysql.define.user.constant.UserPlatformType.GITHUB; +import static com.example.backend.domain.define.user.constant.UserPlatformType.GITHUB; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; diff --git a/backend/src/test/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapterTest.java b/backend/src/test/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapterTest.java index 5779c3759..6eea82683 100644 --- a/backend/src/test/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapterTest.java +++ b/backend/src/test/java/com/example/backend/auth/api/service/oauth/adapter/github/GithubAdapterTest.java @@ -15,7 +15,7 @@ import java.net.URI; -import static com.example.backend.domain.mysql.define.user.constant.UserPlatformType.GITHUB; +import static com.example.backend.domain.define.user.constant.UserPlatformType.GITHUB; import static org.junit.jupiter.api.Assertions.*; import static org.assertj.core.api.Assertions.*; diff --git a/backend/src/test/java/com/example/backend/auth/config/security/SecurityConfigTest.java b/backend/src/test/java/com/example/backend/auth/config/security/SecurityConfigTest.java index 0d98cd958..f2f25cda7 100644 --- a/backend/src/test/java/com/example/backend/auth/config/security/SecurityConfigTest.java +++ b/backend/src/test/java/com/example/backend/auth/config/security/SecurityConfigTest.java @@ -2,9 +2,9 @@ import com.example.backend.auth.TestConfig; import com.example.backend.auth.api.service.jwt.JwtService; -import com.example.backend.domain.mysql.define.user.User; -import com.example.backend.domain.mysql.define.user.constant.UserRole; -import com.example.backend.domain.mysql.define.user.repository.UserRepository; +import com.example.backend.domain.define.user.User; +import com.example.backend.domain.define.user.constant.UserRole; +import com.example.backend.domain.define.user.repository.UserRepository; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/example/backend/domain/define/user/repository/UserRepositoryTest.java b/backend/src/test/java/com/example/backend/domain/define/user/repository/UserRepositoryTest.java index 50bf0dd31..380180758 100644 --- a/backend/src/test/java/com/example/backend/domain/define/user/repository/UserRepositoryTest.java +++ b/backend/src/test/java/com/example/backend/domain/define/user/repository/UserRepositoryTest.java @@ -1,8 +1,7 @@ package com.example.backend.domain.define.user.repository; import com.example.backend.auth.TestConfig; -import com.example.backend.domain.mysql.define.user.User; -import com.example.backend.domain.mysql.define.user.repository.UserRepository; +import com.example.backend.domain.define.user.User; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepositoryTest.java b/backend/src/test/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepositoryTest.java index 046d72ac7..426ed2faa 100644 --- a/backend/src/test/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepositoryTest.java +++ b/backend/src/test/java/com/example/backend/domain/redis/define/test/repository/RedisTestRepositoryTest.java @@ -1,15 +1,14 @@ package com.example.backend.domain.redis.define.test.repository; import com.example.backend.auth.TestConfig; -import com.example.backend.domain.redis.define.test.RedisTest; +import com.example.backend.domain.define.test.RedisTest; +import com.example.backend.domain.define.test.repository.RedisTestRepository; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import static org.assertj.core.api.Assertions.as; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; class RedisTestRepositoryTest extends TestConfig {