refactor: 테스트 최적화

src/main/java/in/koreatech/koin/admin/shop/service/AdminShopService.java

@@ -111,14 +111,14 @@ public void createShop(AdminCreateShopRequest adminCreateShopRequest) {
                 .shop(savedShop)
                 .name(categoryName)
                 .build();
-            adminMenuCategoryRepository.save(menuCategory);
+            savedShop.getMenuCategories().add(menuCategory);
         }
         for (String imageUrl : adminCreateShopRequest.imageUrls()) {
             ShopImage shopImage = ShopImage.builder()
                 .shop(savedShop)
                 .imageUrl(imageUrl)
                 .build();
-            adminShopImageRepository.save(shopImage);
+            savedShop.getShopImages().add(shopImage);
         }
         for (InnerShopOpen open : adminCreateShopRequest.open()) {
             ShopOpen shopOpen = ShopOpen.builder()
@@ -128,15 +128,15 @@ public void createShop(AdminCreateShopRequest adminCreateShopRequest) {
                 .dayOfWeek(open.dayOfWeek())
                 .closed(open.closed())
                 .build();
-            adminShopOpenRepository.save(shopOpen);
+            savedShop.getShopOpens().add(shopOpen);
         }
         List<ShopCategory> categories = adminShopCategoryRepository.findAllByIdIn(adminCreateShopRequest.categoryIds());
         for (ShopCategory shopCategory : categories) {
             ShopCategoryMap shopCategoryMap = ShopCategoryMap.builder()
                 .shopCategory(shopCategory)
                 .shop(savedShop)
                 .build();
-            adminShopCategoryMapRepository.save(shopCategoryMap);
+            savedShop.getShopCategories().add(shopCategoryMap);
         }
     }
 
@@ -160,30 +160,30 @@ public void createMenu(Integer shopId, AdminCreateMenuRequest adminCreateMenuReq
                 .menuCategory(menuCategory)
                 .menu(savedMenu)
                 .build();
-            adminMenuCategoryMapRepository.save(menuCategoryMap);
+            savedMenu.getMenuCategoryMaps().add(menuCategoryMap);
         }
         for (String imageUrl : adminCreateMenuRequest.imageUrls()) {
             MenuImage menuImage = MenuImage.builder()
                 .imageUrl(imageUrl)
                 .menu(savedMenu)
                 .build();
-            adminMenuImageRepository.save(menuImage);
+            savedMenu.getMenuImages().add(menuImage);
         }
         if (adminCreateMenuRequest.optionPrices() == null) {
             MenuOption menuOption = MenuOption.builder()
                 .option(savedMenu.getName())
                 .price(adminCreateMenuRequest.singlePrice())
                 .menu(menu)
                 .build();
-            adminMenuDetailRepository.save(menuOption);
+            savedMenu.getMenuOptions().add(menuOption);
         } else {
             for (var option : adminCreateMenuRequest.optionPrices()) {
                 MenuOption menuOption = MenuOption.builder()
                     .option(option.option())
                     .price(option.price())
                     .menu(menu)
                     .build();
-                adminMenuDetailRepository.save(menuOption);
+                savedMenu.getMenuOptions().add(menuOption);
             }
         }
     }

src/main/java/in/koreatech/koin/domain/coop/service/CoopService.java

@@ -71,7 +71,6 @@ public void saveDiningImage(DiningImageRequest imageRequest) {
         if (isOpened && !isImageExist) {
             eventPublisher.publishEvent(new DiningImageUploadEvent(dining.getId(), dining.getImageUrl()));
         }
-
         dining.setImageUrl(imageRequest.imageUrl());
     }
 

src/main/java/in/koreatech/koin/domain/ownershop/service/OwnerShopService.java

