added search controller and reconfigured

Author: Ben Smith

data/facebook-aliases.csv

@@ -19,20 +19,23 @@
 import org.atlasapi.equiv.query.MergeOnOutputQueryExecutor;
 import org.atlasapi.feeds.www.DispatchingAtlasModelWriter;
 import org.atlasapi.persistence.content.ScheduleResolver;
+import org.atlasapi.persistence.content.SearchResolver;
 import org.atlasapi.persistence.content.mongo.MongoDBQueryExecutor;
 import org.atlasapi.persistence.content.mongo.MongoDbBackedContentStore;
 import org.atlasapi.persistence.content.query.KnownTypeQueryExecutor;
 import org.atlasapi.persistence.logging.AdapterLog;
 import org.atlasapi.query.content.ApplicationConfigurationQueryExecutor;
 import org.atlasapi.query.content.CurieResolvingQueryExecutor;
 import org.atlasapi.query.content.UriFetchingQueryExecutor;
-import org.atlasapi.query.content.fuzzy.DefuzzingQueryExecutor;
 import org.atlasapi.query.content.fuzzy.FuzzySearcher;
 import org.atlasapi.query.content.fuzzy.RemoteFuzzySearcher;
+import org.atlasapi.query.content.search.ContentResolvingSearcher;
+import org.atlasapi.query.content.search.DummySearcher;
 import org.atlasapi.query.uri.canonical.CanonicalisingFetcher;
 import org.atlasapi.query.v2.PeopleController;
 import org.atlasapi.query.v2.QueryController;
 import org.atlasapi.query.v2.ScheduleController;
