[SEARCH] and create corpus

src/Gargantext/API.hs

@@ -425,3 +425,7 @@ startGargantextMock port = do
   application <- makeMockApp . MockEnv $ FireWall False
   run port application
 -}
+
+
+
+

src/Gargantext/API/Corpus/New.hs

@@ -18,20 +18,49 @@ New corpus means either:
 {-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE TypeOperators      #-}
 {-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE FlexibleContexts     #-}
+{-# LANGUAGE RankNTypes          #-}
 
 module Gargantext.API.Corpus.New
       where
 
-import Servant
-import Gargantext.Prelude
-import Gargantext.API.Count (Query(..))
+import Data.Aeson.TH (deriveJSON)
+import Data.Swagger
+import Data.Text (Text)
+import GHC.Generics (Generic)
+import Gargantext.Core (Lang(..))
+import Gargantext.Core.Utils.Prefix (unPrefix)
+import Gargantext.Database.Flow (flowCorpusSearchInDatabase)
 import Gargantext.Database.Types.Node (CorpusId)
---import Gargantext.Database.Flow (flowCorpusSearchInDatabase)
+import Gargantext.Prelude
+import Servant
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary
+import Gargantext.Database.Flow (FlowCmdM)
+
+data Query = Query { query_query      :: Text
+                   , query_corpus_id  :: Int
+                   }
+                   deriving (Eq, Show, Generic)
+
+deriveJSON (unPrefix "query_") ''Query
+
+
+instance Arbitrary Query where
+    arbitrary = elements [ Query q n
+                         | q <- ["a","b"]
+                         , n <- [0..10]
+                         ]
+
+instance ToSchema Query
+
 
 type Api = Summary "New Corpus endpoint"
          :> ReqBody '[JSON] Query
          :> Post '[JSON] CorpusId
 
 
-api :: Monad m => Query -> m CorpusId
-api _ = pure 1
+api :: FlowCmdM env err m => Query -> m CorpusId
+api (Query q _) = do
+  cId <- flowCorpusSearchInDatabase "user1" EN q
+  pure cId

src/Gargantext/Database/Flow.hs

@@ -119,13 +119,22 @@ flowCorpusFile u n l la ff fp = do
   flowCorpus u n la (map (map toHyperdataDocument) docs)
 
 -- TODO query with complex query
-flowCorpusSearchInDatabase :: FlowCmdM env ServantErr m
+flowCorpusSearchInDatabase :: FlowCmdM env err m
           => Username -> Lang -> Text -> m CorpusId
 flowCorpusSearchInDatabase u la q = do
   (_masterUserId, _masterRootId, cId) <- getOrMkRootWithCorpus userMaster "" (Nothing :: Maybe HyperdataCorpus)
   ids <-  map fst <$> searchInDatabase cId (stemIt q)
   flowCorpusUser la u q (Nothing :: Maybe HyperdataCorpus) ids
 
+
+flowCorpusSearchInDatabase' :: FlowCmdM env ServantErr m
+          => Username -> Lang -> Text -> m CorpusId
+flowCorpusSearchInDatabase' u la q = do
+  (_masterUserId, _masterRootId, cId) <- getOrMkRootWithCorpus userMaster "" (Nothing :: Maybe HyperdataCorpus)
+  ids <-  map fst <$> searchInDatabase cId (stemIt q)
+  flowCorpusUser la u q (Nothing :: Maybe HyperdataCorpus) ids
+
+
 ------------------------------------------------------------------------
 
 flow :: (FlowCmdM env ServantErr m, FlowCorpus a, MkCorpus c)
@@ -139,7 +148,7 @@ flowCorpus :: (FlowCmdM env ServantErr m, FlowCorpus a)
 flowCorpus = flow (Nothing :: Maybe HyperdataCorpus)
 
 
-flowCorpusUser :: (FlowCmdM env ServantErr m, MkCorpus c)
+flowCorpusUser :: (FlowCmdM env err m, MkCorpus c)
                => Lang -> Username -> CorpusName -> Maybe c -> [NodeId] -> m CorpusId
 flowCorpusUser l userName corpusName ctype ids = do
   -- User Flow