I18N-1327 - search by location / usages throws timeout error

Removed asset path condition for location/usages filtering
pinterest · Oct 25, 2024 · d64533a · d64533a
1 parent 0fc92e8
commit d64533a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 60 deletions.
diff --git a/webapp/src/main/java/com/box/l10n/mojito/nativecriteria/NativeNotInSubQueryExp.java b/webapp/src/main/java/com/box/l10n/mojito/nativecriteria/NativeNotInSubQueryExp.java
diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/tm/search/TextUnitSearcher.java b/webapp/src/main/java/com/box/l10n/mojito/service/tm/search/TextUnitSearcher.java
@@ -11,7 +11,6 @@
 import com.box.l10n.mojito.nativecriteria.NativeInExpFix;
 import com.box.l10n.mojito.nativecriteria.NativeInSubQueryExp;
 import com.box.l10n.mojito.nativecriteria.NativeNotILikeExp;
-import com.box.l10n.mojito.nativecriteria.NativeNotInSubQueryExp;
 import com.github.pnowy.nc.core.CriteriaResult;
 import com.github.pnowy.nc.core.NativeCriteria;
 import com.github.pnowy.nc.core.NativeExps;
@@ -136,18 +135,6 @@ public List<TextUnitDTO> search(TextUnitSearcherParameters searchParameters) {
 
   private void addLocationUsageExp(
       TextUnitSearcherParameters searchParameters, NativeJunctionExp conjunction) {
-    NativeJunctionExp usageExp = NativeExps.disjunction();
-
-    NativeCriteria allUsages =
-        new NativeCriteria(new JpaQueryProvider(), "asset_text_unit_usages", "atuu");
-    allUsages.setDistinct(true);
-    allUsages.setProjection(NativeExps.projection().addProjection("atuu.asset_text_unit_id"));
-    NativeJunctionExp assetPathUsageConjunction = NativeExps.conjunction();
-    assetPathUsageConjunction.add(new NativeNotInSubQueryExp("atu.id", allUsages));
-    assetPathUsageConjunction.add(
-        getSearchTypeNativeExp(
-            searchParameters.getSearchType(), "a.path", searchParameters.getLocationUsage()));
-    usageExp.add(assetPathUsageConjunction);
 
     NativeCriteria usage =
         new NativeCriteria(new JpaQueryProvider(), "asset_text_unit_usages", "atuu");
@@ -158,9 +145,8 @@ private void addLocationUsageExp(
         getSearchTypeNativeExp(
             searchParameters.getSearchType(), "atuu.usages", searchParameters.getLocationUsage()));
     usage.add(usageConjunction);
-    usageExp.add(new NativeInSubQueryExp("atu.id", usage));
 
-    conjunction.add(usageExp);
+    conjunction.add(new NativeInSubQueryExp("atu.id", usage));
   }
 
   NativeCriteria getCriteriaForSearch(TextUnitSearcherParameters searchParameters) {

diff --git a/webapp/src/test/java/com/box/l10n/mojito/service/tm/search/TextUnitSearcherTest.java b/webapp/src/test/java/com/box/l10n/mojito/service/tm/search/TextUnitSearcherTest.java
@@ -89,7 +89,6 @@ public void testAllFilters() {
     textUnitSearcherParameters.setSource("Please enter a valid state, region or province");
     textUnitSearcherParameters.setUsedFilter(UsedFilter.USED);
     textUnitSearcherParameters.setStatusFilter(StatusFilter.TRANSLATED);
-    textUnitSearcherParameters.setLocationUsage("fake_for_test");
 
     List<TextUnitDTO> textUnitDTOs = textUnitSearcher.search(textUnitSearcherParameters);
 
@@ -112,7 +111,6 @@ public void testAllFilters() {
         tmTestData.addCurrentTMTextUnitVariant1KoKR.getId(), next.getTmTextUnitVariantId());
     assertTrue(next.isTranslated());
     assertTrue(next.isUsed());
-    assertEquals("fake_for_test", next.getAssetPath());
 
     assertFalse(iterator.hasNext());
   }
@@ -813,21 +811,6 @@ public void testILikeSearchTarget() {
             "Content3 fr-FR"));
   }
 
-  @Test
-  public void testExactMatchLocationUsageByAssetPath() {
-    testSearchText("assetPath", "fake_for_test", SearchType.EXACT, List.of("fake_for_test"));
-  }
-
-  @Test
-  public void testContainsLocationUsageByAssetPath() {
-    testSearchText("assetPath", "fake", SearchType.CONTAINS, List.of("fake_for_test"));
-  }
-
-  @Test
-  public void testILikeLocationUsageByAssetPath() {
-    testSearchText("assetPath", "%FAKE_FOR_%test", SearchType.ILIKE, List.of("fake_for_test"));
-  }
-
   @Test
   public void testExactMatchLocationUsageByUsages() {
     testSearchText("usage", "usage_test", SearchType.EXACT, List.of("usage_test"), true);
@@ -933,7 +916,7 @@ public void testSearchText(
       textUnitSearcherParameters.setSource(value);
     } else if ("target".equals(attribute)) {
       textUnitSearcherParameters.setTarget(value);
-    } else if ("usage".equals(attribute) || "assetPath".equals(attribute)) {
+    } else if ("usage".equals(attribute)) {
       textUnitSearcherParameters.setLocationUsage(value);
     } else {
       throw new RuntimeException();
@@ -962,8 +945,6 @@ public void testSearchText(
         attributeToCheck = textUnitDTO.getSource();
       } else if ("target".equals(attribute)) {
         attributeToCheck = textUnitDTO.getTarget();
-      } else if ("assetPath".equals(attribute)) {
-        attributeToCheck = textUnitDTO.getAssetPath();
       } else {
         Optional<String> optionalUsage =
             assetTextUnitToTMTextUnits.stream()