modified

Author: pratikdas

spring-boot/spring-boot-elasticsearch/src/main/java/io/pratik/elasticsearch/controllers/SearchController.java

@@ -49,7 +49,7 @@ public List<Product> fetchByNameOrDesc(@RequestParam(value = "q", required = fal
 	@ResponseBody
 	public List<String> fetchSuggestions(@RequestParam(value = "q", required = false) String query) {                         
         log.info("fetch suggests {}",query);
-        List<String> suggests = searchService.fetchRecentSuggestions(query);
+        List<String> suggests = searchService.fetchSuggestions(query);
         log.info("suggests {}",suggests);
         return suggests;
 	  }

spring-boot/spring-boot-elasticsearch/src/main/java/io/pratik/elasticsearch/models/Product.java

@@ -3,8 +3,6 @@
  */
 package io.pratik.elasticsearch.models;
 
-import java.util.List;
-
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;

spring-boot/spring-boot-elasticsearch/src/main/java/io/pratik/elasticsearch/models/SearchSuggest.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.core.SearchHits;
@@ -27,8 +28,6 @@
 import org.springframework.stereotype.Service;
 
 import io.pratik.elasticsearch.models.Product;
-import io.pratik.elasticsearch.models.SearchSuggest;
-import io.pratik.elasticsearch.repositories.SearchSuggestRepository;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -39,16 +38,13 @@
 public class ProductSearchService {
 
 	private static final String PRODUCT_INDEX = "productindex";
-	private static final String SEARCH_SUGGEST_INDEX = "searchsuggest";
 
 	private ElasticsearchOperations elasticsearchOperations;
-	private SearchSuggestRepository searchSuggestRepository; 
 
 	@Autowired
-	public ProductSearchService(final ElasticsearchOperations elasticsearchOperations, final SearchSuggestRepository searchSuggestRepository) {
+	public ProductSearchService(final ElasticsearchOperations elasticsearchOperations) {
 		super();
 		this.elasticsearchOperations = elasticsearchOperations;
-		this.searchSuggestRepository = searchSuggestRepository;
 	}
 
 	public List<String> createProductIndexBulk(final List<Product> products) {
@@ -70,7 +66,7 @@ public String createProductIndex(Product product) {
 		return documentId;
 	}
 
-	public void findProductCountByBrand(final String brandName) {
+	public void findProductsByBrand(final String brandName) {
 		QueryBuilder queryBuilder = QueryBuilders
 				.matchQuery("manufacturer", brandName);
 		// .fuzziness(0.8)
@@ -79,8 +75,6 @@ public void findProductCountByBrand(final String brandName) {
 		// .fuzzyTranspositions(true);
 
 		Query searchQuery = new NativeSearchQueryBuilder()
-				//.addAggregation(AggregationBuilders
-				//		.cardinality("category"))
 				.withQuery(queryBuilder)
 				.build();
 
@@ -91,18 +85,18 @@ public void findProductCountByBrand(final String brandName) {
 
 		log.info("productHits {} {}", productHits.getSearchHits().size(), productHits.getSearchHits());
 
-		List<SearchHit<Product>> srchHits = 
+		List<SearchHit<Product>> searchHits = 
 				productHits.getSearchHits();
 		int i = 0;
-		for (SearchHit<Product> srchHit : srchHits) {
-			log.info("srchHit {}", srchHit);
+		for (SearchHit<Product> searchHit : searchHits) {
+			log.info("searchHit {}", searchHit);
 		}
 
 	}
 
 	public void findByProductName(final String productName) {
 		Query searchQuery = new StringQuery(
-				"{ \"match\": { \"name\": { \"query\": \""+ productName + "\" } } } \"");
+				"{\"match\":{\"name\":{\"query\":\""+ productName + "\"}}}\"");
 
 		SearchHits<Product> products = elasticsearchOperations.search(searchQuery, Product.class,
 				IndexCoordinates.of(PRODUCT_INDEX));
@@ -119,10 +113,7 @@ public void findByProductPrice(final String productPrice) {
 	public List<Product> processSearch(final String query) {
 		log.info("Search with query {}", query);
 
-		// 1. Update searchsuggest Index
-		updateSuggestionsIndex(query);  
-
-		// 2. Create query on multiple fields enabling fuzzy search
+		// 1. Create query on multiple fields enabling fuzzy search
 		QueryBuilder queryBuilder = 
 				QueryBuilders
 				.multiMatchQuery(query, "name", "description")
@@ -132,13 +123,13 @@ public List<Product> processSearch(final String query) {
 				                .withFilter(queryBuilder)
 				                .build();
 
-		// 3. Execute search
+		// 2. Execute search
 		SearchHits<Product> productHits = 
 				elasticsearchOperations
 				.search(searchQuery, Product.class,
 				IndexCoordinates.of(PRODUCT_INDEX));
 
-		// 4. Map searchHits to product list
+		// 3. Map searchHits to product list
 		List<Product> productMatches = new ArrayList<Product>();
 		productHits.forEach(srchHit->{
 			productMatches.add(srchHit.getContent());
@@ -147,32 +138,26 @@ public List<Product> processSearch(final String query) {
 	}
 
 
-	public void updateSuggestionsIndex(String query) {
-		if(query.getBytes().length < 512) {
-		   searchSuggestRepository
-		      .save(SearchSuggest
-		    		  .builder()
-		    		  .id(query)
-		    		  .searchText(query)
-		    		  .build());
-		}
-	}
+
 
-	public List<String> fetchRecentSuggestions(String query) {
+	public List<String> fetchSuggestions(String query) {
 		QueryBuilder queryBuilder = QueryBuilders
-				.wildcardQuery("searchText", query+"*");
+				.wildcardQuery("name", query+"*");
 
 		Query searchQuery = new NativeSearchQueryBuilder()
-				.withFilter(queryBuilder).build();
+				.withFilter(queryBuilder)
+				.withPageable(PageRequest.of(0, 5))
+				.build();
 
-		SearchHits<SearchSuggest> searchSuggestions = 
+		SearchHits<Product> searchSuggestions = 
 				elasticsearchOperations.search(searchQuery, 
-						SearchSuggest.class,
-				IndexCoordinates.of(SEARCH_SUGGEST_INDEX));
+						Product.class,
+				IndexCoordinates.of(PRODUCT_INDEX));
 
 		List<String> suggestions = new ArrayList<String>();
-		searchSuggestions.getSearchHits().forEach(srchHit->{
-			suggestions.add(srchHit.getContent().getSearchText());
+		
+		searchSuggestions.getSearchHits().forEach(searchHit->{
+			suggestions.add(searchHit.getContent().getName());
 		});
 		return suggestions;
 	}

spring-boot/spring-boot-elasticsearch/src/main/java/io/pratik/elasticsearch/repositories/SearchSuggestRepository.java

@@ -135,11 +135,11 @@ void testCreateProductIndex() {
 	}
 
 	/**
-	 * Test method for {@link io.pratik.elasticsearch.services.ProductSearchService#findProductCountByBrand(java.lang.String)}.
+	 * Test method for {@link io.pratik.elasticsearch.services.ProductSearchService#findProductsByBrand(java.lang.String)}.
 	 */
 	@Test
 	void testFindProductCountByBrand() {
-		productSearchService.findProductCountByBrand("samsung");
+		productSearchService.findProductsByBrand("samsung");
 	}
 
 	/**
@@ -165,14 +165,11 @@ void testSearchByNameDesc() {
 	    log.info("results {}",results);
 	}
 
-	@Test
-	void testSearchIndexUpdate() {
-		productSearchService.updateSuggestionsIndex("samsng 163 cm");
-	}
+
 
 	@Test
 	void testFetchSearchSuggestions() {
-		List<String> suggestions = productSearchService.fetchRecentSuggestions("samsng 163 cm");
+		List<String> suggestions = productSearchService.fetchSuggestions("samsng 163 cm");
 	    log.info("suggestions {}",suggestions);
 	}