Changes for Org Search API

pom.xml

@@ -40,6 +40,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>4.1.1</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>

src/main/java/org/sunbird/common/model/SBApiOrgSearchRequest.java

@@ -1,8 +1,21 @@
 package org.sunbird.common.model;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class SBApiOrgSearchRequest {
 	private SBApiOrgFilterRequest filters = new SBApiOrgFilterRequest();
-	private SBApiSortByRequest sort_by = new SBApiSortByRequest();
+
+	private Map<String, String> sortBy = new HashMap<>();
+	private String query;
+
+	public String getQuery() {
+		return query;
+	}
+
+	public void setQuery(String query) {
+		this.query = query;
+	}
 
 	public SBApiOrgFilterRequest getFilters() {
 		return filters;
@@ -12,11 +25,12 @@ public void setFilters(SBApiOrgFilterRequest filters) {
 		this.filters = filters;
 	}
 
-	public SBApiSortByRequest getSort_by() {
-		return sort_by;
+	public Map<String, String> getSortBy() {
+		return sortBy;
 	}
 
-	public void setSort_by(SBApiSortByRequest sort_by) {
-		this.sort_by = sort_by;
+	public void setSortBy(Map<String, String> sortBy) {
+		this.sortBy = sortBy;
 	}
+
 }

src/main/java/org/sunbird/common/util/CbExtServerProperties.java

@@ -65,9 +65,6 @@ public class CbExtServerProperties {
 	@Value("${es.host.list}")
 	private String esHostList;
 
-	@Value("${es.port}")
-	private String esPort;
-
 	@Value("${es.username}")
 	private String esUser;
 
@@ -347,9 +344,6 @@ public class CbExtServerProperties {
 	@Value("${sb.es.host.list}")
 	private String sbEsHostList;
 
-	@Value("${sb.es.port}")
-	private String sbEsPort;
-
 	@Value("${sb.es.username}")
 	private String sbEsUser;
 
@@ -606,14 +600,6 @@ public void setEsHostList(String esHostList) {
 		this.esHostList = esHostList;
 	}
 
-	public String getEsPort() {
-		return esPort;
-	}
-
-	public void setEsPort(String esPort) {
-		this.esPort = esPort;
-	}
-
 	public String getEsUser() {
 		return esUser;
 	}
@@ -1360,15 +1346,6 @@ public String[] getSbEsHostList() {
 	public void setSbEsHostList(String sbEsHost) {
 		this.sbEsHostList = sbEsHostList;
 	}
-
-	public String getSbEsPort() {
-		return sbEsPort;
-	}
-
-	public void setSbEsPort(String sbEsPort) {
-		this.sbEsPort = sbEsPort;
-	}
-
 	public String getSbEsUser() {
 		return sbEsUser;
 	}

src/main/java/org/sunbird/common/util/Constants.java

@@ -631,6 +631,8 @@ public class Constants {
 	public static final String DRAFT = "DRAFT";
 	public static final Object CREATED = "Created";
 	public static final Object UPDATED = "Updated";
+  public static final String QUERY = "query";
+	public static final String SORT_BY_KEYWORD = "sortBy";
 	public static final String HEALTHY = "healthy";
 	public static final String CHECKS = "checks";
 	public static final String CASSANDRA_DB = "cassandra db";

src/main/java/org/sunbird/org/service/ExtendedOrgServiceImpl.java

@@ -1,13 +1,5 @@
 package org.sunbird.org.service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -24,6 +16,9 @@
 import org.sunbird.common.util.ProjectUtil;
 import org.sunbird.core.logger.CbExtLogger;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service
 public class ExtendedOrgServiceImpl implements ExtendedOrgService {
 	private CbExtLogger log = new CbExtLogger(getClass().getName());
@@ -185,7 +180,11 @@ public SBApiResponse orgExtSearch(Map<String, Object> request) throws Exception
 						}).collect(Collectors.toList());
 				SBApiOrgSearchRequest orgSearchRequest = new SBApiOrgSearchRequest();
 				orgSearchRequest.getFilters().setId(orgIdList);
-
+				if(!ProjectUtil.isStringNullOREmpty((String) requestData.get(Constants.QUERY)))
+				{
+					orgSearchRequest.setQuery((String) requestData.get(Constants.QUERY));
+				}
+				orgSearchRequest.setSortBy((Map<String, String>) requestData.get(Constants.SORT_BY_KEYWORD));
 				Map<String, Object> orgSearchRequestBody = new HashMap<String, Object>() {
 					private static final long serialVersionUID = 1L;
 
@@ -197,7 +196,7 @@ public SBApiResponse orgExtSearch(Map<String, Object> request) throws Exception
 				headers.put(Constants.CONTENT_TYPE, Constants.APPLICATION_JSON);
 				String url = configProperties.getSbUrl() + configProperties.getSbOrgSearchPath();
 
-				Map<String, Object> apiResponse = (Map<String, Object>) outboundService.fetchResultUsingPost(url,
+				Map<String, Object> apiResponse = outboundService.fetchResultUsingPost(url,
 						orgSearchRequestBody, headers);
 				if (Constants.OK.equalsIgnoreCase((String) apiResponse.get(Constants.RESPONSE_CODE))) {
 					Map<String, Object> apiResponseResult = (Map<String, Object>) apiResponse.get(Constants.RESULT);