feat(content): 관리자 번역 후보 선택과 필드별 승인 보호를 구현한다
This commit is contained in:
+42
-1
@@ -20,6 +20,8 @@ import kr.co.vividnext.sodalive.i18n.translation.TranslationJobStatus
|
||||
import kr.co.vividnext.sodalive.i18n.translation.TranslationJobWorker
|
||||
import kr.co.vividnext.sodalive.i18n.translation.TranslationMemory
|
||||
import kr.co.vividnext.sodalive.i18n.translation.TranslationMemoryRepository
|
||||
import kr.co.vividnext.sodalive.i18n.translation.TranslationSourceExtractor
|
||||
import kr.co.vividnext.sodalive.i18n.translation.TranslationSourceField
|
||||
import kr.co.vividnext.sodalive.member.Member
|
||||
import kr.co.vividnext.sodalive.member.MemberRole
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
@@ -69,6 +71,7 @@ class AudioContentDetailTranslationHttpIntegrationTest @Autowired constructor(
|
||||
private val jdbc: JdbcTemplate,
|
||||
private val worker: TranslationJobWorker,
|
||||
private val scheduler: ResourceTranslationJobScheduler,
|
||||
private val sourceExtractor: TranslationSourceExtractor,
|
||||
private val entityManager: EntityManager,
|
||||
transactionManager: PlatformTransactionManager
|
||||
) {
|
||||
@@ -133,7 +136,45 @@ class AudioContentDetailTranslationHttpIntegrationTest @Autowired constructor(
|
||||
assertEquals("ko", response.path("languageCode").textValue())
|
||||
assertEquals("ko", transaction.execute { entityManager.find(AudioContent::class.java, fixture.first).languageCode })
|
||||
assertEquals(listOf("원문 제목 원문 설명 #힐링"), provider.detectionQueries)
|
||||
assertEquals(0L, jobs.count())
|
||||
assertEquals(6L, jobs.count())
|
||||
assertEquals(setOf("en", "ja"), jobs.findAll().map { it.targetLanguage }.toSet())
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("상세와 추출기는 연관 ID 순서의 활성 태그와 같은 원문을 사용하고 메모리 정규화를 유지한다")
|
||||
fun shouldShareOrderedActiveSourceAcrossExtractorAndDetail() {
|
||||
val fixture = fixture(null, detail = "\t원문 설명 \n")
|
||||
transaction.executeWithoutResult {
|
||||
val content = entityManager.find(AudioContent::class.java, fixture.first)
|
||||
content.title = " 원문 제목 \t"
|
||||
val tag = HashTag(" #차분")
|
||||
entityManager.persist(tag)
|
||||
entityManager.persist(
|
||||
AudioContentHashTag().apply {
|
||||
audioContent = content
|
||||
hashTag = tag
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
val response = detail(fixture)
|
||||
val extracted = transaction.execute {
|
||||
entityManager.find(AudioContent::class.java, fixture.first).audioContentHashTags.reverse()
|
||||
sourceExtractor.extract(LanguageTranslationTargetType.CONTENT, fixture.first)
|
||||
}
|
||||
|
||||
assertTranslation(response, "English title", "English detail", "#Healing, #Calm")
|
||||
assertEquals(listOf("원문 제목 원문 설명 #힐링 #차분"), provider.detectionQueries)
|
||||
assertEquals(
|
||||
listOf(
|
||||
TranslationSourceField("title", " 원문 제목 \t"),
|
||||
TranslationSourceField("detail", "\t원문 설명 \n"),
|
||||
TranslationSourceField("tags", "#힐링, #차분")
|
||||
),
|
||||
extracted?.fields
|
||||
)
|
||||
assertEquals(setOf("원문 제목", "원문 설명", "#힐링, #차분"), memories.findAll().map { it.sourceText }.toSet())
|
||||
memories.findAll().forEach { assertEquals(SourceTextNormalizer.hash(it.sourceText), it.sourceHash) }
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -125,6 +125,9 @@ class AudioContentServiceTest {
|
||||
homeFollowingNewsPublishService = homeFollowingNewsPublishService,
|
||||
memberContentPreferenceService = memberContentPreferenceService,
|
||||
subtitleJobService = subtitleJobService,
|
||||
sourceInvalidation = Mockito.mock(
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationSourceInvalidationService::class.java
|
||||
),
|
||||
transactionManager = Mockito.mock(PlatformTransactionManager::class.java),
|
||||
audioContentBucket = "audio-bucket",
|
||||
coverImageBucket = "cover-bucket",
|
||||
|
||||
+7
-1
@@ -29,6 +29,8 @@ import kr.co.vividnext.sodalive.member.MemberAdapter
|
||||
import kr.co.vividnext.sodalive.member.MemberRepository
|
||||
import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
|
||||
import kr.co.vividnext.sodalive.member.contentpreference.ViewerContentPreference
|
||||
import kr.co.vividnext.sodalive.v2.contenttranslation.adapter.out.persistence.JpaContentTranslationOverrideStore
|
||||
import kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationWriteService
|
||||
import kr.co.vividnext.sodalive.v2.creator.channel.community.translation.application.CreatorCommunityTranslationService
|
||||
import kr.co.vividnext.sodalive.v2.creatorname.application.CreatorLocalizedNameService
|
||||
import kr.co.vividnext.sodalive.v2.home.following.application.HomeFollowingNewsPublishService
|
||||
@@ -70,7 +72,11 @@ import javax.servlet.http.HttpServletResponse
|
||||
TranslationReadModelMaterializer::class, LanguageDetectionCacheService::class,
|
||||
AudioContentDetailTranslationService::class, TranslationMemoryService::class, TranslationJobWorker::class,
|
||||
LanguageDetectListener::class, ContentSeriesController::class, ContentSeriesService::class,
|
||||
ContentSeriesDetailTranslationService::class
|
||||
ContentSeriesDetailTranslationService::class,
|
||||
ContentTranslationWriteService::class,
|
||||
JpaContentTranslationOverrideStore::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationSourceInvalidationService::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationLanguageService::class
|
||||
)
|
||||
@MockBean(
|
||||
classes = [
|
||||
|
||||
+11
-4
@@ -86,9 +86,13 @@ import javax.persistence.EntityManager
|
||||
QueryDslConfig::class,
|
||||
AudioContentThemeQueryRepository::class,
|
||||
LanguageDetectListener::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationSourceInvalidationService::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationLanguageService::class,
|
||||
CreatorCommunityTranslationService::class,
|
||||
TranslationSourceExtractor::class,
|
||||
TranslationReadModelMaterializer::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationWriteService::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.adapter.out.persistence.JpaContentTranslationOverrideStore::class,
|
||||
TranslationCoordinator::class,
|
||||
PapagoTranslationService::class,
|
||||
ResourceTranslationJobScheduler::class,
|
||||
@@ -691,9 +695,10 @@ class CreatorCommunityLanguageDetectTest @Autowired constructor(
|
||||
@Bean
|
||||
@Primary
|
||||
fun languageDetectionCacheService(
|
||||
languageDetectionResultRepository: LanguageDetectionResultRepository
|
||||
languageDetectionResultRepository: LanguageDetectionResultRepository,
|
||||
transactionManager: PlatformTransactionManager
|
||||
): ControlledLanguageDetectionCacheService {
|
||||
return ControlledLanguageDetectionCacheService(languageDetectionResultRepository)
|
||||
return ControlledLanguageDetectionCacheService(languageDetectionResultRepository, transactionManager)
|
||||
}
|
||||
|
||||
@Bean
|
||||
@@ -732,14 +737,16 @@ class CreatorCommunityLanguageDetectTest @Autowired constructor(
|
||||
}
|
||||
|
||||
class ControlledLanguageDetectionCacheService(
|
||||
languageDetectionResultRepository: LanguageDetectionResultRepository
|
||||
languageDetectionResultRepository: LanguageDetectionResultRepository,
|
||||
transactionManager: PlatformTransactionManager
|
||||
) : LanguageDetectionCacheService(
|
||||
languageDetectionResultRepository,
|
||||
listOf(object : LanguageDetectionProvider {
|
||||
override val providerId = LanguageProviderId.PAPAGO
|
||||
override fun detect(query: String): String? = null
|
||||
}),
|
||||
LanguageProviderProperties(listOf(LanguageProviderId.PAPAGO), listOf(LanguageProviderId.PAPAGO))
|
||||
LanguageProviderProperties(listOf(LanguageProviderId.PAPAGO), listOf(LanguageProviderId.PAPAGO)),
|
||||
transactionManager
|
||||
) {
|
||||
val detections = ConcurrentHashMap<String, String>()
|
||||
val queries = ConcurrentLinkedQueue<String>()
|
||||
|
||||
+4
@@ -79,9 +79,13 @@ import java.util.concurrent.atomic.AtomicInteger
|
||||
PapagoTranslationService::class,
|
||||
TranslationCoordinator::class,
|
||||
LanguageDetectListener::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationSourceInvalidationService::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationLanguageService::class,
|
||||
CreatorCommunityTranslationService::class,
|
||||
TranslationSourceExtractor::class,
|
||||
TranslationReadModelMaterializer::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationWriteService::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.adapter.out.persistence.JpaContentTranslationOverrideStore::class,
|
||||
ResourceTranslationJobScheduler::class,
|
||||
TranslationJobScheduler::class
|
||||
)
|
||||
|
||||
+8
-1
@@ -9,6 +9,9 @@ import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.DisplayName
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.mockito.Mockito
|
||||
import org.springframework.transaction.PlatformTransactionManager
|
||||
import org.springframework.transaction.TransactionDefinition
|
||||
import org.springframework.transaction.support.SimpleTransactionStatus
|
||||
|
||||
class LanguageDetectionCacheServiceTest {
|
||||
@Test
|
||||
@@ -111,7 +114,11 @@ class LanguageDetectionCacheServiceTest {
|
||||
return LanguageDetectionCacheService(
|
||||
repository,
|
||||
listOf(provider),
|
||||
LanguageProviderProperties(listOf(LanguageProviderId.PAPAGO), listOf(LanguageProviderId.PAPAGO))
|
||||
LanguageProviderProperties(listOf(LanguageProviderId.PAPAGO), listOf(LanguageProviderId.PAPAGO)),
|
||||
Mockito.mock(PlatformTransactionManager::class.java).also {
|
||||
Mockito.`when`(it.getTransaction(Mockito.any(TransactionDefinition::class.java)))
|
||||
.thenReturn(SimpleTransactionStatus())
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+7
-2
@@ -55,6 +55,10 @@ import javax.persistence.EntityManager
|
||||
QueryDslConfig::class,
|
||||
AudioContentThemeQueryRepository::class,
|
||||
LanguageDetectListener::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationWriteService::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.adapter.out.persistence.JpaContentTranslationOverrideStore::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationSourceInvalidationService::class,
|
||||
kr.co.vividnext.sodalive.v2.contenttranslation.application.ContentTranslationLanguageService::class,
|
||||
TranslationSourceExtractor::class,
|
||||
ResourceTranslationJobScheduler::class,
|
||||
TranslationJobScheduler::class,
|
||||
@@ -137,7 +141,8 @@ class MetadataLanguageDetectTransactionTest @Autowired constructor(
|
||||
}
|
||||
|
||||
private fun prepareDetection(target: MetadataTarget): LanguageDetectEvent {
|
||||
Mockito.`when`(detectionCache.detectWithCache("원문 제목"))
|
||||
val query = if (target == MetadataTarget.CONTENT) "원문 제목 원문 설명" else "원문 제목"
|
||||
Mockito.`when`(detectionCache.detectWithCache(query))
|
||||
.thenReturn(DetectedLanguage("ko", LanguageProviderId.PAPAGO))
|
||||
val id = transaction.execute {
|
||||
val owner = persist(Member(password = "password", nickname = "metadata-owner", role = MemberRole.CREATOR))
|
||||
@@ -166,7 +171,7 @@ class MetadataLanguageDetectTransactionTest @Autowired constructor(
|
||||
}
|
||||
requireNotNull(persist(metadata).id)
|
||||
}!!
|
||||
return LanguageDetectEvent(id, "원문 제목", LanguageDetectTargetType.valueOf(target.name))
|
||||
return LanguageDetectEvent(id, query, LanguageDetectTargetType.valueOf(target.name))
|
||||
}
|
||||
|
||||
private fun <T : BaseEntity> persist(entity: T): T {
|
||||
|
||||
Reference in New Issue
Block a user