Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Revert "REVIEWED" to "TRANSLATED" when text changes #2807

Merged
merged 7 commits into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ class KeyComplexEditHelper(
return !currentTagsContainAllNewTags || !newTagsContainAllCurrentTags
}

val requireKeyEditPermission
private val requireKeyEditPermission
get() =
isKeyNameModified ||
isNamespaceChanged ||
Expand All @@ -333,7 +333,16 @@ class KeyComplexEditHelper(

private fun prepareModifiedStates() {
modifiedStates =
dto.states?.filter { it.value.translationState != existingTranslations[it.key]?.state }
dto.states?.filter {
// When updating translation, we automatically set it to TRANSLATED state
// While executing complex edit, user can prevent this by setting the state to REVIEWED
// In that case, we have to add it to modified states too
val tryingToKeepReviewState =
modifiedTranslations?.get(languageByTag(it.key).id) != null &&
it.value.translationState == TranslationState.REVIEWED

it.value.translationState != existingTranslations[it.key]?.state || tryingToKeepReviewState
}
?.map { languageByTag(it.key).id to it.value.translationState }?.toMap()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package io.tolgee.api.v2.controllers.batch

import io.tolgee.ProjectAuthControllerTest
import io.tolgee.fixtures.andIsOk
import io.tolgee.fixtures.waitForNotThrowing
import io.tolgee.model.enums.TranslationState
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired

class BatchChangeTranslationStateTest : ProjectAuthControllerTest("/v2/projects/") {
@Autowired
lateinit var batchJobTestBase: BatchJobTestBase

@BeforeEach
fun setup() {
batchJobTestBase.setup()
}

val testData
get() = batchJobTestBase.testData

@Test
@ProjectJWTAuthTestMethod
fun `it changes translation state`() {
val keyCount = 100
val keys = testData.addStateChangeData(keyCount)
batchJobTestBase.saveAndPrepare(this)

val allKeyIds = keys.map { it.id }.toList()
val keyIds = allKeyIds.take(10)
val allLanguageIds = testData.projectBuilder.data.languages.map { it.self.id }
val languagesToChangeStateIds = listOf(testData.germanLanguage.id, testData.englishLanguage.id)

performProjectAuthPost(
"start-batch-job/set-translation-state",
mapOf(
"keyIds" to keyIds,
"languageIds" to languagesToChangeStateIds,
"state" to "REVIEWED",
),
).andIsOk

waitForNotThrowing(pollTime = 1000, timeout = 10000) {
val all =
translationService.getTranslations(
keys.map { it.id },
allLanguageIds,
)
all.count { it.state == TranslationState.REVIEWED }.assert.isEqualTo(keyIds.size * 2)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package io.tolgee.api.v2.controllers.batch

import io.tolgee.ProjectAuthControllerTest
import io.tolgee.fixtures.andIsOk
import io.tolgee.fixtures.waitForNotThrowing
import io.tolgee.model.enums.TranslationState
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired

class BatchClearTranslationsTest : ProjectAuthControllerTest("/v2/projects/") {
@Autowired
lateinit var batchJobTestBase: BatchJobTestBase

@BeforeEach
fun setup() {
batchJobTestBase.setup()
}

val testData
get() = batchJobTestBase.testData

@Test
@ProjectJWTAuthTestMethod
fun `it clears translations`() {
val keyCount = 1000
val keys = testData.addStateChangeData(keyCount)
batchJobTestBase.saveAndPrepare(this)

val allKeyIds = keys.map { it.id }.toList()
val keyIds = allKeyIds.take(10)
val allLanguageIds = testData.projectBuilder.data.languages.map { it.self.id }
val languagesToClearIds = listOf(testData.germanLanguage.id, testData.englishLanguage.id)

performProjectAuthPost(
"start-batch-job/clear-translations",
mapOf(
"keyIds" to keyIds,
"languageIds" to languagesToClearIds,
),
).andIsOk

waitForNotThrowing(pollTime = 1000, timeout = 10000) {
val all =
translationService.getTranslations(
keys.map { it.id },
allLanguageIds,
)
all.count { it.state == TranslationState.UNTRANSLATED && it.text == null }.assert.isEqualTo(keyIds.size * 2)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package io.tolgee.api.v2.controllers.batch

import io.tolgee.ProjectAuthControllerTest
import io.tolgee.fixtures.andIsOk
import io.tolgee.fixtures.waitForNotThrowing
import io.tolgee.model.enums.TranslationState
import io.tolgee.model.key.Key
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired

class BatchCopyTranslationsTest : ProjectAuthControllerTest("/v2/projects/") {
@Autowired
lateinit var batchJobTestBase: BatchJobTestBase

@BeforeEach
fun setup() {
batchJobTestBase.setup()
}

val testData
get() = batchJobTestBase.testData

@Test
@ProjectJWTAuthTestMethod
fun `it copies translations`() {
val keyCount = 1000
val keys = testData.addStateChangeData(keyCount)
batchJobTestBase.saveAndPrepare(this)

val allKeyIds = keys.map { it.id }.toList()
val keyIds = allKeyIds.take(10)
val allLanguageIds = testData.projectBuilder.data.languages.map { it.self.id }
val languagesToChangeStateIds = listOf(testData.germanLanguage.id, testData.czechLanguage.id)

performProjectAuthPost(
"start-batch-job/copy-translations",
mapOf(
"keyIds" to keyIds,
"sourceLanguageId" to testData.englishLanguage.id,
"targetLanguageIds" to languagesToChangeStateIds,
),
).andIsOk

waitForNotThrowing(pollTime = 1000, timeout = 10000) {
val all =
translationService.getTranslations(
keys.map { it.id },
allLanguageIds,
)
all.count { it.text?.startsWith("en") == true }.assert.isEqualTo(allKeyIds.size + keyIds.size * 2)
}
}

@Test
@ProjectJWTAuthTestMethod
fun `it resets the state for key`() {
val key = testData.addKeyWithTranslationsReviewed()
batchJobTestBase.saveAndPrepare(this)

assertGermanAKeyState(key, TranslationState.REVIEWED)

val languagesToChangeStateIds = listOf(testData.germanLanguage.id)

performProjectAuthPost(
"start-batch-job/copy-translations",
mapOf(
"keyIds" to listOf(key.id),
"sourceLanguageId" to testData.englishLanguage.id,
"targetLanguageIds" to languagesToChangeStateIds,
),
).andIsOk

waitForNotThrowing(pollTime = 1000, timeout = 10000) {
assertGermanAKeyState(key, TranslationState.TRANSLATED)
}
}

private fun assertGermanAKeyState(
key: Key,
translationState: TranslationState,
) {
translationService.getTranslations(listOf(key.id), listOf(testData.germanLanguage.id))
.single().state.assert.isEqualTo(translationState)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package io.tolgee.api.v2.controllers.batch

import io.tolgee.ProjectAuthControllerTest
import io.tolgee.fixtures.andIsOk
import io.tolgee.fixtures.waitForNotThrowing
import io.tolgee.model.batch.BatchJob
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
import io.tolgee.testing.assert
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired

class BatchDeleteKeysTest : ProjectAuthControllerTest("/v2/projects/") {
@Autowired
lateinit var batchJobTestBase: BatchJobTestBase

@BeforeEach
fun setup() {
batchJobTestBase.setup()
}

val testData
get() = batchJobTestBase.testData

@Test
@ProjectJWTAuthTestMethod
fun `it deletes keys`() {
val keyCount = 100
val keys = testData.addTranslationOperationData(keyCount)
batchJobTestBase.saveAndPrepare(this)

val keyIds = keys.map { it.id }.toList()

val result =
performProjectAuthPost(
"start-batch-job/delete-keys",
mapOf(
"keyIds" to keyIds,
),
).andIsOk

batchJobTestBase.waitForJobCompleted(result)

waitForNotThrowing(pollTime = 1000, timeout = 10000) {
val all = keyService.getAll(testData.projectBuilder.self.id)
all.assert.hasSize(1)
}

waitForNotThrowing(pollTime = 1000, timeout = 10000) {
executeInNewTransaction {
val data =
entityManager
.createQuery("""from BatchJob""", BatchJob::class.java)
.resultList

data.assert.hasSize(1)
data[0].activityRevision.assert.isNotNull
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package io.tolgee.api.v2.controllers.batch

import io.tolgee.AbstractSpringTest
import io.tolgee.batch.ApplicationBatchJobRunner
import io.tolgee.testing.assert
import org.junit.jupiter.api.Test
import org.springframework.boot.test.context.SpringBootTest

@SpringBootTest
class BatchJobRunnerStopTest : AbstractSpringTest() {
@Test
fun `it stops`() {
ApplicationBatchJobRunner.stopAll()
ApplicationBatchJobRunner.runningInstances.assert.hasSize(0)
}
}
Loading
Loading