fix(search): case user has not access to any table and ensure table filter also applies to count query

Author: ymarcon

opal-search/src/main/java/org/obiba/opal/search/service/OpalSearchService.java

@@ -152,12 +152,12 @@ public Search.QueryResultDto executeQuery(QuerySettings querySettings, String se
     return Search.QueryResultDto.newBuilder().setTotalHits(0).build();
   }
 
-  public Search.QueryCountDto executeCount(String query, String searchPath) throws SearchException {
+  public Search.QueryCountDto executeCount(QuerySettings querySettings, String searchPath) throws SearchException {
     if (!isRunning()) return Search.QueryCountDto.newBuilder().setTotalHits(0).build();
     if (variablesIndexManager.getName().equals(searchPath)) {
-      return variablesIndexManager.createQueryExecutor().count(query);
+      return variablesIndexManager.createQueryExecutor().count(querySettings);
     } else if (tablesIndexManager.getName().equals(searchPath)) {
-      return tablesIndexManager.createQueryExecutor().count(query);
+      return tablesIndexManager.createQueryExecutor().count(querySettings);
     }
     // return getSearchServicePlugin().executeQuery(querySettings, searchPath, strategy);
     return Search.QueryCountDto.newBuilder().setTotalHits(0).build();

opal-search/src/main/java/org/obiba/opal/search/service/SearchQueryExecutor.java

@@ -26,10 +26,10 @@ public interface SearchQueryExecutor {
   /**
    * Performs a count on the query.
    *
-   * @param query
+   * @param querySettings
    * @return
    * @throws SearchException
    */
-  Search.QueryCountDto count(String query) throws SearchException;
+  Search.QueryCountDto count(QuerySettings querySettings) throws SearchException;
 
 }

opal-search/src/main/java/org/obiba/opal/search/service/impl/ContentQueryExecutor.java

@@ -54,24 +54,13 @@ public Search.QueryResultDto execute(QuerySettings querySettings) throws SearchE
       // Create an IndexSearcher to perform the search
       IndexSearcher searcher = new IndexSearcher(reader);
 
-      // Build a QueryParser
-      QueryParser parser = new QueryParser("content", analyzer);
-
-      // Parse a query
-      Query query = parser.parse(querySettings.getQuery());
-      if (querySettings.hasFilterReferences()) {
-        // at least one table-ref must match
-        BooleanQuery.Builder queryBuilder = new BooleanQuery.Builder();
-        for (String tableRef : querySettings.getFilterReferences()) {
-          queryBuilder.add(new TermQuery(new Term("table-ref", tableRef)), BooleanClause.Occur.SHOULD);
-        }
-        Query termsQuery = queryBuilder.build();
-        
-        queryBuilder = new BooleanQuery.Builder();
-        queryBuilder.add(new BooleanClause(query, BooleanClause.Occur.MUST));
-        queryBuilder.add(new BooleanClause(termsQuery, BooleanClause.Occur.MUST));
-        query = queryBuilder.build();
+      // Case no tables
+      if (!querySettings.hasFilterReferences()) {
+        return Search.QueryResultDto.newBuilder().setTotalHits(0).build();
       }
+
+      // Make query
+      Query query = makeQuery(querySettings);
       String lastDoc = querySettings.getLastDoc();
       ScoreDoc lastScoreDoc = Strings.isNullOrEmpty(lastDoc) ? null : ScoreDocSerializer.deserialize(lastDoc);
 
@@ -111,18 +100,20 @@ public Search.QueryResultDto execute(QuerySettings querySettings) throws SearchE
   }
 
   @Override
-  public Search.QueryCountDto count(String rawQuery) throws SearchException {
+  public Search.QueryCountDto count(QuerySettings querySettings) throws SearchException {
     // Create an IndexReader to access the index
     try (IndexReader reader = DirectoryReader.open(directory);) {
       // Create an IndexSearcher to perform the search
       IndexSearcher searcher = new IndexSearcher(reader);
 
-      // Build a QueryParser
-      QueryParser parser = new QueryParser("content", analyzer);
+      // Case no tables
+      if (!querySettings.hasFilterReferences()) {
+        return Search.QueryCountDto.newBuilder().setTotalHits(0).build();
+      }
 
-      // Parse a query (search for books with "Lucene" in the title)
-      Query parsedQuery = parser.parse(rawQuery);
-      Search.QueryCountDto.Builder builder = Search.QueryCountDto.newBuilder().setTotalHits(searcher.count(parsedQuery));
+      // Make query
+      Query query = makeQuery(querySettings);
+      Search.QueryCountDto.Builder builder = Search.QueryCountDto.newBuilder().setTotalHits(searcher.count(query));
       return builder.build();
     } catch (IOException e) {
       throw new SearchException("Tables index access failure", e);
@@ -134,4 +125,26 @@ public Search.QueryCountDto count(String rawQuery) throws SearchException {
       return Search.QueryCountDto.newBuilder().setTotalHits(0).build();
     }
   }
+
+  private Query makeQuery(QuerySettings querySettings) throws ParseException {
+    // Build a QueryParser
+    QueryParser parser = new QueryParser("content", analyzer);
+
+    // Parse a query
+    Query query = parser.parse(querySettings.getQuery());
+    if (querySettings.hasFilterReferences()) {
+      // at least one table-ref must match
+      BooleanQuery.Builder queryBuilder = new BooleanQuery.Builder();
+      for (String tableRef : querySettings.getFilterReferences()) {
+        queryBuilder.add(new TermQuery(new Term("table-ref", tableRef)), BooleanClause.Occur.SHOULD);
+      }
+      Query termsQuery = queryBuilder.build();
+
+      queryBuilder = new BooleanQuery.Builder();
+      queryBuilder.add(new BooleanClause(query, BooleanClause.Occur.MUST));
+      queryBuilder.add(new BooleanClause(termsQuery, BooleanClause.Occur.MUST));
+      query = queryBuilder.build();
+    }
+    return query;
+  }
 }

opal-search/src/main/java/org/obiba/opal/web/search/DatasourcesVariablesSearchResource.java

@@ -79,7 +79,7 @@ public Response count(@QueryParam("query") String query) {
 
     try {
       if (!searchServiceAvailable()) return Response.status(Response.Status.SERVICE_UNAVAILABLE).build();
-      Search.QueryCountDto queryCountDto = opalSearchService.executeCount(query, getSearchPath());
+      Search.QueryCountDto queryCountDto = opalSearchService.executeCount(buildQuerySearch(query, null, 0, null, null, null), getSearchPath());
       return Response.ok().entity(queryCountDto).build();
     } catch (Exception e) {
       log.error("Unable to perform variables search", e);