fix: Import -> Collisions between files handling (#2612)

tolgee · Oct 21, 2024 · 8f085a6 · 8f085a6
1 parent d9a95ce
commit 8f085a6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/.../kotlin/io/tolgee/api/v2/controllers/v2ImportController/V2ImportControllerAddFilesTest.kt b/.../kotlin/io/tolgee/api/v2/controllers/v2ImportController/V2ImportControllerAddFilesTest.kt
@@ -301,6 +301,28 @@ class V2ImportControllerAddFilesTest : ProjectAuthControllerTest("/v2/projects/"
     }
   }
 
+  @Test
+  fun `correctly reports collisions between files`() {
+    val testData = ImportCleanTestData()
+    testDataService.saveTestData(testData.root)
+
+    loginAsUser(testData.userAccount.username)
+    performImport(
+      projectId = testData.project.id,
+      listOf(
+        Pair("en.json", simpleJson),
+      ),
+    ).andIsOk
+    performImport(
+      projectId = testData.project.id,
+      listOf(
+        Pair("en.json", simpleJson),
+      ),
+    ).andIsOk.andPrettyPrint.andAssertThatJson {
+      node("result._embedded.languages[1].importFileIssueCount").isEqualTo(1)
+    }
+  }
+
   private fun validateSavedJsonImportData(
     project: Project,
     userAccount: UserAccount,

diff --git a/backend/data/src/main/kotlin/io/tolgee/service/dataImport/ImportDataManager.kt b/backend/data/src/main/kotlin/io/tolgee/service/dataImport/ImportDataManager.kt
@@ -4,7 +4,11 @@ import io.tolgee.api.IImportSettings
 import io.tolgee.formats.CollisionHandler
 import io.tolgee.formats.isSamePossiblePlural
 import io.tolgee.model.Language
-import io.tolgee.model.dataImport.*
+import io.tolgee.model.dataImport.Import
+import io.tolgee.model.dataImport.ImportFile
+import io.tolgee.model.dataImport.ImportKey
+import io.tolgee.model.dataImport.ImportLanguage
+import io.tolgee.model.dataImport.ImportTranslation
 import io.tolgee.model.dataImport.issues.ImportFileIssue
 import io.tolgee.model.dataImport.issues.issueTypes.FileIssueType
 import io.tolgee.model.dataImport.issues.paramTypes.FileIssueParamType
@@ -236,7 +240,7 @@ class ImportDataManager(
 
   fun resetCollisionsBetweenFiles(
     editedLanguage: ImportLanguage,
-    oldExistingLanguage: Language?,
+    oldExistingLanguage: Language? = null,
   ) {
     val affectedLanguages =
       storedLanguages.filter {
@@ -314,7 +318,7 @@ class ImportDataManager(
       )
 
     storedTranslations.firstOrNull {
-      it.isSelectedToImport && it.text != newTranslation.text
+      it.isSelectedToImport
     }?.let { collision ->
       val handled = tryHandleUsingCollisionHandlers(listOf(newTranslation) + storedTranslations)
       if (handled) {

diff --git a/backend/data/src/main/kotlin/io/tolgee/util/filterImportFiles.kt b/backend/data/src/main/kotlin/io/tolgee/util/filterImportFiles.kt
@@ -6,6 +6,8 @@ val IGNORED_REGEXES by lazy {
     "^[\\w-_]+\\.xcloc/contents.json$".toRegex(),
     "^.+\\.xcloc/Source Contents/Localizable.xcstrings$".toRegex(),
     "^.+\\.xcloc/Source Contents/.*InfoPlist.xcstrings$".toRegex(),
+    // .DS_Store files
+    """(.*/|^)\.DS_Store$""".toRegex(),
   )
 }