From c075bb2e5e4752e0cc199ab0c0615fbde81a20e5 Mon Sep 17 00:00:00 2001 From: Jean Aurambault Date: Tue, 18 Jul 2023 14:15:35 -0700 Subject: [PATCH] Add tmTextUnitVariantId in the leveraging message Previously, it was recording only the tmTextUnitVariantId. It was not explicit so one add to know which "id" it was. In addition, there was no way to search by that "tmTextUnitVariantId" in the workbench. As such it could be only used when looking at the database. It now records the tmTextUnitId and tmTextUnitVariantId. Search by "tmTextUnitId" is possible in the current UI/workbench. A good follow up, will be to be able to search by tmTextUnitVariantId in the workbench too. --- .../service/leveraging/AbstractLeverager.java | 4 +- .../AssetMappingServiceTest.java | 56 ++++++++++++++----- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/leveraging/AbstractLeverager.java b/webapp/src/main/java/com/box/l10n/mojito/service/leveraging/AbstractLeverager.java index 4b27bc195c..8d0de99fa5 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/leveraging/AbstractLeverager.java +++ b/webapp/src/main/java/com/box/l10n/mojito/service/leveraging/AbstractLeverager.java @@ -176,7 +176,9 @@ private void addLeveragedTranslations( private String getLeverageComment(TextUnitDTO translation, boolean uniqueTMTextUnitMatched) { return getType() - + " leveraging from: " + + " - leveraging from tmTextUnitId: " + + translation.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation.getTmTextUnitVariantId() + ", unique match: " + uniqueTMTextUnitMatched; diff --git a/webapp/src/test/java/com/box/l10n/mojito/service/assetExtraction/AssetMappingServiceTest.java b/webapp/src/test/java/com/box/l10n/mojito/service/assetExtraction/AssetMappingServiceTest.java index 98e9ef7365..2480594c3f 100644 --- a/webapp/src/test/java/com/box/l10n/mojito/service/assetExtraction/AssetMappingServiceTest.java +++ b/webapp/src/test/java/com/box/l10n/mojito/service/assetExtraction/AssetMappingServiceTest.java @@ -574,7 +574,9 @@ public void testSourceLeveraging() .get(0); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by name and content for source leveraging leveraging from: " + "by name and content for source leveraging - leveraging from tmTextUnitId: " + + translationfrFR.getTmTextUnit().getId() + + ", tmTextUnitVariantId: " + translationfrFR.getId() + ", unique match: true", comment.getContent()); @@ -593,7 +595,9 @@ public void testSourceLeveraging() .get(0); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by name and content for source leveraging leveraging from: " + "by name and content for source leveraging - leveraging from tmTextUnitId: " + + translationjaJP.getTmTextUnit().getId() + + ", tmTextUnitVariantId: " + translationjaJP.getId() + ", unique match: true", comment.getContent()); @@ -641,7 +645,9 @@ public void testSourceLeveraging() .get(1); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by name for source leveraging leveraging from: " + "by name for source leveraging - leveraging from tmTextUnitId: " + + translation2frFR.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation2frFR.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -667,7 +673,9 @@ public void testSourceLeveraging() .get(1); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by name for source leveraging leveraging from: " + "by name for source leveraging - leveraging from tmTextUnitId: " + + translation2jaJP.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation2jaJP.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -720,7 +728,9 @@ public void testSourceLeveraging() .get(2); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by content for source leveraging leveraging from: " + "by content for source leveraging - leveraging from tmTextUnitId: " + + translation3frFR.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation3frFR.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -742,7 +752,9 @@ public void testSourceLeveraging() .get(2); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by content for source leveraging leveraging from: " + "by content for source leveraging - leveraging from tmTextUnitId: " + + translation3jaJP.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation3jaJP.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -805,7 +817,9 @@ public void testSourceLeveraging() .get(3); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by name for source leveraging leveraging from: " + "by name for source leveraging - leveraging from tmTextUnitId: " + + translation4frFR.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation4frFR.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -827,7 +841,9 @@ public void testSourceLeveraging() .get(3); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by name for source leveraging leveraging from: " + "by name for source leveraging - leveraging from tmTextUnitId: " + + translation4jaJP.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation4jaJP.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -856,7 +872,9 @@ public void testSourceLeveraging() .get(3); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by content for source leveraging leveraging from: " + "by content for source leveraging - leveraging from tmTextUnitId: " + + translation4frFR.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation4frFR.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -875,7 +893,9 @@ public void testSourceLeveraging() .get(3); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by content for source leveraging leveraging from: " + "by content for source leveraging - leveraging from tmTextUnitId: " + + translation4jaJP.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation4jaJP.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -904,7 +924,9 @@ public void testSourceLeveraging() .get(3); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by content for source leveraging leveraging from: " + "by content for source leveraging - leveraging from tmTextUnitId: " + + translation4frFR.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation4frFR.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -923,7 +945,9 @@ public void testSourceLeveraging() .get(3); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by content for source leveraging leveraging from: " + "by content for source leveraging - leveraging from tmTextUnitId: " + + translation4jaJP.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation4jaJP.getTmTextUnitVariantId() + ", unique match: true", comment.getContent()); @@ -973,7 +997,9 @@ public void testSourceLeveraging() .get(4); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by content for source leveraging leveraging from: " + "by content for source leveraging - leveraging from tmTextUnitId: " + + translation5frFRb.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation5frFRb.getTmTextUnitVariantId() + ", unique match: false", comment.getContent()); @@ -992,7 +1018,9 @@ public void testSourceLeveraging() .get(4); assertEquals(TMTextUnitVariantComment.Type.LEVERAGING, comment.getType()); assertEquals( - "by content for source leveraging leveraging from: " + "by content for source leveraging - leveraging from tmTextUnitId: " + + translation5jaJPb.getTmTextUnitId() + + ", tmTextUnitVariantId: " + translation5jaJPb.getTmTextUnitVariantId() + ", unique match: false", comment.getContent());