Skip to content

Commit 37e671c

Browse files
authored
[Refactor]: BaseInitData 추가 (#209)
* [Refactor]: BaseInitData 개선 * [Fix]: TestRedisConfiguration 추가
1 parent 91f9cef commit 37e671c

File tree

11 files changed

+547
-222
lines changed

11 files changed

+547
-222
lines changed

src/main/java/com/backend/global/initdata/BaseInitData.java

Lines changed: 520 additions & 212 deletions
Large diffs are not rendered by default.

src/test/java/com/backend/domain/board/controller/ApiV1BoardControllerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.backend.domain.member.entity.Member;
66
import com.backend.domain.member.repository.MemberRepository;
77
import com.backend.global.elasticsearch.TestElasticsearchConfiguration;
8+
import com.backend.global.redis.TestRedisConfiguration;
89
import com.fasterxml.jackson.databind.ObjectMapper;
910
import org.junit.jupiter.api.BeforeEach;
1011
import org.junit.jupiter.api.DisplayName;
@@ -30,7 +31,7 @@
3031
@AutoConfigureMockMvc
3132
@Transactional
3233
@WithMockUser
33-
@Import(TestElasticsearchConfiguration.class)
34+
@Import({TestElasticsearchConfiguration.class, TestRedisConfiguration.class})
3435
class ApiV1BoardControllerTest {
3536

3637
@Autowired

src/test/java/com/backend/domain/notification/controller/NotificationControllerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.backend.domain.product.entity.Product;
88
import com.backend.domain.product.repository.jpa.ProductRepository;
99
import com.backend.global.elasticsearch.TestElasticsearchConfiguration;
10+
import com.backend.global.redis.TestRedisConfiguration;
1011
import com.fasterxml.jackson.databind.ObjectMapper;
1112
import org.junit.jupiter.api.BeforeEach;
1213
import org.junit.jupiter.api.DisplayName;
@@ -35,7 +36,7 @@
3536
@Transactional
3637
@ActiveProfiles("test")
3738
@WithMockUser
38-
@Import(TestElasticsearchConfiguration.class)
39+
@Import({TestElasticsearchConfiguration.class, TestRedisConfiguration.class})
3940
class NotificationControllerTest {
4041

4142
@Autowired

src/test/java/com/backend/domain/notification/service/BidNotificationServiceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.backend.domain.product.entity.StandardProduct;
99
import com.backend.domain.product.repository.jpa.ProductRepository;
1010
import com.backend.global.elasticsearch.TestElasticsearchConfiguration;
11+
import com.backend.global.redis.TestRedisConfiguration;
1112
import com.backend.global.websocket.service.WebSocketService;
1213
import org.junit.jupiter.api.BeforeEach;
1314
import org.junit.jupiter.api.DisplayName;
@@ -33,7 +34,7 @@
3334
@ActiveProfiles("test")
3435
@Transactional
3536
@MockitoSettings
36-
@Import(TestElasticsearchConfiguration.class)
37+
@Import({TestElasticsearchConfiguration.class, TestRedisConfiguration.class})
3738
class BidNotificationServiceTest {
3839

3940
@Autowired

src/test/java/com/backend/domain/notification/service/NotificationQueueIntegrationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.backend.domain.product.entity.StandardProduct;
99
import com.backend.domain.product.repository.jpa.ProductRepository;
1010
import com.backend.global.elasticsearch.TestElasticsearchConfiguration;
11+
import com.backend.global.redis.TestRedisConfiguration;
1112
import com.backend.global.websocket.service.WebSocketService;
1213
import org.junit.jupiter.api.BeforeEach;
1314
import org.junit.jupiter.api.DisplayName;
@@ -31,7 +32,7 @@
3132
@ActiveProfiles("test")
3233
@Transactional
3334
@MockitoSettings
34-
@Import(TestElasticsearchConfiguration.class)
35+
@Import({TestElasticsearchConfiguration.class, TestRedisConfiguration.class})
3536
class NotificationQueueIntegrationTest {
3637

3738
@Autowired

src/test/java/com/backend/domain/notification/service/NotificationQueueServiceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.backend.domain.product.entity.StandardProduct;
99
import com.backend.domain.product.repository.jpa.ProductRepository;
1010
import com.backend.global.elasticsearch.TestElasticsearchConfiguration;
11+
import com.backend.global.redis.TestRedisConfiguration;
1112
import org.junit.jupiter.api.BeforeEach;
1213
import org.junit.jupiter.api.DisplayName;
1314
import org.junit.jupiter.api.Test;
@@ -28,7 +29,7 @@
2829
@SpringBootTest
2930
@ActiveProfiles("test")
3031
@Transactional
31-
@Import(TestElasticsearchConfiguration.class)
32+
@Import({TestElasticsearchConfiguration.class, TestRedisConfiguration.class})
3233
class NotificationQueueServiceTest {
3334

3435
@Autowired

src/test/java/com/backend/domain/payment/controller/ApiV1PaymentMethodControllerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.backend.domain.payment.repository.PaymentMethodRepository;
99
import com.backend.domain.payment.service.PaymentMethodService;
1010
import com.backend.global.elasticsearch.TestElasticsearchConfiguration;
11+
import com.backend.global.redis.TestRedisConfiguration;
1112
import com.backend.global.security.JwtUtil;
1213
import com.fasterxml.jackson.databind.ObjectMapper;
1314
import org.junit.jupiter.api.BeforeEach;
@@ -22,15 +23,15 @@
2223
import org.springframework.test.web.servlet.MockMvc;
2324

2425
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
25-
import static org.hamcrest.Matchers.*;
26+
import static org.hamcrest.Matchers.nullValue;
2627
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
2728
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
2829
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
2930

3031
@SpringBootTest
3132
@AutoConfigureMockMvc
3233
@ActiveProfiles("test")
33-
@Import(TestElasticsearchConfiguration.class)
34+
@Import({TestElasticsearchConfiguration.class, TestRedisConfiguration.class})
3435
class ApiV1PaymentMethodControllerTest {
3536

3637
@Autowired

src/test/java/com/backend/domain/product/controller/ApiV1ProductElasticsearchControllerTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
import com.backend.domain.product.enums.ProductCategory;
88
import com.backend.domain.product.enums.ProductSearchSortType;
99
import com.backend.domain.product.service.ProductSearchService;
10+
import com.backend.global.redis.TestRedisConfiguration;
1011
import org.hamcrest.Matchers;
1112
import org.junit.jupiter.api.DisplayName;
1213
import org.junit.jupiter.api.Test;
1314
import org.springframework.beans.factory.annotation.Autowired;
1415
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1516
import org.springframework.boot.test.context.SpringBootTest;
17+
import org.springframework.context.annotation.Import;
1618
import org.springframework.data.domain.Page;
1719
import org.springframework.test.context.ActiveProfiles;
1820
import org.springframework.test.context.TestPropertySource;
@@ -33,6 +35,7 @@
3335
"spring.data.elasticsearch.repositories.enabled=true",
3436
"spring.autoconfigure.exclude=" // 빈 값으로 오버라이드
3537
})
38+
@Import(TestRedisConfiguration.class)
3639
class ApiV1ProductElasticsearchControllerTest {
3740
@Autowired
3841
private MockMvc mvc;

src/test/java/com/backend/domain/product/repository/ProductElasticRepositoryTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22

33
import com.backend.domain.product.document.ProductDocument;
44
import com.backend.domain.product.dto.ProductSearchDto;
5-
import com.backend.domain.product.enums.*;
5+
import com.backend.domain.product.enums.AuctionStatus;
6+
import com.backend.domain.product.enums.DeliveryMethod;
7+
import com.backend.domain.product.enums.ProductCategory;
8+
import com.backend.domain.product.enums.ProductSearchSortType;
69
import com.backend.domain.product.repository.elasticsearch.ProductElasticRepository;
10+
import com.backend.global.redis.TestRedisConfiguration;
711
import org.junit.jupiter.api.DisplayName;
812
import org.junit.jupiter.api.Test;
913
import org.springframework.beans.factory.annotation.Autowired;
1014
import org.springframework.boot.test.context.SpringBootTest;
15+
import org.springframework.context.annotation.Import;
1116
import org.springframework.data.domain.Page;
1217
import org.springframework.data.domain.PageRequest;
1318
import org.springframework.data.domain.Pageable;
@@ -24,6 +29,7 @@
2429
"spring.data.elasticsearch.repositories.enabled=true",
2530
"spring.autoconfigure.exclude=" // 빈 값으로 오버라이드
2631
})
32+
@Import(TestRedisConfiguration.class)
2733
class ProductElasticRepositoryTest {
2834
@Autowired
2935
private ProductElasticRepository productElasticRepository;

src/test/java/com/backend/domain/product/repository/ProductRepositoryTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.backend.domain.product.enums.ProductSearchSortType;
88
import com.backend.domain.product.repository.jpa.ProductRepository;
99
import com.backend.global.elasticsearch.TestElasticsearchConfiguration;
10+
import com.backend.global.redis.TestRedisConfiguration;
1011
import org.junit.jupiter.api.DisplayName;
1112
import org.junit.jupiter.api.Test;
1213
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,7 @@
2425

2526
@ActiveProfiles("test")
2627
@SpringBootTest
27-
@Import(TestElasticsearchConfiguration.class)
28+
@Import({TestElasticsearchConfiguration.class, TestRedisConfiguration.class})
2829
class ProductRepositoryTest {
2930
@Autowired
3031
private ProductRepository productRepository;

0 commit comments

Comments
 (0)