diff --git a/webapp-java/dxa-module-tridion-docs-search/src/main/java/com/sdl/dxa/modules/docs/search/service/SearcherConfigurer.java b/webapp-java/dxa-module-tridion-docs-search/src/main/java/com/sdl/dxa/modules/docs/search/service/SearcherConfigurer.java index bede6a89b..54dac5350 100644 --- a/webapp-java/dxa-module-tridion-docs-search/src/main/java/com/sdl/dxa/modules/docs/search/service/SearcherConfigurer.java +++ b/webapp-java/dxa-module-tridion-docs-search/src/main/java/com/sdl/dxa/modules/docs/search/service/SearcherConfigurer.java @@ -187,7 +187,7 @@ private Operation createSearchQuery(String separator, @NotNull private String getRemoteStatusField(String separator) { - return getPublicationOnlineStatusField("dynamic", separator, "FISHDITADLVRREMOTESTATUS.lng.element"); + return getPublicationOnlineStatusField("dynamicText", separator, "FISHDITADLVRREMOTESTATUS.lng.element"); } private Criteria singleLanguageSearchQuery(SearchParameters searchParameters, diff --git a/webapp-java/dxa-module-tridion-docs-search/src/test/java/com/sdl/dxa/modules/docs/search/service/SearcherConfigurerTest.java b/webapp-java/dxa-module-tridion-docs-search/src/test/java/com/sdl/dxa/modules/docs/search/service/SearcherConfigurerTest.java index d79cfc049..807133994 100644 --- a/webapp-java/dxa-module-tridion-docs-search/src/test/java/com/sdl/dxa/modules/docs/search/service/SearcherConfigurerTest.java +++ b/webapp-java/dxa-module-tridion-docs-search/src/test/java/com/sdl/dxa/modules/docs/search/service/SearcherConfigurerTest.java @@ -19,7 +19,7 @@ public class SearcherConfigurerTest { @Test public void testBuildCriteria() throws SearchException { final String expected = "{\"type\":\"query\",\"op\":\"AND\",\"nodes\":[{\"type\":\"group\",\"keys\":" + - "[\"publicationId\",\"dynamic+FISHDITADLVRREMOTESTATUS.lng.element\",\"content+english\"]," + + "[\"publicationId\",\"dynamicText+FISHDITADLVRREMOTESTATUS.lng.element\",\"content+english\"]," + "\"values\":[\"123123\",\"VDITADLVRREMOTESTATUSONLINE\",\"some query\"],\"termTypes\":" + "[\"EXACT\",\"EXACT\",\"EXACT\"],\"boostValues\":[\"0.0\",\"0.0\",\"0.0\"]," + "\"types\":[\"INTEGER\",\"STRING\",\"STRING\"]}]}"; @@ -34,7 +34,7 @@ public void testBuildCriteria() throws SearchException { @Test public void testBuildCriteriaForExactSearch() throws SearchException { final String expected = "{\"type\":\"query\",\"op\":\"AND\",\"nodes\":[{\"type\":\"group\",\"keys\":" + - "[\"publicationId\",\"dynamic+FISHDITADLVRREMOTESTATUS.lng.element\",\"content+english\"]," + + "[\"publicationId\",\"dynamicText+FISHDITADLVRREMOTESTATUS.lng.element\",\"content+english\"]," + "\"values\":[\"123123\",\"VDITADLVRREMOTESTATUSONLINE\",\"some query\"],\"termTypes\":" + "[\"EXACT\",\"EXACT\",\"EXACT\"],\"boostValues\":[\"0.0\",\"0.0\",\"0.0\"],\"types\":" + "[\"INTEGER\",\"STRING\",\"STRING\"]}]}"; @@ -49,7 +49,7 @@ public void testBuildCriteriaForExactSearch() throws SearchException { @Test public void testBuildCriteriaFor5CharLanguage() throws SearchException { final String expected = "{\"type\":\"query\",\"op\":\"AND\",\"nodes\":[{\"type\":\"group\",\"keys\":" + - "[\"publicationId\",\"dynamic+FISHDITADLVRREMOTESTATUS.lng.element\",\"content+english\"]," + + "[\"publicationId\",\"dynamicText+FISHDITADLVRREMOTESTATUS.lng.element\",\"content+english\"]," + "\"values\":[\"123123\",\"VDITADLVRREMOTESTATUSONLINE\",\"some query\"],\"termTypes\":" + "[\"EXACT\",\"EXACT\",\"EXACT\"],\"boostValues\":[\"0.0\",\"0.0\",\"0.0\"],\"types\":" + "[\"INTEGER\",\"STRING\",\"STRING\"]}]}"; @@ -66,7 +66,7 @@ public void testBuildCriteriaForJapanese() throws SearchException { final String expected = "{\"type\":\"query\",\"op\":\"AND\",\"nodes\":[{\"type\":\"query\"," + "\"op\":\"AND\",\"nodes\":[{\"type\":\"field\",\"key\":\"publicationId\",\"value\":\"123123\"," + "\"termType\":\"EXACT\",\"fieldType\":\"INTEGER\"},{\"type\":\"field\",\"key\":" + - "\"dynamic+FISHDITADLVRREMOTESTATUS.lng.element\",\"value\":\"VDITADLVRREMOTESTATUSONLINE\"," + + "\"dynamicText+FISHDITADLVRREMOTESTATUS.lng.element\",\"value\":\"VDITADLVRREMOTESTATUSONLINE\"," + "\"fieldType\":\"STRING\"}]},{\"type\":\"query\",\"op\":\"OR\",\"nodes\":[{\"type\":\"field\"," + "\"key\":\"content+cjk\",\"value\":\"some query\",\"fieldType\":\"STRING\"},{\"type\":\"field\"," + "\"key\":\"content+japanese\",\"value\":\"some query\",\"fieldType\":\"STRING\"}]}]}"; @@ -84,7 +84,7 @@ public void testBuildCriteriaPubIdAndNamespaceAndSeparatorForKorean() throws Sea "\"AND\",\"nodes\":[{\"type\":\"field\",\"key\":\"publicationId\",\"value\":\"123123\"," + "\"termType\":\"EXACT\",\"fieldType\":\"INTEGER\"},{\"type\":\"field\",\"key\":\"namespace\"," + "\"value\":\"9987\",\"termType\":\"EXACT\",\"fieldType\":\"STRING\"}]},{\"type\":\"query\"," + - "\"op\":\"AND\",\"nodes\":[{\"type\":\"field\",\"key\":\"dynamic#FISHDITADLVRREMOTESTATUS.lng.element\"," + + "\"op\":\"AND\",\"nodes\":[{\"type\":\"field\",\"key\":\"dynamicText#FISHDITADLVRREMOTESTATUS.lng.element\"," + "\"value\":\"VDITADLVRREMOTESTATUSONLINE\",\"fieldType\":\"STRING\"},{\"type\":\"query\"," + "\"op\":\"OR\",\"nodes\":[{\"type\":\"field\",\"key\":\"content#cjk\",\"value\":\"notAQuery\"," + "\"fieldType\":\"STRING\"},{\"type\":\"field\",\"key\":\"content#korean\",\"value\":\"notAQuery\"," + @@ -102,7 +102,7 @@ public void testBuildCriteriaPubIdAndNamespaceAndSeparatorForKorean() throws Sea @Test public void testBuildCriteriaForChinese() throws SearchException { final String expected = "{\"type\":\"query\",\"op\":\"AND\",\"nodes\":[{\"type\":\"field\",\"key\":" + - "\"dynamic+FISHDITADLVRREMOTESTATUS.lng.element\",\"value\":\"VDITADLVRREMOTESTATUSONLINE\"," + + "\"dynamicText+FISHDITADLVRREMOTESTATUS.lng.element\",\"value\":\"VDITADLVRREMOTESTATUSONLINE\"," + "\"fieldType\":\"STRING\"},{\"type\":\"query\",\"op\":\"OR\",\"nodes\":[{\"type\":\"field\"," + "\"key\":\"content+cjk\",\"value\":\"some query\",\"fieldType\":\"STRING\"},{\"type\":\"field\"," + "\"key\":\"content+chinese\",\"value\":\"some query\",\"fieldType\":\"STRING\"}]}]}"; @@ -116,7 +116,7 @@ public void testBuildCriteriaForChinese() throws SearchException { @Test public void testBuildCriteriaForKorean() throws SearchException { final String expected = "{\"type\":\"query\",\"op\":\"AND\",\"nodes\":[{\"type\":\"field\",\"key\":" + - "\"dynamic+FISHDITADLVRREMOTESTATUS.lng.element\",\"value\":\"VDITADLVRREMOTESTATUSONLINE\"," + + "\"dynamicText+FISHDITADLVRREMOTESTATUS.lng.element\",\"value\":\"VDITADLVRREMOTESTATUSONLINE\"," + "\"fieldType\":\"STRING\"},{\"type\":\"query\",\"op\":\"OR\",\"nodes\":[{\"type\":\"field\"," + "\"key\":\"content+cjk\",\"value\":\"some query\",\"fieldType\":\"STRING\"},{\"type\":\"field\"," + "\"key\":\"content+korean\",\"value\":\"some query\",\"fieldType\":\"STRING\"}]}]}";