[KAN-000] 상황 재현 및 테스트코드 추가

meokgu-skku · Jun 3, 2024 · b8aab0b · b8aab0b
1 parent fff813f
commit b8aab0b
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 3 deletions.
diff --git a/src/main/kotlin/com/restaurant/be/restaurant/repository/RestaurantRepositoryCustomImpl.kt b/src/main/kotlin/com/restaurant/be/restaurant/repository/RestaurantRepositoryCustomImpl.kt
@@ -152,6 +152,7 @@ class RestaurantRepositoryCustomImpl(
             .where(restaurant.id.`in`(restaurantIds))
             .leftJoin(restaurantLike).on(restaurant.id.eq(restaurantLike.restaurantId))
             .orderBy(*orderSpecifier.toTypedArray())
+            .fetchJoin()
             .offset(pageable.offset)
             .limit(pageable.pageSize.toLong())
             .fetch()
@@ -176,9 +177,7 @@ class RestaurantRepositoryCustomImpl(
             .where(restaurantCategory.restaurantId.`in`(restaurantIds))
             .fetch()
 
-        val uniqueRestaurantInfos = restaurantInfos.distinctBy { it.id }
-
-        val restaurantDtos = uniqueRestaurantInfos.map { restaurantInfo ->
+        val restaurantDtos = restaurantInfos.distinctBy { it.id }.map { restaurantInfo ->
             val likedUserIds = restaurantIds.map { true }
             val menuList = menus.filter { it.restaurantId == restaurantInfo.id }
             val review = reviews.firstOrNull { it.restaurantId == restaurantInfo.id }

diff --git a/...tlin/com/restaurant/be/restaurant/presentation/controller/LikeRestaurantControllerTest.kt b/...tlin/com/restaurant/be/restaurant/presentation/controller/LikeRestaurantControllerTest.kt
@@ -346,6 +346,57 @@ class LikeRestaurantControllerTest(
             }
         }
 
+        describe("#getMyLikeRestaurants cartesian product bug test") {
+            it("when two user like same restaurant should return only one") {
+                // given
+                val newUser = userRepository.save(
+                    User(
+                        email = "test2@gmail.com",
+                        profileImageUrl = "test",
+                    )
+                )
+                val originalUser = userRepository.findByEmail("test@gmail.com")!!
+
+                val restaurantEntity = RestaurantUtil.generateRestaurantEntity(
+                    name = "목구멍 율전점"
+                )
+                restaurantRepository.save(restaurantEntity)
+                restaurantLikeRepository.save(
+                    RestaurantLike(
+                        userId = originalUser.id ?: 0,
+                        restaurantId = restaurantEntity.id
+                    )
+                )
+                restaurantLikeRepository.save(
+                    RestaurantLike(
+                        userId = newUser.id ?: 0,
+                        restaurantId = restaurantEntity.id
+                    )
+                )
+
+                // when
+                val result = mockMvc.perform(
+                    get("$baseUrl/my-like")
+                ).also {
+                    println(it.andReturn().response.contentAsString)
+                }
+                    .andExpect(status().isOk)
+                    .andExpect(jsonPath("$.result").value("SUCCESS"))
+                    .andReturn()
+
+                val responseContent = result.response.getContentAsString(Charset.forName("UTF-8"))
+                val responseType =
+                    object : TypeReference<CommonResponse<GetRestaurantsResponse>>() {}
+                val actualResult: CommonResponse<GetRestaurantsResponse> = objectMapper.readValue(
+                    responseContent,
+                    responseType
+                )
+
+                // then
+                actualResult.data!!.restaurants.content.size shouldBe 1
+            }
+        }
+
         describe("#likeRestaurant basic test") {
             it("when like restaurant should success like") {
                 // given