Skip to content

Release 4.8.0 cb course search #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Radheshhathwar wants to merge 6 commits into
base: release-4.8.0_cb
Choose a base branch
from
Open

Release 4.8.0 cb course search #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76dacc8
Modified changes for course search api
Radheshhathwar Nov 14, 2022
cea977c
Updated the getQuery()
Radheshhathwar Nov 16, 2022
e50542f
Removed extra methods in SearchProcessor
Radheshhathwar Nov 23, 2022
eeba7de
Removed channel.isEmpty and added channel.isBlack
Radheshhathwar Nov 23, 2022
6f50e57
Merge pull request #49 from Radheshhathwar/release-4.8.0_cb-Course-se…
Radheshhathwar Nov 23, 2022
752cae5
Removed checkMatchExist()
Radheshhathwar Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions search-api/search-actors/src/main/java/org/sunbird/actors/SearchActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.sunbird.common.dto.Response;
import org.sunbird.common.exception.ClientException;
import org.sunbird.common.exception.ResponseCode;
import org.sunbird.search.client.ElasticSearchUtil;
import org.sunbird.search.dto.SearchDTO;
import org.sunbird.search.processor.SearchProcessor;
import org.sunbird.search.util.DefinitionUtil;
Expand All @@ -22,6 +23,7 @@
import scala.concurrent.Future;
import scala.concurrent.duration.Duration;

import javax.naming.directory.SearchResult;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
Expand All @@ -42,7 +44,8 @@ public Future<Response> onReceive(Request request) throws Throwable {
try{
if (StringUtils.equalsIgnoreCase("INDEX_SEARCH", operation)) {
SearchDTO searchDTO = getSearchDTO(request);
Future<Map<String, Object>> searchResult = processor.processSearch(searchDTO, true);
boolean fuzzyEnabled=false;
Future<Map<String, Object>> searchResult = processor.processSearch(searchDTO, true, fuzzyEnabled);
return searchResult.map(new Mapper<Map<String, Object>, Response>() {
@Override
public Response apply(Map<String, Object> lstResult) {
Expand Down Expand Up @@ -594,7 +597,7 @@ private Map<String, Object> getCompositeSearchResponse(Map<String, Object> searc
String objectType = ((String) map.getOrDefault("objectType", "")).replaceAll("Image", "");
if(StringUtils.equalsIgnoreCase("Collection", objectType) || StringUtils.equalsIgnoreCase("Asset", objectType))
map.replace("objectType", "Content");
else
else
map.replace("objectType", objectType);
if (StringUtils.isNotBlank(objectType)) {
String key = getResultParamKey(objectType);
Expand Down Expand Up @@ -777,4 +780,4 @@ private void setImplicitFilters(Map<String, Object> filters, SearchDTO searchObj
searchObj.setImplicitFilterProperties(implicitFilterProps);
}
}
}
}
5 changes: 5 additions & 0 deletions search-api/search-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>6.3.2</version>
</dependency>
</dependencies>

<build>
Expand Down
3 changes: 2 additions & 1 deletion search-api/search-core/src/main/java/org/sunbird/search/client/ElasticSearchUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,4 +727,5 @@ private static Map<String, Object> checkDocStringLength(Map<String, Object> doc)
return doc;
}

}

}
Loading