[Contexts for ngrams] Support AND search

src/Gargantext/API/GraphQL/Context.hs

@@ -94,6 +94,7 @@ data ContextsForNgramsArgs
   = ContextsForNgramsArgs
     { corpus_id    :: Int
     , ngrams_terms :: [Text]
+    , and_logic    :: Bool
     } deriving (Generic, GQLType)
 
 data NodeContextCategoryMArgs = NodeContextCategoryMArgs
@@ -123,8 +124,8 @@ resolveNodeContext NodeContextArgs { context_id, node_id } =
 resolveContextsForNgrams
   :: (CmdCommon env)
   => ContextsForNgramsArgs -> GqlM e env [ContextGQL]
-resolveContextsForNgrams ContextsForNgramsArgs { corpus_id, ngrams_terms } =
-  dbContextForNgrams corpus_id ngrams_terms
+resolveContextsForNgrams ContextsForNgramsArgs { corpus_id, ngrams_terms, and_logic } =
+  dbContextForNgrams corpus_id ngrams_terms and_logic
 
 resolveContextNgrams
   :: (CmdCommon env)
@@ -149,9 +150,9 @@ dbNodeContext context_id node_id = do
 -- | Returns list of `ContextGQL` for given ngrams in given corpus id.
 dbContextForNgrams
   :: (CmdCommon env)
-  => Int -> [Text] -> GqlM e env [ContextGQL]
-dbContextForNgrams node_id ngrams_terms = do
-  contextsForNgramsTerms <- lift $ getContextsForNgramsTerms (UnsafeMkNodeId node_id) ngrams_terms
+  => Int -> [Text] -> Bool -> GqlM e env [ContextGQL]
+dbContextForNgrams node_id ngrams_terms and_logic = do
+  contextsForNgramsTerms <- lift $ getContextsForNgramsTerms (UnsafeMkNodeId node_id) ngrams_terms and_logic
   --lift $ printDebug "[dbContextForNgrams] contextsForNgramsTerms" contextsForNgramsTerms
   pure $ toContextGQL <$> contextsForNgramsTerms
 

src/Gargantext/Database/Query/Table/NodeContext.hs

@@ -152,9 +152,11 @@ data ContextForNgramsTerms =
 getContextsForNgramsTerms :: HasNodeError err
                           => NodeId
                           -> [Text]
+                          -> Bool
                           -> DBCmd err [ContextForNgramsTerms]
-getContextsForNgramsTerms cId ngramsTerms = do
-  res <- runPGSQuery query (cId, PGS.In ngramsTerms)
+getContextsForNgramsTerms cId ngramsTerms and_logic = do
+  let terms_length = length ngramsTerms
+  res <- runPGSQuery (query and_logic) (cId, PGS.In ngramsTerms, terms_length)
   pure $ (\( _cfnt_nodeId
            , _cfnt_hash
            , _cfnt_nodeTypeId
@@ -166,8 +168,8 @@ getContextsForNgramsTerms cId ngramsTerms = do
            , _cfnt_score
            , _cfnt_category) -> ContextForNgramsTerms { .. }) <$> res
   where
-    query :: PGS.Query
-    query = [sql| SELECT t.id, t.hash_id, t.typename, t.user_id, t.parent_id, t.name, t.date, t.hyperdata, t.score, t.category
+    query :: Bool -> PGS.Query
+    query False = [sql| SELECT t.id, t.hash_id, t.typename, t.user_id, t.parent_id, t.name, t.date, t.hyperdata, t.score, t.category
                 FROM (
                   SELECT DISTINCT ON (contexts.id)
                        contexts.id AS id,
@@ -190,6 +192,31 @@ getContextsForNgramsTerms cId ngramsTerms = do
                    -- ORDER BY t.doc_count DESC
                    ORDER BY t.score DESC
                    |]
+    query True = [sql| SELECT t.id, t.hash_id, t.typename, t.user_id, t.parent_id, t.name, t.date, t.hyperdata, t.score, t.category
+                FROM (
+                  SELECT DISTINCT ON (contexts.id)
+                       contexts.id AS id,
+                       hash_id,
+                       typename,
+                       user_id,
+                       parent_id,
+                       name,
+                       date,
+                       hyperdata,
+                       nodes_contexts.score AS score,
+                       nodes_contexts.category AS category --,
+                       -- context_node_ngrams.doc_count AS doc_count
+                    FROM contexts
+                    JOIN context_node_ngrams ON contexts.id = context_node_ngrams.context_id
+                    JOIN nodes_contexts ON contexts.id = nodes_contexts.context_id
+                    JOIN ngrams ON context_node_ngrams.ngrams_id = ngrams.id
+                    WHERE nodes_contexts.node_id = ?
+                     AND ngrams.terms IN ?
+                    GROUP BY contexts.id
+                    HAVING COUNT(DISTINCT ngrams.terms) = ?) t
+                   -- ORDER BY t.doc_count DESC
+                   ORDER BY t.score DESC
+                   |]