[FIX] data import, database upsert returning ids

src/Gargantext/API/Ngrams.hs

@@ -908,9 +908,9 @@ putListNgrams' :: RepoCmdM env err m
                -> Map NgramsTerm NgramsRepoElement
                -> m ()
 putListNgrams' nodeId ngramsType ns = do
-  printDebug "[putLictNgrams'] nodeId" nodeId
-  printDebug "[putLictNgrams'] ngramsType" ngramsType
-  printDebug "[putListNgrams'] ns" ns
+  -- printDebug "[putLictNgrams'] nodeId" nodeId
+  -- printDebug "[putLictNgrams'] ngramsType" ngramsType
+  -- printDebug "[putListNgrams'] ns" ns
   var <- view repoVar
   liftBase $ modifyMVar_ var $ \r -> do
     pure $ r & r_version +~ 1

src/Gargantext/Core/Text/List.hs

@@ -156,7 +156,7 @@ buildNgramsTermsList _l _n _m s uCid mCid = do
                 (map (toGargList ((isStopTerm s) .fst) MapTerm)       candidatesHead)
              <> (map (toGargList ((isStopTerm s) .fst) CandidateTerm) candidatesTail)
 
-    ngs = List.concat $ map toNgramsElement $ map (\(lt, (t,d)) -> (lt, ((t, (d,empty))))) termList
+    ngs = List.concat $ map toNgramsElement $ map (\(lt, (t,d)) -> (lt, ((t, (d,Set.singleton t))))) termList
 
   pure $ Map.fromList [(NgramsTerms, ngs)]
 

src/Gargantext/Database/Action/Flow.hs

@@ -47,7 +47,7 @@ import Control.Lens ((^.), view, _Just, makeLenses)
 import Data.Aeson.TH (deriveJSON)
 import Data.Either
 import Data.List (concat)
-import qualified Data.Map  as Map
+import qualified Data.Map as Map
 import Data.Map (Map, lookup)
 import Data.Maybe (Maybe(..), catMaybes)
 import Data.Monoid
@@ -206,7 +206,7 @@ flowCorpusUser l user corpusName ctype ids = do
   -- TODO: check if present already, ignore
   _ <- Doc.add userCorpusId ids
 
-  _tId <- insertDefaultNode NodeTexts userCorpusId userId
+  -- tId <- insertDefaultNode NodeTexts userCorpusId userId
   -- printDebug "Node Text Id" tId
 
   -- User List Flow
@@ -233,8 +233,11 @@ insertDocs :: ( FlowCmdM env err m
               -> CorpusId
               -> m ([DocId], [DocumentWithId a])
 insertDocs hs uId cId = do
+  printDebug "hs" (length hs)
   let docs = map addUniqId hs
+  printDebug "docs" (length docs)
   ids <- insertDb uId cId docs
+  printDebug "ids" (length ids)
   let
     ids' = map reId ids
     documentsWithId = mergeData (toInserted ids) (Map.fromList $ map viewUniqId' docs)

src/Gargantext/Database/Query/Table/Node/Document/Insert.hs

@@ -153,7 +153,8 @@ queryInsert = [sql|
     , ins AS (
        INSERT INTO nodes (typename,user_id,parent_id,name,date,hyperdata)
        SELECT * FROM input_rows
-       ON CONFLICT ((hyperdata ->> 'uniqIdBdd')) DO NOTHING -- on unique index
+       ON CONFLICT ((hyperdata ->> 'uniqIdBdd')) DO UPDATE SET user_id=EXCLUDED.user_id  -- on unique index
+       -- ON CONFLICT ((hyperdata ->> 'uniqIdBdd')) DO NOTHING -- on unique index -- this does not return the ids
        -- ON CONFLICT (typename, parent_id, (hyperdata ->> 'uniqId')) DO NOTHING -- on unique index
        RETURNING id,hyperdata
        )
@@ -205,11 +206,11 @@ instance AddUniqId HyperdataDocument
             shaBdd = hash $ DT.concat $ map ($ doc) ([(\d -> maybeText (_hd_bdd d))] <> shaParametersDoc)
 
         shaParametersDoc :: [(HyperdataDocument -> Text)]
-        shaParametersDoc = [ \d -> maybeText (_hd_title    d)
-                            , \d -> maybeText (_hd_abstract d)
-                            , \d -> maybeText (_hd_source   d)
-                            , \d -> maybeText (_hd_publication_date   d)
-                            ]
+        shaParametersDoc = [ \d -> maybeText (_hd_title            d)
+                           , \d -> maybeText (_hd_abstract         d)
+                           , \d -> maybeText (_hd_source           d)
+                           , \d -> maybeText (_hd_publication_date d)
+                           ]
 
     ---------------------------------------------------------------------------
 -- * Uniqueness of document definition