fix: Resolvable import timing out (tolgee#2484)

JanCizmar · web-flow · commit a4e5c05436be · 2024-09-24T17:25:38.000+02:00
diff --git a/backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/v2KeyController/KeyControllerResolvableImportTest.kt b/backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/v2KeyController/KeyControllerResolvableImportTest.kt
@@ -19,6 +19,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.core.io.Resource
 import kotlin.properties.Delegates
+import kotlin.time.measureTime
 
 @SpringBootTest
 @AutoConfigureMockMvc
@@ -147,6 +148,40 @@ class KeyControllerResolvableImportTest : ProjectAuthControllerTest("/v2/project
     }
   }
 
+  @Test
+  @ProjectJWTAuthTestMethod
+  fun `it imports a lot of data (and set outdated) in time`() {
+    val lotOfKeys = testData.addLotOfKeys(5000)
+    testDataService.saveTestData(testData.root)
+
+    val toImport =
+      lotOfKeys.map {
+        mapOf(
+          "name" to it.name,
+          "translations" to
+            mapOf(
+              "en" to
+                mapOf(
+                  "text" to "new",
+                  "resolution" to "OVERRIDE",
+                ),
+            ),
+        )
+      }
+
+    val time =
+      measureTime {
+        performProjectAuthPost(
+          "keys/import-resolvable",
+          mapOf(
+            "keys" to toImport,
+          ),
+        ).andIsOk
+      }
+
+    time.inWholeSeconds.assert.isLessThan(10)
+  }
+
   @Test
   @ProjectJWTAuthTestMethod
   fun `it returns errors correctly`() {
diff --git a/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/ResolvableImportTestData.kt b/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/ResolvableImportTestData.kt
@@ -5,6 +5,7 @@ import io.tolgee.model.Screenshot
 import io.tolgee.model.UserAccount
 import io.tolgee.model.enums.Scope
 import io.tolgee.model.enums.TranslationState
+import io.tolgee.model.key.Key
 
 class ResolvableImportTestData : BaseTestData() {
   lateinit var key1and2Screenshot: Screenshot
@@ -103,4 +104,12 @@ class ResolvableImportTestData : BaseTestData() {
       translateLanguages = mutableSetOf(englishLanguage)
     }
   }
+
+  fun addLotOfKeys(count: Int): List<Key> {
+    return (1..count).map {
+      projectBuilder.addKey(keyName = "key-lot-$it") {
+        addTranslation("en", "existing translation")
+      }.self
+    }
+  }
 }
diff --git a/backend/data/src/main/kotlin/io/tolgee/service/key/ResolvingKeyImporter.kt b/backend/data/src/main/kotlin/io/tolgee/service/key/ResolvingKeyImporter.kt
@@ -11,7 +11,11 @@ import io.tolgee.exceptions.NotFoundException
 import io.tolgee.exceptions.PermissionException
 import io.tolgee.formats.convertToIcuPlurals
 import io.tolgee.formats.convertToPluralIfAnyIsPlural
-import io.tolgee.model.*
+import io.tolgee.model.Language
+import io.tolgee.model.Project
+import io.tolgee.model.Project_
+import io.tolgee.model.Screenshot
+import io.tolgee.model.UploadedImage
 import io.tolgee.model.enums.Scope
 import io.tolgee.model.key.Key
 import io.tolgee.model.key.Key_
@@ -107,6 +111,7 @@ class ResolvingKeyImporter(
       }
 
     translationService.onKeyIsPluralChanged(isPluralChangedForKeys, true, updatedTranslationIds)
+    translationService.setOutdatedBatch(outdatedKeys)
 
     return result
   }
@@ -146,8 +151,6 @@ class ResolvingKeyImporter(
   }
 
   private fun List<TranslationToModify>.save() {
-    translationService.setOutdatedBatch(outdatedKeys)
-
     this.forEach {
       translationService.setTranslation(it.translation, it.text)
       updatedTranslationIds.add(it.translation.id)
diff --git a/e2e/cypress/e2e/security/login.cy.ts b/e2e/cypress/e2e/security/login.cy.ts
@@ -64,7 +64,7 @@ context('Login', () => {
     checkAnonymousIdUnset();
     checkAnonymousUserIdentified();
   });
-  it('login with oauth2', () => {
+  it('login with oauth2', { retries: { runMode: 5 } }, () => {
     disableEmailVerification();
 
     loginWithFakeOAuth2();

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import io.tolgee.model.Screenshot`
`5`	`5`	`import io.tolgee.model.UserAccount`
`6`	`6`	`import io.tolgee.model.enums.Scope`
`7`	`7`	`import io.tolgee.model.enums.TranslationState`
	`8`	`+import io.tolgee.model.key.Key`
`8`	`9`
`9`	`10`	`class ResolvableImportTestData : BaseTestData() {`
`10`	`11`	`lateinit var key1and2Screenshot: Screenshot`
`@@ -103,4 +104,12 @@ class ResolvableImportTestData : BaseTestData() {`
`103`	`104`	`translateLanguages = mutableSetOf(englishLanguage)`
`104`	`105`	`}`
`105`	`106`	`}`
	`107`	`+`
	`108`	`+ fun addLotOfKeys(count: Int): List<Key> {`
	`109`	`+ return (1..count).map {`
	`110`	`+ projectBuilder.addKey(keyName = "key-lot-$it") {`
	`111`	`+ addTranslation("en", "existing translation")`
	`112`	`+ }.self`
	`113`	`+ }`
	`114`	`+ }`
`106`	`115`	`}`