BE: Handling errors the same way as warnings

tolgee · Dec 18, 2024 · c0626d0 · c0626d0
1 parent 91ab2c6
commit c0626d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/backend/data/src/main/kotlin/io/tolgee/service/dataImport/CoreImportFilesProcessor.kt b/backend/data/src/main/kotlin/io/tolgee/service/dataImport/CoreImportFilesProcessor.kt
@@ -57,12 +57,12 @@ class CoreImportFilesProcessor(
     )
   }
 
+  val errors = mutableListOf<ErrorResponseBody>()
   val warnings = mutableListOf<ErrorResponseBody>()
 
-  fun processFiles(files: Collection<ImportFileDto>?): List<ErrorResponseBody> {
-    val errors = processFilesRecursive(files)
+  fun processFiles(files: Collection<ImportFileDto>?) {
+    errors.addAll(processFilesRecursive(files))
     renderPossibleNamespacesWarning()
-    return errors
   }
 
   private fun processFilesRecursive(files: Collection<ImportFileDto>?): List<ErrorResponseBody> {

diff --git a/backend/data/src/main/kotlin/io/tolgee/service/dataImport/ImportService.kt b/backend/data/src/main/kotlin/io/tolgee/service/dataImport/ImportService.kt
@@ -99,12 +99,12 @@ class ImportService(
         projectIcuPlaceholdersEnabled = project.icuPlaceholders,
         importSettings = importSettingsService.get(userAccount, project.id),
       )
-    val errors = fileProcessor.processFiles(files)
+    fileProcessor.processFiles(files)
 
     if (findLanguages(import).isEmpty()) {
       TransactionInterceptor.currentTransactionStatus().setRollbackOnly()
     }
-    return errors to fileProcessor.warnings
+    return fileProcessor.errors to fileProcessor.warnings
   }
 
   @Transactional
@@ -135,11 +135,11 @@ class ImportService(
         importSettings = params,
         saveData = false,
       )
-    val errors = fileProcessor.processFiles(files)
+    fileProcessor.processFiles(files)
 
-    if (errors.isNotEmpty()) {
+    if (fileProcessor.errors.isNotEmpty()) {
       @Suppress("UNCHECKED_CAST")
-      throw BadRequestException(Message.IMPORT_FAILED, errors as List<Serializable>)
+      throw BadRequestException(Message.IMPORT_FAILED, fileProcessor.errors as List<Serializable>)
     }
 
     if (fileProcessor.importDataManager.storedLanguages.isEmpty()) {