During batch import keep status only for string that are excluded

In current state it prevent to move string TRANSLATION_NEEDED to REVIEW_NEEDED/ACCEPTED

We typically wanted the previous behavior to be able to marked false positive excluded as ACCEPTED, and missed error as excluded. With the new change this should still work, but we can move

Author: ja-openai

webapp/src/main/java/com/box/l10n/mojito/service/oaitranslate/AiTranslateService.java

@@ -429,7 +429,8 @@ public void aiTranslateNoBatch(AiTranslateInput aiTranslateInput, PollableTask c
                           .filter(t -> t.textUnitDTOWithVariantComment() != null)
                           .map(TextUnitDTOWithVariantCommentOrError::textUnitDTOWithVariantComment)
                           .toList(),
-                      TextUnitBatchImporterService.IntegrityChecksType.KEEP_STATUS_IF_SAME_TARGET)
+                      TextUnitBatchImporterService.IntegrityChecksType
+                          .KEEP_STATUS_IF_SAME_TARGET_AND_NOT_INCLUDED)
                   .stream()
                   .collect(
                       toMap(
@@ -851,7 +852,8 @@ List<String> importBatch(
             .filter(t -> t.error() == null)
             .map(TextUnitDTOWithVariantCommentOrError::textUnitDTOWithVariantComment)
             .toList(),
-        TextUnitBatchImporterService.IntegrityChecksType.KEEP_STATUS_IF_SAME_TARGET);
+        TextUnitBatchImporterService.IntegrityChecksType
+            .KEEP_STATUS_IF_SAME_TARGET_AND_NOT_INCLUDED);
 
     return forImport.stream()
         .filter(t -> t.error() != null)

webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSPhrase.java

@@ -378,7 +378,7 @@ public PollableFuture<Void> pull(
     OptionsParser optionsParser = new OptionsParser(optionList);
 
     AtomicReference<IntegrityChecksType> integrityChecksType =
-        new AtomicReference<>(IntegrityChecksType.KEEP_STATUS_IF_SAME_TARGET);
+        new AtomicReference<>(IntegrityChecksType.KEEP_STATUS_IF_SAME_TARGET_AND_NOT_INCLUDED);
     optionsParser.getString(
         "integrityChecksType", s -> integrityChecksType.set(IntegrityChecksType.valueOf(s)));
 

webapp/src/main/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterService.java

@@ -121,12 +121,13 @@ public enum IntegrityChecksType {
      */
     KEEP_STATUS_IF_REJECTED_AND_SAME_TARGET,
     /**
-     * Run integrity checks. If the target is the same, keep the current status.
+     * Run integrity checks. If the target is the same and is not included in file then keep the
+     * current status.
      *
      * <p>This is an extension of the legacy behavior that allows marking a translation as invalid
      * when the integrity check did not catch the issue, eventually causing a build failure.
      */
-    KEEP_STATUS_IF_SAME_TARGET;
+    KEEP_STATUS_IF_SAME_TARGET_AND_NOT_INCLUDED;
 
     public static IntegrityChecksType fromLegacy(
         boolean integrityCheckSkipped, boolean integrityCheckKeepStatusIfFailedAndSameTarget) {
@@ -418,10 +419,20 @@ void applyIntegrityChecks(
           textUnitForBatchImport.getContent().equals(currentTextUnit.getTarget());
 
       if (hasSameTarget
-          && IntegrityChecksType.KEEP_STATUS_IF_SAME_TARGET.equals(integrityChecksType)) {
+          && IntegrityChecksType.KEEP_STATUS_IF_SAME_TARGET_AND_NOT_INCLUDED.equals(
+              integrityChecksType)) {
+
+        // We always keep the includedInLocalizedFile flag
         textUnitForBatchImport.setIncludedInLocalizedFile(
             currentTextUnit.isIncludedInLocalizedFile());
-        textUnitForBatchImport.setStatus(currentTextUnit.getStatus());
+
+        // If the text unit is includedInLocalizedFile, we allow its status to change.
+        // Otherwise (if not included), we keep the current status as is.
+        // This supports status changes from TRANSLATION_NEEDED to REVIEW_NEEDED to ACCEPTED,
+        // but only if the translation was not flagged as bad.
+        if (!currentTextUnit.isIncludedInLocalizedFile()) {
+          textUnitForBatchImport.setStatus(currentTextUnit.getStatus());
+        }
       }
 
       for (TextUnitIntegrityChecker textUnitChecker : textUnitCheckers) {
@@ -454,7 +465,7 @@ void applyIntegrityChecks(
                       .contains(FALSE_POSITIVE_TAG_FOR_STATUS)) {
                     break;
                   }
-                case KEEP_STATUS_IF_SAME_TARGET:
+                case KEEP_STATUS_IF_SAME_TARGET_AND_NOT_INCLUDED:
                 case KEEP_STATUS_IF_REJECTED_AND_SAME_TARGET:
                   textUnitForBatchImport.setIncludedInLocalizedFile(
                       currentTextUnit.isIncludedInLocalizedFile());