From 273db30e2bac9ddb0cdfebab7bc928769c3f4847 Mon Sep 17 00:00:00 2001
From: Jean Aurambault <aurambaj@users.noreply.github.com>
Date: Tue, 11 Jul 2023 21:57:05 -0700
Subject: [PATCH] Fixes batch import logic to save target comments

Previously, the source comment (text unit) was systemically copied into the target comment (text unit variant) and that for all imported translations. This seems to be the behavior since day 1 of the TextUnitBatchImporterService, yet it is a bug.

It affects ThirdPartySync and all other batch imports.
---
 .../box/l10n/mojito/okapi/AbstractImportTranslationsStep.java | 2 +-
 .../service/tm/importer/TextUnitBatchImporterService.java     | 4 ++--
 .../service/tm/importer/TextUnitBatchImporterServiceTest.java | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/webapp/src/main/java/com/box/l10n/mojito/okapi/AbstractImportTranslationsStep.java b/webapp/src/main/java/com/box/l10n/mojito/okapi/AbstractImportTranslationsStep.java
index 05c07335fa..06f81bf1ec 100644
--- a/webapp/src/main/java/com/box/l10n/mojito/okapi/AbstractImportTranslationsStep.java
+++ b/webapp/src/main/java/com/box/l10n/mojito/okapi/AbstractImportTranslationsStep.java
@@ -445,7 +445,7 @@ TMTextUnitVariant importTextUnit(
               tmTextUnitId,
               targetLocaleId,
               targetString,
-              null,
+              targetComment,
               status,
               includedInLocalizedFile,
               createdDate,
diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterService.java b/webapp/src/main/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterService.java
index 32423c9247..035fa8b64d 100644
--- a/webapp/src/main/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterService.java
+++ b/webapp/src/main/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterService.java
@@ -234,7 +234,7 @@ boolean isUpdateNeeded(TextUnitForBatchMatcherImport textUnitForBatchImport) {
             currentTextUnit.getStatus(),
             DigestUtils.md5Hex(currentTextUnit.getTarget()),
             currentTextUnit.isIncludedInLocalizedFile(),
-            currentTextUnit.getComment(),
+            currentTextUnit.getTargetComment(),
             textUnitForBatchImport.getStatus(),
             DigestUtils.md5Hex(textUnitForBatchImport.getContent()),
             textUnitForBatchImport.isIncludedInLocalizedFile(),
@@ -359,7 +359,7 @@ List<TextUnitForBatchMatcherImport> skipInvalidAndConvertToTextUnitForBatchImpor
 
               textUnitForBatchImport.setLocale(localeService.findByBcp47Tag(t.getTargetLocale()));
               textUnitForBatchImport.setContent(NormalizationUtils.normalize(t.getTarget()));
-              textUnitForBatchImport.setComment(t.getComment());
+              textUnitForBatchImport.setComment(t.getTargetComment());
               textUnitForBatchImport.setIncludedInLocalizedFile(t.isIncludedInLocalizedFile());
               textUnitForBatchImport.setStatus(t.getStatus() == null ? APPROVED : t.getStatus());
 
diff --git a/webapp/src/test/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterServiceTest.java b/webapp/src/test/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterServiceTest.java
index bacd3866d3..14ef53628a 100644
--- a/webapp/src/test/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterServiceTest.java
+++ b/webapp/src/test/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterServiceTest.java
@@ -80,6 +80,7 @@ public void testAsyncImportTextUnitsNameOnly() throws InterruptedException {
     textUnitDTO.setAssetPath(tmTestData.asset.getPath());
     textUnitDTO.setName("TEST2");
     textUnitDTO.setTarget("TEST2 translation for fr");
+    textUnitDTO.setComment("Comment2");
 
     TextUnitDTO textUnitDTO2 = new TextUnitDTO();
     textUnitDTO2.setRepositoryName(tmTestData.repository.getName());
@@ -87,6 +88,7 @@ public void testAsyncImportTextUnitsNameOnly() throws InterruptedException {
     textUnitDTO2.setAssetPath(tmTestData.asset.getPath());
     textUnitDTO2.setName("TEST3");
     textUnitDTO2.setTarget("TEST3 translation for fr");
+    textUnitDTO2.setTargetComment("TEST3 target comment");
 
     TextUnitDTO textUnitDTO3 = new TextUnitDTO();
     textUnitDTO3.setRepositoryName(tmTestData.repository.getName());
@@ -121,9 +123,11 @@ public void testAsyncImportTextUnitsNameOnly() throws InterruptedException {
     i++;
     assertEquals("TEST2", textUnitDTOsFromSearch.get(i).getName());
     assertEquals("TEST2 translation for fr", textUnitDTOsFromSearch.get(i).getTarget());
+    assertNull(textUnitDTOsFromSearch.get(i).getTargetComment());
     i++;
     assertEquals("TEST3", textUnitDTOsFromSearch.get(i).getName());
     assertEquals("TEST3 translation for fr", textUnitDTOsFromSearch.get(i).getTarget());
+    assertEquals("TEST3 target comment", textUnitDTOsFromSearch.get(i).getTargetComment());
     i++;
   }