chibenwa commented on code in PR #2447: URL: https://github.com/apache/james-project/pull/2447#discussion_r1795352644
########## mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearchHighlighter.java: ########## @@ -0,0 +1,85 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.mailbox.opensearch.search; + +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.model.MailboxId; +import org.apache.james.mailbox.model.MessageId; +import org.apache.james.mailbox.model.MultimailboxesSearchQuery; +import org.apache.james.mailbox.model.SearchQuery; +import org.apache.james.mailbox.opensearch.json.JsonMessageConstants; +import org.apache.james.mailbox.searchhighligt.SearchHighlighter; +import org.apache.james.mailbox.searchhighligt.SearchSnippet; +import org.apache.james.mailbox.store.StoreMailboxManager; +import org.opensearch.client.opensearch.core.search.Hit; + +import com.fasterxml.jackson.databind.node.ObjectNode; + +import reactor.core.publisher.Flux; + +public class OpenSearchSearchHighlighter implements SearchHighlighter { + public static final List<String> SNIPPET_FIELDS = List.of(JsonMessageConstants.MESSAGE_ID, JsonMessageConstants.SUBJECT, JsonMessageConstants.TEXT_BODY); + + private final OpenSearchSearcher openSearchSearcher; + private final StoreMailboxManager storeMailboxManager; + private final MessageId.Factory messageIdFactory; + + public OpenSearchSearchHighlighter(OpenSearchSearcher openSearchSearcher, StoreMailboxManager storeMailboxManager, MessageId.Factory messageIdFactory) { + this.openSearchSearcher = openSearchSearcher; + this.storeMailboxManager = storeMailboxManager; + this.messageIdFactory = messageIdFactory; + } + + @Override + public Flux<SearchSnippet> highlightSearch(List<MessageId> messageIds, MultimailboxesSearchQuery expression, MailboxSession session) { + if (messageIds.isEmpty()) { + return Flux.empty(); + } + + return storeMailboxManager.getInMailboxIds(expression, session) + .collectList() + .flatMapMany(mailboxIds -> highlightSearch(mailboxIds, expression.getSearchQuery(), messageIds.size())); + } + + private Flux<SearchSnippet> highlightSearch(List<MailboxId> mailboxIds, SearchQuery query, int limit) { + return openSearchSearcher.search(mailboxIds, query, Optional.of(limit), SNIPPET_FIELDS, OpenSearchSearcher.SEARCH_HIGHLIGHT) + .map(this::buildSearchSnippet); + } + + private SearchSnippet buildSearchSnippet(Hit<ObjectNode> searchResult) { + MessageId messageId = Optional.ofNullable(searchResult.fields().get(JsonMessageConstants.MESSAGE_ID)) + .map(jsonData -> jsonData.toJson().asJsonArray().getString(0)) + .map(messageIdFactory::fromString) + .orElseThrow(() -> new IllegalStateException("Can not extract MessageID for search result: " + searchResult.id())); + + Map<String, List<String>> highlightHit = searchResult.highlight(); + + Optional<String> highlightedSubject = Optional.ofNullable(highlightHit.get(JsonMessageConstants.SUBJECT)) + .map(List::getFirst); + Optional<String> highlightedTextBody = Optional.ofNullable(highlightHit.get(JsonMessageConstants.TEXT_BODY)) + .map(List::getFirst); Review Comment: While we are at it any chance we also highlight within attachment text content? IE if there is no highlights onto TEXT_BODY we put the highlight of the attachments as a preview field ? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For additional commands, e-mail: notifications-h...@james.apache.org
