diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/member/contentpreference/MemberContentPreferenceIntegrationTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/member/contentpreference/MemberContentPreferenceIntegrationTest.kt index 0a527dcb..994084b9 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/member/contentpreference/MemberContentPreferenceIntegrationTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/member/contentpreference/MemberContentPreferenceIntegrationTest.kt @@ -7,6 +7,7 @@ import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.MemberRepository import kr.co.vividnext.sodalive.member.auth.Auth import kr.co.vividnext.sodalive.member.auth.AuthRepository +import kr.co.vividnext.sodalive.support.hasForcedCountryMapping import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertNotNull @@ -30,10 +31,6 @@ class MemberContentPreferenceIntegrationTest @Autowired constructor( private val preferenceRepository: MemberContentPreferenceRepository, private val entityManager: EntityManager ) { - companion object { - private val FORCED_MEMBER_IDS = setOf(16L, 17L, 29721L, 32050L, 37543L, 40850L) - } - private lateinit var service: MemberContentPreferenceService private lateinit var countryContext: CountryContext @@ -273,7 +270,7 @@ class MemberContentPreferenceIntegrationTest @Autowired constructor( var index = 0 while (true) { val candidate = saveMember("$seed-$index") - if (!FORCED_MEMBER_IDS.contains(candidate.id)) { + if (!candidate.hasForcedCountryMapping()) { return candidate } index++ diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/content/recommendation/adapter/in/web/AudioRecommendationEndToEndTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/content/recommendation/adapter/in/web/AudioRecommendationEndToEndTest.kt index 9837f9ee..d965cc50 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/content/recommendation/adapter/in/web/AudioRecommendationEndToEndTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/content/recommendation/adapter/in/web/AudioRecommendationEndToEndTest.kt @@ -19,6 +19,7 @@ import kr.co.vividnext.sodalive.member.MemberRole import kr.co.vividnext.sodalive.member.auth.Auth import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreference import kr.co.vividnext.sodalive.support.EmbeddedRedisInitializer +import kr.co.vividnext.sodalive.support.hasForcedCountryMapping import kr.co.vividnext.sodalive.v2.recommendation.adapter.out.persistence.RecommendationSnapshot import kr.co.vividnext.sodalive.v2.recommendation.domain.RecommendedSectionType import org.junit.jupiter.api.DisplayName @@ -84,7 +85,7 @@ class AudioRecommendationEndToEndTest @Autowired constructor( } else { val role = if (viewerType == "ADMIN") MemberRole.ADMIN else MemberRole.USER var candidate = saveMember("audio-event-viewer", role) - while (candidate.id in setOf(16L, 17L, 17958L, 44144L, 29721L, 32050L, 37543L, 40850L)) { + while (candidate.hasForcedCountryMapping()) { candidate = saveMember("audio-event-viewer-${candidate.id}", role) } candidate diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/home/HomeRecommendationControllerTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/home/HomeRecommendationControllerTest.kt index 54b581c5..4ca57e45 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/home/HomeRecommendationControllerTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/home/HomeRecommendationControllerTest.kt @@ -19,6 +19,7 @@ import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreference import kr.co.vividnext.sodalive.member.following.CreatorFollowing import kr.co.vividnext.sodalive.member.following.CreatorFollowingRepository import kr.co.vividnext.sodalive.support.EmbeddedRedisInitializer +import kr.co.vividnext.sodalive.support.hasForcedCountryMapping import kr.co.vividnext.sodalive.v2.api.home.application.HomeRecommendationFacade import kr.co.vividnext.sodalive.v2.creator.channel.community.translation.application.CreatorCommunityDisplayContent import kr.co.vividnext.sodalive.v2.creator.channel.community.translation.application.CreatorCommunityTranslationService @@ -421,7 +422,7 @@ class HomeRecommendationControllerTest @Autowired constructor( } else { val role = if (viewerType == "ADMIN") MemberRole.ADMIN else MemberRole.USER var candidate = saveMember("home-event-viewer", role) - while (candidate.id in setOf(16L, 17L, 17958L, 44144L, 29721L, 32050L, 37543L, 40850L)) { + while (candidate.hasForcedCountryMapping()) { candidate = saveMember("home-event-viewer-${candidate.id}", role) } candidate