[MERGE] fix conflicts

src/Gargantext/API/Node/Corpus/New.hs

@@ -58,7 +58,6 @@ import Gargantext.Database.Admin.Types.Node (CorpusId, NodeType(..))
 import Gargantext.Database.Prelude (hasConfig)
 import Gargantext.Database.Query.Table.Node (getNodeWith)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
-import Gargantext.Database.Query.Table.User (getUserPubmedAPIKey)
 import Gargantext.Database.Schema.Node (node_hyperdata)
 import Gargantext.Prelude
 import Gargantext.Prelude.Config (gc_max_docs_parsers)
@@ -145,6 +144,7 @@ data WithQuery = WithQuery
   , _wq_lang         :: !Lang
   , _wq_node_id      :: !Int
   , _wq_flowListWith :: !FlowSocialListWith
+  , _wq_pubmedAPIKey :: !(Maybe Text)
   }
   deriving (Show, Eq, Generic)
 
@@ -163,6 +163,7 @@ instance Arbitrary WithQuery where
                         <*> arbitrary
                         <*> arbitrary
                         <*> arbitrary
+                        <*> arbitrary
 
 ------------------------------------------------------------------------
 
@@ -200,8 +201,8 @@ addToCorpusWithQuery user cid (WithQuery { _wq_query = q
                                          , _wq_databases = dbs
                                          , _wq_datafield = datafield
                                          , _wq_lang = l
-                                         , _wq_flowListWith = flw }) maybeLimit jobHandle = do
-
+                                         , _wq_flowListWith = flw
+                                         , _wq_pubmedAPIKey = mPubmedAPIKey }) maybeLimit jobHandle = do
   -- TODO ...
   $(logLocM) DEBUG $ T.pack $ "(cid, dbs) " <> show (cid, dbs)
   $(logLocM) DEBUG $ T.pack $ "datafield  " <> show datafield
@@ -228,7 +229,7 @@ addToCorpusWithQuery user cid (WithQuery { _wq_query = q
       --      if cid is root   -> create corpus in Private
       $(logLocM) DEBUG $ T.pack $ "getDataText with query: " <> show q
       let db = database2origin dbs
-      mPubmedAPIKey <- getUserPubmedAPIKey user
+      -- mPubmedAPIKey <- getUserPubmedAPIKey user
       -- printDebug "[addToCorpusWithQuery] mPubmedAPIKey" mPubmedAPIKey
       eTxt <- getDataText db (Multi l) q mPubmedAPIKey maybeLimit
 

src/Gargantext/Database/Query/Table/Node/UpdateOpaleye.hs

@@ -26,7 +26,7 @@ import Gargantext.Database.Prelude (Cmd, mkCmd, DBCmd)
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.Error
 
-import Debug.Trace (trace)
+-- import Debug.Trace (trace)
 
 updateHyperdata :: HyperdataC a => NodeId -> a -> DBCmd err Int64
 updateHyperdata i h = mkCmd $ \c -> putStrLn "before runUpdate_" >>
@@ -34,7 +34,7 @@ updateHyperdata i h = mkCmd $ \c -> putStrLn "before runUpdate_" >>
                                     putStrLn "after runUpdate_" >> return res
 
 updateHyperdataQuery :: HyperdataC a => NodeId -> a -> Update Int64
-updateHyperdataQuery i h = seq h' $ trace "updateHyperdataQuery: encoded JSON" $ Update
+updateHyperdataQuery i h = seq h' $ {- trace "updateHyperdataQuery: encoded JSON" $ -} Update
    { uTable      = nodeTable
    , uUpdateWith = updateEasy (\  (Node { .. })
                                 -> Node { _node_hyperdata = h', .. }