+import org.atlasapi.query.v2.SearchController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -53,24 +56,9 @@ public class QueryModule {
 	private @Autowired AdapterLog log;
 
 	private @Value("${atlas.search.host}") String searchHost;
-	
-	@Bean KnownTypeQueryExecutor mongoQueryExecutor() {
-		return new MongoDBQueryExecutor(store);
-	}
-
-	@Bean KnownTypeQueryExecutor mongoDbQueryExcutorThatFiltersUriQueries() {
-		MongoDBQueryExecutor executor = new MongoDBQueryExecutor(store);
-		executor.setFilterUriQueries(true);
-		return executor;
-	}
 
 	@Bean KnownTypeQueryExecutor queryExecutor() {
-		KnownTypeQueryExecutor defuzzingExecutor = mongoQueryExecutor();
-		
-		if (!Strings.isNullOrEmpty(searchHost)) {
-			FuzzySearcher titleSearcher = new RemoteFuzzySearcher(searchHost);
-		    defuzzingExecutor = new DefuzzingQueryExecutor(mongoQueryExecutor(), mongoDbQueryExcutorThatFiltersUriQueries(), titleSearcher);
-		}
+		KnownTypeQueryExecutor defuzzingExecutor = new MongoDBQueryExecutor(store);
 
 		UriFetchingQueryExecutor uriFetching = new UriFetchingQueryExecutor(localOrRemoteFetcher, defuzzingExecutor);
 
@@ -84,17 +72,30 @@ public class QueryModule {
 	    }
 	}
 
+	@Bean SearchResolver searchResolver() {
+	    if (! Strings.isNullOrEmpty(searchHost)) {
+    	    FuzzySearcher titleSearcher = new RemoteFuzzySearcher(searchHost);
+    	    return new ContentResolvingSearcher(titleSearcher, queryExecutor());
+	    }
+	    
+	    return new DummySearcher();
+	}
+	
 	@Bean QueryController queryController() {
 		return new QueryController(queryExecutor(), configFetcher, log, atlasModelOutputter());
 	}
 
 	@Bean ScheduleController schedulerController() {
-	    return new ScheduleController(scheduleResolver, queryExecutor(), configFetcher, log, atlasModelOutputter());
+	    return new ScheduleController(scheduleResolver, configFetcher, log, atlasModelOutputter());
 	}
 
 	@Bean PeopleController peopleController() {
 	    return new PeopleController(queryExecutor(), configFetcher, log, atlasModelOutputter());
 	}
+	
+	@Bean SearchController searchController() {
+	    return new SearchController(searchResolver(), configFetcher, log, atlasModelOutputter());
+	}
 
 	@Bean AtlasModelWriter atlasModelOutputter() {
 		return new DispatchingAtlasModelWriter();

src/main/java/org/atlasapi/query/QueryModule.java

@@ -0,0 +1,73 @@
+package org.atlasapi.query.content.search;
+
+import java.util.List;
+
+import org.atlasapi.content.criteria.ContentQuery;
+import org.atlasapi.media.entity.Brand;
+import org.atlasapi.media.entity.Content;
+import org.atlasapi.media.entity.Episode;
+import org.atlasapi.media.entity.Identified;
+import org.atlasapi.media.entity.Item;
+import org.atlasapi.media.entity.Person;
+import org.atlasapi.media.entity.Publisher;
+import org.atlasapi.media.entity.Series;
+import org.atlasapi.persistence.content.SearchResolver;
+import org.atlasapi.persistence.content.query.KnownTypeQueryExecutor;
+import org.atlasapi.query.content.fuzzy.FuzzySearcher;
+import org.atlasapi.search.model.Search;
+import org.atlasapi.search.model.SearchResults;
+
+import com.google.common.collect.ImmutableList;
+import com.metabroadcast.common.query.Selection;
+
+public class ContentResolvingSearcher implements SearchResolver {
+    private final FuzzySearcher fuzzySearcher;
+    private final KnownTypeQueryExecutor contentResolver;
+
+    public ContentResolvingSearcher(FuzzySearcher fuzzySearcher, KnownTypeQueryExecutor contentResolver) {
+        this.fuzzySearcher = fuzzySearcher;
+        this.contentResolver = contentResolver;
+    }
+
+    @Override
+    public List<Identified> search(Search search, Iterable<Publisher> publishers, Selection selection) {
+        SearchResults searchResults = fuzzySearcher.contentSearch(search.query(), selection, publishers);
+        if (searchResults.toUris().isEmpty()) {
+            return ImmutableList.of();
+        }
+
+        List<Identified> content = contentResolver.executeUriQuery(searchResults.toUris(), ContentQuery.MATCHES_EVERYTHING);
+        return filterOutSubItems(content);
+    }
+
+    private List<Identified> filterOutSubItems(Iterable<Identified> contents) {
+        ImmutableList.Builder<Identified> filteredContent = ImmutableList.builder();
+        
+        for (Identified identified: contents) {
+            Identified filtered = null;
+            if (identified instanceof Brand) {
+                Brand brand = (Brand) ((Brand) identified).copy();
+                brand.setContents((Iterable<Episode>) null);
+                brand.setClips(null);
+                filtered = brand;
+            } else if (identified instanceof Series) {
+                Series series = (Series) ((Series) identified).copy();
+                series.setContents((Iterable<Episode>) null);
+                series.setClips(null);
+                filtered = series;
+            } else if (identified instanceof Content){
+                Content content = (Content) identified;
+                filtered = content.copy();
+            } else if (identified instanceof Person) {
+                Person person = (Person) ((Person) identified).copy();
+                person.setContents((Iterable<Item>)null);
+                filtered = person;
+            }
+            
+            if (filtered != null) {
+                filteredContent.add(filtered);
+            }
+        }
+        return filteredContent.build();
+    }
+}

src/main/java/org/atlasapi/query/content/fuzzy/DefuzzingQueryExecutor.java

@@ -0,0 +1,29 @@
+package org.atlasapi.query.content.search;
+
+import java.util.List;
+
+import org.atlasapi.media.entity.Identified;
+import org.atlasapi.media.entity.Publisher;
+import org.atlasapi.persistence.content.SearchResolver;
+import org.atlasapi.search.model.Search;
+
+import com.google.common.collect.ImmutableList;
+import com.metabroadcast.common.query.Selection;
+
+public class DummySearcher implements SearchResolver {
+    
+    private final Iterable<Identified> respondWith;
+    
+    public DummySearcher() {
+        this(ImmutableList.<Identified>of());
+    }
+
+    public DummySearcher(Iterable<Identified> respondWith) {
+        this.respondWith = respondWith;
+    }
+
+    @Override
+    public List<Identified> search(Search arg0, Iterable<Publisher> arg1, Selection arg2) {
+        return ImmutableList.copyOf(respondWith);
+    }
+}