@@ -97,14 +97,14 @@ public void createOwnerShops(Integer ownerId, OwnerShopsRequest ownerShopsReques
                 .shop(savedShop)
                 .name(categoryName)
                 .build();
-            menuCategoryRepository.save(menuCategory);
+            savedShop.getMenuCategories().add(menuCategory);
         }
         for (String imageUrl : ownerShopsRequest.imageUrls()) {
             ShopImage shopImage = ShopImage.builder()
                 .shop(savedShop)
                 .imageUrl(imageUrl)
                 .build();
-            shopImageRepository.save(shopImage);
+            savedShop.getShopImages().add(shopImage);
         }
         for (OwnerShopsRequest.InnerOpenRequest open : ownerShopsRequest.open()) {
             ShopOpen shopOpen = ShopOpen.builder()
@@ -114,15 +114,15 @@ public void createOwnerShops(Integer ownerId, OwnerShopsRequest ownerShopsReques
                 .dayOfWeek(open.dayOfWeek())
                 .closed(open.closed())
                 .build();
-            shopOpenRepository.save(shopOpen);
+            savedShop.getShopOpens().add(shopOpen);
         }
         List<ShopCategory> shopCategories = shopCategoryRepository.findAllByIdIn(ownerShopsRequest.categoryIds());
         for (ShopCategory shopCategory : shopCategories) {
             ShopCategoryMap shopCategoryMap = ShopCategoryMap.builder()
                 .shopCategory(shopCategory)
                 .shop(savedShop)
                 .build();
-            shopCategoryMapRepository.save(shopCategoryMap);
+            savedShop.getShopCategories().add(shopCategoryMap);
         }
     }
 
@@ -188,30 +188,30 @@ public void createMenu(Integer shopId, Integer ownerId, CreateMenuRequest create
                 .menuCategory(menuCategory)
                 .menu(savedMenu)
                 .build();
-            menuCategoryMapRepository.save(menuCategoryMap);
+            savedMenu.getMenuCategoryMaps().add(menuCategoryMap);
         }
         for (String imageUrl : createMenuRequest.imageUrls()) {
             MenuImage menuImage = MenuImage.builder()
                 .imageUrl(imageUrl)
                 .menu(savedMenu)
                 .build();
-            menuImageRepository.save(menuImage);
+            savedMenu.getMenuImages().add(menuImage);
         }
         if (createMenuRequest.optionPrices() == null) {
             MenuOption menuOption = MenuOption.builder()
                 .option(savedMenu.getName())
                 .price(createMenuRequest.singlePrice())
                 .menu(menu)
                 .build();
-            menuDetailRepository.save(menuOption);
+            savedMenu.getMenuOptions().add(menuOption);
         } else {
             for (var option : createMenuRequest.optionPrices()) {
                 MenuOption menuOption = MenuOption.builder()
                     .option(option.option())
                     .price(option.price())
                     .menu(menu)
                     .build();
-                menuDetailRepository.save(menuOption);
+                savedMenu.getMenuOptions().add(menuOption);
             }
         }
     }

src/main/java/in/koreatech/koin/domain/shop/repository/MenuRepository.java

@@ -21,4 +21,6 @@ default Menu getById(Integer menuId) {
     }
 
     List<Menu> findAllByShopId(Integer shopId);
+
+    List<Menu> findAll();
 }

src/main/java/in/koreatech/koin/domain/user/service/StudentService.java

@@ -120,7 +120,6 @@ public ModelAndView authenticate(AuthTokenRequest request) {
         }
 
         Student student = studentTemporaryStatus.get().toStudent(passwordEncoder);
-
         studentRepository.save(student);
         userRepository.save(student.getUser());
 

src/test/java/in/koreatech/koin/AcceptanceTest.java

@@ -1,19 +1,19 @@
 package in.koreatech.koin;
 
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
 import java.time.Clock;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.transaction.TestTransaction;
+import org.springframework.test.web.servlet.MockMvc;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.junit.jupiter.Container;
@@ -28,21 +28,21 @@
 import in.koreatech.koin.domain.shop.model.ReviewEventListener;
 import in.koreatech.koin.domain.shop.model.ShopEventListener;
 import in.koreatech.koin.domain.user.model.StudentEventListener;
-import in.koreatech.koin.util.TestCircuitBreakerClient;
 import in.koreatech.koin.support.DBInitializer;
-import io.restassured.RestAssured;
+import in.koreatech.koin.util.TestCircuitBreakerClient;
 import jakarta.persistence.EntityManager;
 
