fix: API 버그 수정 (#60)

* fix: 셀럽 관심 여부 반영 안되는 오류 수정 * fix: 초기 데이터 정합성 오류 수정 * fix: 소셜 로그인 리다이렉트 url 검증 오류 수정
2024-celuveat · Sep 3, 2024 · 264b582 · 264b582
1 parent 46948d3
commit 264b582
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 6 deletions.
diff --git a/server-profile-submodule b/server-profile-submodule
diff --git a/src/main/kotlin/com/celuveat/celeb/adapter/out/persistence/CelebrityPersistenceAdapter.kt b/src/main/kotlin/com/celuveat/celeb/adapter/out/persistence/CelebrityPersistenceAdapter.kt
@@ -27,7 +27,7 @@ class CelebrityPersistenceAdapter(
                         it.celebrity,
                         youtubeContentsByCelebrity[it.celebrity.id]!!,
                     )
-                }.distinct()
+                }
             }
     }
 

diff --git a/src/main/kotlin/com/celuveat/celeb/application/CelebrityQueryService.kt b/src/main/kotlin/com/celuveat/celeb/application/CelebrityQueryService.kt
@@ -67,7 +67,10 @@ class CelebrityQueryService(
     override fun readCelebrity(query: ReadCelebrityQuery): CelebrityWithInterestedResult {
         val celebrity = readCelebritiesPort.readById(query.celebrityId)
         val interested = query.memberId?.let {
-            readInterestedCelebritiesPort.existsInterestedCelebrity(it, query.celebrityId)
+            readInterestedCelebritiesPort.existsInterestedCelebrity(
+                memberId = it,
+                celebrityId = query.celebrityId,
+            )
         } ?: false
         return CelebrityWithInterestedResult.of(
             celebrity = celebrity,

diff --git a/src/main/kotlin/com/celuveat/common/adapter/out/persistence/entity/DummyEntityInitializer.kt b/src/main/kotlin/com/celuveat/common/adapter/out/persistence/entity/DummyEntityInitializer.kt
@@ -730,7 +730,24 @@ class DummyEntityInitializer(
                 video = savedVideos[13],
                 restaurant = savedRestaurants[15],
             ),
+            RestaurantInVideoJpaEntity(
+                video = savedVideos[13],
+                restaurant = savedRestaurants[16],
+            ),
+            RestaurantInVideoJpaEntity(
+                video = savedVideos[13],
+                restaurant = savedRestaurants[17],
+            ),
+            RestaurantInVideoJpaEntity(
+                video = savedVideos[13],
+                restaurant = savedRestaurants[18],
+            ),
+            RestaurantInVideoJpaEntity(
+                video = savedVideos[13],
+                restaurant = savedRestaurants[19],
+            ),
         )
+
         val celebrityRestaurantE = listOf(
             CelebrityRestaurantJpaEntity(
                 celebrity = savedCelebrities[4],
@@ -748,6 +765,22 @@ class DummyEntityInitializer(
                 celebrity = savedCelebrities[4],
                 restaurant = savedRestaurants[15],
             ),
+            CelebrityRestaurantJpaEntity(
+                celebrity = savedCelebrities[4],
+                restaurant = savedRestaurants[16],
+            ),
+            CelebrityRestaurantJpaEntity(
+                celebrity = savedCelebrities[4],
+                restaurant = savedRestaurants[17],
+            ),
+            CelebrityRestaurantJpaEntity(
+                celebrity = savedCelebrities[4],
+                restaurant = savedRestaurants[18],
+            ),
+            CelebrityRestaurantJpaEntity(
+                celebrity = savedCelebrities[4],
+                restaurant = savedRestaurants[19],
+            ),
         )
 
         restaurantInVideoJpaRepository.saveAll(

diff --git a/src/main/kotlin/com/celuveat/member/adapter/out/oauth/google/GoogleSocialLoginClient.kt b/src/main/kotlin/com/celuveat/member/adapter/out/oauth/google/GoogleSocialLoginClient.kt
@@ -24,8 +24,9 @@ class GoogleSocialLoginClient(
         authCode: String,
         requestOrigin: String,
     ): Member {
-        validateAllowedRedirectUrl(requestOrigin)
-        val socialLoginToken = fetchAccessToken(authCode, toRedirectUrl(requestOrigin))
+        val redirectUrl = toRedirectUrl(requestOrigin)
+        validateAllowedRedirectUrl(redirectUrl)
+        val socialLoginToken = fetchAccessToken(authCode, redirectUrl)
         return fetchMemberInfo(socialLoginToken.accessToken).toMember()
     }
 

diff --git a/src/main/kotlin/com/celuveat/member/adapter/out/oauth/naver/NaverSocialLoginClient.kt b/src/main/kotlin/com/celuveat/member/adapter/out/oauth/naver/NaverSocialLoginClient.kt
@@ -24,7 +24,8 @@ class NaverSocialLoginClient(
         authCode: String,
         requestOrigin: String,
     ): Member {
-        validateAllowedRedirectUrl(requestOrigin)
+        val redirectUrl = toRedirectUrl(requestOrigin)
+        validateAllowedRedirectUrl(redirectUrl)
         val socialLoginToken = fetchAccessToken(authCode)
         return fetchMemberInfo(socialLoginToken.accessToken).toMember()
     }
@@ -73,4 +74,6 @@ class NaverSocialLoginClient(
         )
         naverApiClient.withdraw(tokenRequestBody)
     }
+
+    private fun toRedirectUrl(requestOrigin: String) = "$requestOrigin/oauth/naver"
 }