Skip to content

Commit

Permalink
Save integrity checker errors during TextUnitBatchImporterService's b…
Browse files Browse the repository at this point in the history 
…atch import

we're currently not saving the error for that import implementation while we do it in other imports, see AbstractImportTranslationsStep/ImportExportedXliffStep
  • Loading branch information
@aurambaj
aurambaj committed Jul 12, 2023
1 parent 273db30 commit a51e14a
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 13 deletions.
55 changes: 42 additions & 13 deletions ...p/src/main/java/com/box/l10n/mojito/service/tm/importer/TextUnitBatchImporterService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import com.box.l10n.mojito.entity.Repository;
import com.box.l10n.mojito.entity.TMTextUnitCurrentVariant;
import com.box.l10n.mojito.entity.TMTextUnitVariant.Status;
import com.box.l10n.mojito.entity.TMTextUnitVariantComment;
import com.box.l10n.mojito.entity.TMTextUnitVariantComment.Severity;
import com.box.l10n.mojito.entity.security.user.User;
import com.box.l10n.mojito.quartz.QuartzPollableTaskScheduler;
import com.box.l10n.mojito.security.AuditorAwareImpl;
Expand All @@ -22,8 +24,10 @@
import com.box.l10n.mojito.service.pollableTask.PollableFuture;
import com.box.l10n.mojito.service.pollableTask.PollableFutureTaskResult;
import com.box.l10n.mojito.service.repository.RepositoryRepository;
import com.box.l10n.mojito.service.tm.AddTMTextUnitCurrentVariantResult;
import com.box.l10n.mojito.service.tm.TMService;
import com.box.l10n.mojito.service.tm.TMTextUnitCurrentVariantRepository;
import com.box.l10n.mojito.service.tm.TMTextUnitVariantCommentService;
import com.box.l10n.mojito.service.tm.TextUnitBatchMatcher;
import com.box.l10n.mojito.service.tm.TextUnitForBatchMatcher;
import com.box.l10n.mojito.service.tm.search.TextUnitDTO;
Expand Down Expand Up @@ -77,6 +81,8 @@ public class TextUnitBatchImporterService {

@Autowired TextUnitDTOsCacheService textUnitDTOsCacheService;

@Autowired TMTextUnitVariantCommentService tmMTextUnitVariantCommentService;

/**
* Imports a batch of text units.
*
Expand Down Expand Up @@ -210,18 +216,37 @@ void importTextUnitsOfLocaleAndAsset(
}

User importedBy = auditorAwareImpl.getCurrentAuditor().orElse(null);
tmService.addTMTextUnitCurrentVariantWithResult(
tmTextUnitCurrentVariant,
asset.getRepository().getTm().getId(),
asset.getId(),
currentTextUnit.getTmTextUnitId(),
locale.getId(),
textUnitForBatchImport.getContent(),
textUnitForBatchImport.getComment(),
textUnitForBatchImport.getStatus(),
textUnitForBatchImport.isIncludedInLocalizedFile(),
importTime,
importedBy);
AddTMTextUnitCurrentVariantResult addTMTextUnitCurrentVariantResult =
tmService.addTMTextUnitCurrentVariantWithResult(
tmTextUnitCurrentVariant,
asset.getRepository().getTm().getId(),
asset.getId(),
currentTextUnit.getTmTextUnitId(),
locale.getId(),
textUnitForBatchImport.getContent(),
textUnitForBatchImport.getComment(),
textUnitForBatchImport.getStatus(),
textUnitForBatchImport.isIncludedInLocalizedFile(),
importTime,
importedBy);

if (addTMTextUnitCurrentVariantResult.isTmTextUnitCurrentVariantUpdated()) {

Long tmTextUnitVariantId =
addTMTextUnitCurrentVariantResult
.getTmTextUnitCurrentVariant()
.getTmTextUnitVariant()
.getId();

for (TMTextUnitVariantComment tmTextUnitVariantComment :
textUnitForBatchImport.getTmTextUnitVariantComments()) {
tmMTextUnitVariantCommentService.addComment(
tmTextUnitVariantId,
tmTextUnitVariantComment.getType(),
tmTextUnitVariantComment.getSeverity(),
tmTextUnitVariantComment.getContent());
}
}
});
}

Expand Down Expand Up @@ -285,6 +310,11 @@ void applyIntegrityChecks(
ice);
textUnitForBatchImport.setIncludedInLocalizedFile(false);
textUnitForBatchImport.setStatus(Status.TRANSLATION_NEEDED);

TMTextUnitVariantComment tmTextUnitVariantComment = new TMTextUnitVariantComment();
tmTextUnitVariantComment.setSeverity(Severity.ERROR);
tmTextUnitVariantComment.setContent(ice.getMessage());
textUnitForBatchImport.getTmTextUnitVariantComments().add(tmTextUnitVariantComment);
}

break;
Expand Down Expand Up @@ -362,7 +392,6 @@ List<TextUnitForBatchMatcherImport> skipInvalidAndConvertToTextUnitForBatchImpor
textUnitForBatchImport.setComment(t.getTargetComment());
textUnitForBatchImport.setIncludedInLocalizedFile(t.isIncludedInLocalizedFile());
textUnitForBatchImport.setStatus(t.getStatus() == null ? APPROVED : t.getStatus());

return textUnitForBatchImport;
})
.filter(
Expand Down
15 changes: 15 additions & 0 deletions .../src/main/java/com/box/l10n/mojito/service/tm/importer/TextUnitForBatchMatcherImport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
import com.box.l10n.mojito.entity.Locale;
import com.box.l10n.mojito.entity.Repository;
import com.box.l10n.mojito.entity.TMTextUnitVariant;
import com.box.l10n.mojito.entity.TMTextUnitVariantComment;
import com.box.l10n.mojito.service.tm.TextUnitForBatchMatcher;
import com.box.l10n.mojito.service.tm.search.TextUnitDTO;
import java.util.ArrayList;
import java.util.List;

/** @author jeanaurambault */
public class TextUnitForBatchMatcherImport implements TextUnitForBatchMatcher {
Expand All @@ -20,6 +23,9 @@ public class TextUnitForBatchMatcherImport implements TextUnitForBatchMatcher {
TextUnitDTO currentTextUnit;
boolean includedInLocalizedFile;
TMTextUnitVariant.Status status;

List<TMTextUnitVariantComment> tmTextUnitVariantComments = new ArrayList<>();

boolean namePluralPrefix;

public Repository getRepository() {
Expand Down Expand Up @@ -103,6 +109,15 @@ public void setStatus(TMTextUnitVariant.Status status) {
this.status = status;
}

public List<TMTextUnitVariantComment> getTmTextUnitVariantComments() {
return tmTextUnitVariantComments;
}

public void setTmTextUnitVariantComments(
List<TMTextUnitVariantComment> tmTextUnitVariantComments) {
this.tmTextUnitVariantComments = tmTextUnitVariantComments;
}

@Override
public boolean isNamePluralPrefix() {
return false;
Expand Down

0 comments on commit a51e14a

Please sign in to comment.