Merge remote-tracking branch 'origin/374-dev-document-fix' into dev

devops/docker/docker-compose.yaml

@@ -5,6 +5,7 @@ services:
     #image: 'postgres:latest'
     image: 'postgres:11'
     network_mode: host
+    #command: ["postgres", "-c", "log_statement=all"]
     #ports:
       #- 5432:5432
     environment:

src/Gargantext/Database/Action/Flow.hs

@@ -349,7 +349,7 @@ insertMasterDocs :: ( FlowCmdM env err m
                  -> m [DocId]
 insertMasterDocs c lang hs  =  do
   (masterUserId, _, masterCorpusId) <- getOrMk_RootWithCorpus (UserName userMaster) (Left corpusMasterName) c
-  (ids', documentsWithId) <- insertDocs masterUserId masterCorpusId (map (toNode masterUserId masterCorpusId) hs )
+  (ids', documentsWithId) <- insertDocs masterUserId masterCorpusId (map (toNode masterUserId Nothing) hs )
   _ <- Doc.add masterCorpusId ids'
   -- TODO
   -- create a corpus with database name (CSV or PubMed)
@@ -413,7 +413,7 @@ insertDocs :: ( FlowCmdM env err m
               -> m ([ContextId], [Indexed ContextId a])
 insertDocs uId cId hs = do
   let docs = map addUniqId hs
-  newIds <- insertDb uId cId docs
+  newIds <- insertDb uId Nothing docs
   -- printDebug "newIds" newIds
   let
     newIds' = map reId newIds

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

@@ -92,14 +92,14 @@ import Database.PostgreSQL.Simple (formatQuery)
 -- ParentId : folder ID which is parent of the inserted documents
 -- Administrator of the database has to create a uniq index as following SQL command:
 -- `create unique index on contexts table (typename, parent_id, (hyperdata ->> 'uniqId'));`
-insertDb :: (InsertDb a, HasDBid NodeType) => UserId -> ParentId -> [a] -> Cmd err [ReturnId]
+insertDb :: (InsertDb a, HasDBid NodeType) => UserId -> Maybe ParentId -> [a] -> Cmd err [ReturnId]
 insertDb u p = runPGSQuery queryInsert . Only . Values fields . map (insertDb' u p)
       where
         fields    = map (\t-> QualifiedIdentifier Nothing t) inputSqlTypes
 
 class InsertDb a
   where
-    insertDb' :: HasDBid NodeType => UserId -> ParentId -> a -> [Action]
+    insertDb' :: HasDBid NodeType => UserId -> Maybe ParentId -> a -> [Action]
 
 
 instance InsertDb HyperdataDocument
@@ -273,10 +273,10 @@ maybeText = maybe (DT.pack "") identity
 class ToNode a
   where
     -- TODO Maybe NodeId
-    toNode :: HasDBid NodeType => UserId -> ParentId -> a -> Node a
+    toNode :: HasDBid NodeType => UserId -> Maybe ParentId -> a -> Node a
 
 instance ToNode HyperdataDocument where
-  toNode u p h = Node 0 Nothing (toDBid NodeDocument) u (Just p) n date h
+  toNode u p h = Node 0 Nothing (toDBid NodeDocument) u p n date h
     where
       n    = maybe "No Title" (DT.take 255) (_hd_title h)
       date  = jour y m d
@@ -289,7 +289,7 @@ instance ToNode HyperdataDocument where
 
 -- TODO better Node
 instance ToNode HyperdataContact where
-  toNode u p h = Node 0 Nothing (toDBid NodeContact) u (Just p) "Contact" date h
+  toNode u p h = Node 0 Nothing (toDBid NodeContact) u p "Contact" date h
     where
       date  = jour 2020 01 01