Commented out redis support for the search suggestion service and added support for productname query parameter

Author: ujjavaldesai07

client/src/actions/index.js

@@ -257,7 +257,7 @@ export const getDataViaAPI = (type, uri, subsequent_request) => async dispatch =
     log.info(`[ACTION]: invokeAndDispatchAPIData Calling API = ${uri}.`)
 
     if (uri) {
-        uri = uri.replace(/\s/g, '')
+        // uri = uri.replace(/\s/g, '')
         let responseError = false
         const response = await commonServiceAPI.get(uri)
             .catch(err => {
@@ -291,20 +291,28 @@ export const loadFilterAttributes = filterQuery => async dispatch => {
     log.info(`[ACTION]: loadFilterAttributes Calling Filter API filterQuery = ${filterQuery}`)
 
     if (filterQuery) {
-        let removedSpacesFromFilterQuery = filterQuery.replace(/\s/g, '')
-        let uri = `/filter${removedSpacesFromFilterQuery}`
+        try {
+            if(filterQuery.split("=")[1].localeCompare("productname") === 0 ) {
+                // currently we do not support productname parameter for filter API.
+                filterQuery="?q=category=all"
+            }
+        } catch (e) {
+            log.info('Unable to find productname parameter')
+        }
+
+        let uri = `/filter${filterQuery}`
         const response = await commonServiceAPI.get(uri);
         if (response != null) {
             log.trace(`[ACTION]: Filter = ${JSON.stringify(response.data)}`)
 
-            const extractRequiredParams = removedSpacesFromFilterQuery.slice(3)
+            const extractRequiredParams = filterQuery.slice(3)
 
             dispatch({
                 type: LOAD_FILTER_ATTRIBUTES,
                 payload: JSON.parse(JSON.stringify(
                     {
                         ...response.data,
-                        "query": removedSpacesFromFilterQuery.slice(3)
+                        "query": filterQuery.slice(3)
                     }))
             });
 

client/src/components/routes/navbar/searchBar.js

@@ -32,10 +32,10 @@ function SearchBar(props) {
             props.handleClose();
         }
 
+        setValue('')
+
         // search is selected
         if(reason === "select-option" && selectedValue != null) {
-            log.info("Search is selected.... value = "
-                + selectedValue)
             for(let index = 0; index < searchSuggestions.data.length; ++index) {
                 if(searchSuggestions.data[index].keyword.length === selectedValue.length
                     && searchSuggestions.data[index].keyword.localeCompare(selectedValue) === 0) {

server/common-data-service/src/main/java/com/ujjaval/ecommerce/commondataservice/controller/CommonDataController.java

@@ -83,7 +83,6 @@ public ResponseEntity<?> getHomeTabsDataResponse() {
 
     @GetMapping(value = "/filter", params = "q")
     public ResponseEntity<?> getFilterAttributesByProducts(@RequestParam("q") String queryParams) {
-
         FilterAttributesResponse result = commonDataService.getFilterAttributesByProducts(queryParams);
 
         if (result == null) {

server/common-data-service/src/main/java/com/ujjaval/ecommerce/commondataservice/dao/sql/info/queryhelpers/ProductQueryHelper.java

@@ -13,7 +13,7 @@
 
 public class ProductQueryHelper {
     enum QueryType {
-        genders, apparels, brands, prices, category, sortby, page;
+        genders, apparels, brands, prices, category, sortby, page, productname;
     }
 
     private final int NEWEST = 1;
@@ -46,6 +46,21 @@ public void prepareConditionListById(HashMap<Integer, Object> mapParameters, Str
         }
     }
 
+    public void prepareConditionListByName(HashMap<Integer, Object> mapParameters, String data,
+                                           MapParameterKey mapParametersKey,
+                                           List<String> conditions, String field) {
+        List<String> tempList = new ArrayList<>();
+
+        for (String val : data.split(",")) {
+            mapParameters.put(mapParametersKey.getKey(), val);
+            tempList.add("?" + mapParametersKey.getKey());
+            mapParametersKey.increment();
+        }
+        if (data.length() > 0) {
+            conditions.add(String.format("(%s IN (%s))", field, String.join(",", tempList)));
+        }
+    }
+
     public ParamsToQueryContext getParamsToQueryMap(HashMap<String, String> conditionMap) {
         if (conditionMap == null) {
             return null;
@@ -107,6 +122,10 @@ public ParamsToQueryContext getParamsToQueryMap(HashMap<String, String> conditio
                 case page:
                     pageInfo = entry.getValue().split(",");
                     break;
+                case productname:
+                    prepareConditionListByName(mapParams, entry.getValue(), mapParametersKey,
+                            conditions, "p.name");
+                    break;
                 default:
                     System.out.println("UnsupportedType");
             }

server/search-suggestion-service/heroku.yml

@@ -1,7 +1,3 @@
-setup:
-  addons:
-    - plan: heroku-redis
-      as: DATABASE
 build:
   docker:
     web: Dockerfile-prod

server/search-suggestion-service/pom.xml

@@ -23,10 +23,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -45,17 +41,22 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>redis.clients</groupId>
-			<artifactId>jedis</artifactId>
-			<version>3.2.0</version>
-			<type>jar</type>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.springframework.boot</groupId>-->
+<!--			<artifactId>spring-boot-starter-data-redis</artifactId>-->
+<!--		</dependency>-->
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-cache</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>redis.clients</groupId>-->
+<!--			<artifactId>jedis</artifactId>-->
+<!--			<version>3.2.0</version>-->
+<!--			<type>jar</type>-->
+<!--		</dependency>-->
+
+<!--		<dependency>-->
+<!--			<groupId>org.springframework.boot</groupId>-->
+<!--			<artifactId>spring-boot-starter-cache</artifactId>-->
+<!--		</dependency>-->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

server/search-suggestion-service/src/main/java/com/ujjaval/ecommerce/searchsuggestionservice/dto/SearchSuggestionKeywordInfo.java

@@ -1,6 +1,5 @@
 package com.ujjaval.ecommerce.searchsuggestionservice.dto;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 

server/search-suggestion-service/src/main/resources/application-dev.properties

@@ -1 +1 @@
-spring.data.redis.repositories.enabled=false
+#spring.data.redis.repositories.enabled=false

server/search-suggestion-service/src/main/resources/application.properties

@@ -1,4 +1,4 @@
 spring.application.name=search-suggestion-service
 server.port=${PORT}
 spring.profiles.active=${ACTIVE_PROFILE}
-spring.cache.redis.time-to-live=10
+#spring.cache.redis.time-to-live=10