[API][ROUTE] count tab result.

src/Gargantext/API/Table.hs

@@ -57,11 +57,11 @@ import Test.QuickCheck (elements)
 import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
 
 ------------------------------------------------------------------------
+
 type TableApi = Summary " Table API"
               :> ReqBody '[JSON] TableQuery
-              :> Post '[JSON] [FacetDoc]
+              :> Post    '[JSON] TableResult
 
---{-
 data TableQuery = TableQuery
   { tq_offset  :: Int
   , tq_limit   :: Int
@@ -70,6 +70,18 @@ data TableQuery = TableQuery
   , tq_query  :: Text
   } deriving (Generic)
 
+data TableResult = TableResult { tr_count :: Int
+                               , tr_docs  :: [FacetDoc]
+                               } deriving (Generic)
+
+$(deriveJSON (unPrefix "tr_") ''TableResult)
+
+instance ToSchema TableResult where
+  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "tr_")
+
+instance Arbitrary TableResult where
+  arbitrary = TableResult <$> arbitrary <*> arbitrary
+
 $(deriveJSON (unPrefix "tq_") ''TableQuery)
 
 instance ToSchema TableQuery where
@@ -79,17 +91,38 @@ instance Arbitrary TableQuery where
   arbitrary = elements [TableQuery 0 10 DateAsc Docs "electrodes"]
 
 
-tableApi :: NodeId -> TableQuery -> Cmd err [FacetDoc]
+tableApi :: NodeId -> TableQuery -> Cmd err TableResult
 tableApi cId (TableQuery o l order ft "") = getTable cId (Just ft) (Just o) (Just l) (Just order)
 tableApi cId (TableQuery o l order ft q) = case ft of
-      Docs  -> searchInCorpus cId False [q] (Just o) (Just l) (Just order)
-      Trash -> searchInCorpus cId True [q] (Just o) (Just l) (Just order)
+      Docs  -> searchInCorpus' cId False [q] (Just o) (Just l) (Just order)
+      Trash -> searchInCorpus' cId True [q] (Just o) (Just l) (Just order)
       x     -> panic $ "not implemented in tableApi " <> (cs $ show x)
 
+searchInCorpus' :: CorpusId
+                -> Bool
+                -> [Text]
+                -> Maybe Offset
+                -> Maybe Limit
+                -> Maybe OrderBy
+                -> Cmd err TableResult
+searchInCorpus' cId t q o l order = do
+  docs <- searchInCorpus cId t q o l order
+  allDocs  <- searchInCorpus cId t q Nothing Nothing Nothing
+  pure (TableResult (length allDocs) docs)
+
+
 getTable :: NodeId -> Maybe TabType
+         -> Maybe Offset  -> Maybe Limit
+         -> Maybe OrderBy -> Cmd err TableResult
+getTable cId ft o l order = do
+  docs <- getTable' cId ft o l order
+  allDocs  <- getTable' cId ft Nothing Nothing Nothing
+  pure (TableResult (length allDocs) docs)
+
+getTable' :: NodeId -> Maybe TabType
          -> Maybe Offset  -> Maybe Limit
          -> Maybe OrderBy -> Cmd err [FacetDoc]
-getTable cId ft o l order =
+getTable' cId ft o l order =
   case ft of
     (Just Docs)      -> runViewDocuments cId False o l order
     (Just Trash)     -> runViewDocuments cId True  o l order

src/Gargantext/Database/TextSearch.hs

@@ -144,7 +144,7 @@ queryInCorpusWithContacts
   -> Maybe OrderBy
   -> Text
   -> O.Query FacetPairedRead
-queryInCorpusWithContacts cId lId _ _ _ q = proc () -> do
+queryInCorpusWithContacts cId _lId _ _ _ q = proc () -> do
   (n, (nn, (_nng, (ngrams', (_, contacts))))) <- joinInCorpusWithContacts -< ()
   restrict -< (n^.ns_search)        @@ (pgTSQuery  $ unpack q  )
   restrict -< (n^.ns_typename)     .== (pgInt4 $ nodeTypeId NodeDocument)