task(/series/SeriesController) : Search by catalog number in user's collection

Part of #673
Fix #1098

Author: mukeshk

src/main/java/ru/mystamps/web/feature/series/SeriesController.java

@@ -22,6 +22,7 @@
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -72,6 +73,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static ru.mystamps.web.common.ControllerUtils.redirectTo;
 
@@ -470,10 +472,11 @@ public String processAskForm(
 	public String searchSeriesByCatalog(
 		@RequestParam(name = "catalogNumber", defaultValue = "") String catalogNumber,
 		@RequestParam(name = "catalogName", defaultValue = "") String catalogName,
+		@RequestParam(name = "inCollection", defaultValue = "false") Boolean inCollection,
+		@CurrentUser Integer currentUserId,
 		Model model,
 		Locale userLocale,
 		RedirectAttributes redirectAttributes) {
-		
 		if (StringUtils.isBlank(catalogNumber)) {
 			redirectAttributes.addFlashAttribute("numberIsEmpty", true);
 			return "redirect:" + SiteUrl.INDEX_PAGE;
@@ -504,6 +507,19 @@ public String searchSeriesByCatalog(
 				series = Collections.emptyList();
 				break;
 		}
+		
+		//boolean searchInCollection =(inCollection != null)?Boolean.TRUE:Boolean.FALSE;
+		if (Features.SEARCH_IN_COLLECTION.isActive()
+			&& inCollection
+			&& SecurityContextHolder.getContext().getAuthentication().isAuthenticated()) {
+			series = series
+					.stream()
+					.filter(
+						e->collectionService.isSeriesInCollection(currentUserId, e.getId())
+					)
+					.collect(Collectors.toList());
+		}
+		
 		model.addAttribute("searchResults", series);
 
 		return "series/search_result";

src/main/webapp/WEB-INF/views/site/index.html

@@ -184,7 +184,7 @@ <h4 class="panel-title" th:text="#{t_search_by_catalog}">Search by catalog</h4>
 								</div>
 								<!-- @todo #673 Add integration tests for search by a catalog in user's collection -->
 								<div class="form-group" sec:authorize="isAuthenticated()" togglz:active="SEARCH_IN_COLLECTION">
-									<input id="in-collection" name="inCollection" type="checkbox" />
+									<input id="in-collection" name="inCollection" type="checkbox" value="true"/>
 									<label for="in-collection" th:text="#{t_in_my_collection}">In my collection</label>
 								</div>
 								<div class="form-group">