-@SpringBootTest(webEnvironment = RANDOM_PORT)
+@SpringBootTest
+@AutoConfigureMockMvc
 @Import({DBInitializer.class, TestJpaConfiguration.class, TestTimeConfig.class, TestRedisConfiguration.class})
 @ActiveProfiles("test")
 public abstract class AcceptanceTest {
 
     private static final String ROOT = "test";
     private static final String ROOT_PASSWORD = "1234";
 
-    @LocalServerPort
-    protected int port;
+    @Autowired
+    public MockMvc mockMvc;
 
     @MockBean
     protected OwnerEventListener ownerEventListener;
@@ -97,29 +97,37 @@ private static void configureProperties(final DynamicPropertyRegistry registry)
 
     static {
         mySqlContainer = (MySQLContainer)new MySQLContainer("mysql:8.0.29")
-                .withDatabaseName("test")
-                .withUsername(ROOT)
-                .withPassword(ROOT_PASSWORD)
-                .withCommand("--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci");
+            .withDatabaseName("test")
+            .withUsername(ROOT)
+            .withPassword(ROOT_PASSWORD)
+            .withCommand("--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci");
 
         redisContainer = new GenericContainer<>(
-                DockerImageName.parse("redis:7.0.9"))
-                .withExposedPorts(6379);
+            DockerImageName.parse("redis:7.0.9"))
+            .withExposedPorts(6379);
 
         mongoContainer = new GenericContainer<>(
-                DockerImageName.parse("mongo:6.0.14"))
-                .withExposedPorts(27017);
+            DockerImageName.parse("mongo:6.0.14"))
+            .withExposedPorts(27017);
 
         mySqlContainer.start();
         redisContainer.start();
         mongoContainer.start();
     }
 
     @BeforeEach
-    void delete() {
-        if (RestAssured.port == RestAssured.UNDEFINED_PORT) {
-            RestAssured.port = port;
-        }
+    void initIncrement() {
+        dataInitializer.initIncrement();
+        dataInitializer.clearRedis();
+    }
+
+    protected void clear() {
         dataInitializer.clear();
     }
+
+    protected void forceVerify(Runnable runnable) {
+        TestTransaction.flagForCommit();
+        TestTransaction.end();
+        runnable.run();
+    }
 }

src/test/java/in/koreatech/koin/acceptance/ActivityApiTest.java

@@ -1,26 +1,30 @@
 package in.koreatech.koin.acceptance;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import java.time.LocalDate;
 
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.transaction.annotation.Transactional;
 
 import in.koreatech.koin.AcceptanceTest;
 import in.koreatech.koin.fixture.ActivityFixture;
-import in.koreatech.koin.support.JsonAssertions;
-import io.restassured.RestAssured;
 
 @SuppressWarnings("NonAsciiCharacters")
+@Transactional
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ActivityApiTest extends AcceptanceTest {
 
     @Autowired
     protected ActivityFixture activityFixture;
 
     @Test
-    @DisplayName("BCSD Lab 활동 내역을 조회한다.")
-    void getActivities() {
+    void BCSDLab_활동_내역을_조회한다() throws Exception {
         activityFixture.builder()
             .title("BCSD/KAP 통합")
             .description("BCSD와 KAP가 통합되었습니다.")
@@ -48,17 +52,13 @@ void getActivities() {
             .isDeleted(false)
             .build();
 
-        var response = RestAssured
-            .given()
-            .when()
-            .param("year", 2019)
-            .get("/activities")
-            .then()
-            .statusCode(HttpStatus.OK.value())
-            .extract();
-
-        JsonAssertions.assertThat(response.asPrettyString())
-            .isEqualTo("""
+        mockMvc.perform(
+            get("/activities")
+                .param("year", "2019")
+                .contentType(MediaType.APPLICATION_JSON)
+            )
+            .andExpect(status().isOk())
+            .andExpect(content().json("""
                 {
                     "Activities": [
                         {
@@ -88,12 +88,11 @@ void getActivities() {
                         }
                     ]
                 }
-                """);
+                """));
     }
 
     @Test
-    @DisplayName("BCSD Lab 활동 내역을 조회한다. - 파라미터가 없는 경우 전체조회")
-    void getActivitiesWithoutYear() {
+    void BCSDLab_활동_내역을_조회한다_파라미터가_없는_경우_전체조회() throws Exception {
         activityFixture.builder()
             .title("BCSD/KAP 통합")
             .description("BCSD와 KAP가 통합되었습니다.")
@@ -121,16 +120,12 @@ void getActivitiesWithoutYear() {
             .isDeleted(false)
             .build();
 
-        var response = RestAssured
-            .given()
-            .when()
-            .get("/activities")
-            .then()
-            .statusCode(HttpStatus.OK.value())
-            .extract();
-
-        JsonAssertions.assertThat(response.asPrettyString())
-            .isEqualTo("""
+        mockMvc.perform(
+                get("/activities")
+                    .contentType(MediaType.APPLICATION_JSON)
+            )
+            .andExpect(status().isOk())
+            .andExpect(content().json("""
                 {
                     "Activities": [
                         {
@@ -172,6 +167,6 @@ void getActivitiesWithoutYear() {
                         }
                     ]
                 }
-                """);
+                """));
     }
 }