[DBFLOW] Taks list + cosmetics + mkNodeList.

src/Gargantext/Database/Flow.hs

@@ -93,8 +93,8 @@ flow fp = do
   runCmd' $ del [corpusId2, corpusId]
 
 ----------------------------------------------------------------
-
-type HashId = Text
+type HashId   = Text
+type NodeId   = Int
 type ToInsert = Map HashId HyperdataDocument
 type Inserted = Map HashId ReturnId
 
@@ -111,7 +111,6 @@ data DocumentWithId = DocumentWithId { documentId   :: NodeId
                              , documentData :: HyperdataDocument
                              }
 
-type NodeId  = Int
 
 mergeData :: Map HashId ReturnId -> Map HashId HyperdataDocument -> [DocumentWithId]
 mergeData rs hs = map (\(hash,r) -> DocumentWithId (reId r) (lookup' hash hs)) $ DM.toList rs
@@ -123,7 +122,6 @@ data DocumentIdWithNgrams = DocumentIdWithNgrams { documentWithId  :: DocumentWi
                                                  }
 
 
-
 documentIdWithNgrams :: (HyperdataDocument -> Map (NgramsT Ngrams) Int) 
                      -> [DocumentWithId]   -> [DocumentIdWithNgrams]
 documentIdWithNgrams f = map (\d -> DocumentIdWithNgrams d ((f . documentData) d))
@@ -143,19 +141,22 @@ indexNgrams ng2nId = do
 
 
 insertToNodeNgrams :: Map (NgramsT NgramsIndexed) (Map NodeId Int) -> Cmd Int
-insertToNodeNgrams m = insertNodeNgrams $ [ NodeNgram Nothing nId ((_ngramsId    . _ngramsT   ) ng)
-                                               (fromIntegral n)   ((ngramsTypeId . _ngramsType) ng)
-                                      | (ng, nId2int) <- DM.toList m
-                                      , (nId, n)      <- DM.toList nId2int
-                                      ]
+insertToNodeNgrams m = insertNodeNgrams $ [ NodeNgram Nothing nId  ((_ngramsId    . _ngramsT   ) ng)
+                                                  (fromIntegral n) ((ngramsTypeId . _ngramsType) ng)
 
+                                          | (ng, nId2int) <- DM.toList m
+                                          , (nId, n)      <- DM.toList nId2int
+                                          ]
 
--- mk List Group
--- group by fun
+-- mk ListGroup
+-- groupBy fun
 -- insertInto NodeNgramsNgrams
 
+-- compute Candidate / Map
+-- add column typelist
+-- insertNodeNodeNgram
+
 -- get data of NgramsTable
--- change List of ngrams
+-- post :: update NodeNodeNgrams
 -- group ngrams
 
-

src/Gargantext/Database/Node.hs

@@ -497,4 +497,6 @@ mkRoot uId = case uId > 0 of
 mkCorpus :: Maybe Name -> Maybe HyperdataCorpus -> ParentId -> UserId -> Cmd [Int]
 mkCorpus n h p u = insertNodesR' [nodeCorpusW n h p u]
 
+--mkNodeGroupList :: Maybe HyperdataAny -> ParentId -> UserId -> Cmd [Int]
+--mkNodeGroupList h p u = insertNodesR' [nodeCorpusW (Just "Group List" h p u)]
 

src/Gargantext/Database/NodeNgram.hs

@@ -69,7 +69,11 @@ queryNodeNgramTable :: Query NodeNgramRead
 queryNodeNgramTable = queryTable nodeNgramTable
 
 insertNodeNgrams :: [NodeNgram] -> Cmd Int
-insertNodeNgrams nns = insertNodeNgramW $ map (\(NodeNgram i n g w t) -> NodeNgram Nothing (pgInt4 n) (pgInt4 g) (pgDouble w) (pgInt4 t) ) nns
+insertNodeNgrams = insertNodeNgramW
+                 . map (\(NodeNgram _ n g w t) ->
+                          NodeNgram Nothing (pgInt4 n)   (pgInt4 g)
+                                            (pgDouble w) (pgInt4 t)
+                        )
 
 insertNodeNgramW :: [NodeNgramWrite] -> Cmd Int
 insertNodeNgramW nns = mkCmd $ \c -> fromIntegral <$> runInsertMany c nodeNgramTable nns

src/Gargantext/Database/NodeNgramNgram.hs

@@ -21,7 +21,7 @@ commentary with @some markup@.
 
 module Gargantext.Database.NodeNgramNgram where
 
-import Prelude
+import Gargantext.Prelude
 import Data.Maybe (Maybe)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Control.Lens.TH (makeLensesWith, abbreviatedFields)
@@ -29,42 +29,48 @@ import qualified Database.PostgreSQL.Simple as PGS
 
 import Opaleye
 
-data NodeNgramNgramPoly node_id ngram1_id ngram2_id weight
-                   = NodeNgramNgram { nodeNgramNgram_NodeNgramNgram_NodeId   :: node_id
-                                    , nodeNgramNgram_NodeNgramNgram_Ngram1Id :: ngram1_id
-                                    , nodeNgramNgram_NodeNgramNgram_Ngram2Id :: ngram2_id
-                                    , nodeNgramNgram_NodeNgramNgram_Weight   :: weight
-                                    } deriving (Show)
+data NodeNgramNgramPoly node_id ngram1_id ngram2_id weight =
+  NodeNgramNgram { nng_NodeId   :: node_id
+                 , nng_Ngram1Id :: ngram1_id
+                 , nng_Ngram2Id :: ngram2_id
+                 , nng_Weight   :: weight
+                 } deriving (Show)
 
 
-type NodeNgramNgramWrite = NodeNgramNgramPoly (Maybe (Column PGInt4  ))
-                                              (Column PGInt4          )
-                                              (Column PGInt4          )
-                                              (Maybe (Column PGFloat8))
+type NodeNgramNgramWrite =
+  NodeNgramNgramPoly (Maybe (Column PGInt4  ))
+                     (Column PGInt4          )
+                     (Column PGInt4          )
+                     (Maybe (Column PGFloat8))
 
-type NodeNgramNgramRead  = NodeNgramNgramPoly (Column PGInt4  )
-                                              (Column PGInt4  )
-                                              (Column PGInt4  )
-                                              (Column PGFloat8)
+type NodeNgramNgramRead  =
+  NodeNgramNgramPoly (Column PGInt4  )
+                     (Column PGInt4  )
+                     (Column PGInt4  )
+                     (Column PGFloat8)
 
-type NodeNgramNgram = NodeNgramNgramPoly (Maybe Int   )
-                                                Int
-                                                Int
-                                         (Maybe Double)
+type NodeNgramNgram =
+  NodeNgramNgramPoly (Maybe Int   )
+                            Int
+                            Int
+                     (Maybe Double)
 
-$(makeAdaptorAndInstance "pNodeNgramNgram" ''NodeNgramNgramPoly)
-$(makeLensesWith abbreviatedFields         ''NodeNgramNgramPoly)
+$(makeAdaptorAndInstance "pNodeNgramNgram"
+                         ''NodeNgramNgramPoly)
+$(makeLensesWith abbreviatedFields
+                         ''NodeNgramNgramPoly)
 
 
 nodeNgramNgramTable :: Table NodeNgramNgramWrite NodeNgramNgramRead
-nodeNgramNgramTable  = Table "nodes_ngrams_ngrams" 
-                              ( pNodeNgramNgram NodeNgramNgram
-                                   { nodeNgramNgram_NodeNgramNgram_NodeId   = optional "node_id"
-                                   , nodeNgramNgram_NodeNgramNgram_Ngram1Id = required "ngram1_id"
-                                   , nodeNgramNgram_NodeNgramNgram_Ngram2Id = required "ngram2_id"
-                                   , nodeNgramNgram_NodeNgramNgram_Weight   = optional "weight"
-                                   }
-                              )
+nodeNgramNgramTable  =
+  Table "nodes_ngrams_ngrams"
+       ( pNodeNgramNgram NodeNgramNgram
+                       { nng_NodeId   = optional "node_id"
+                       , nng_Ngram1Id = required "ngram1_id"
+                       , nng_Ngram2Id = required "ngram2_id"
+                       , nng_Weight   = optional "weight"
+                       }
+       )
 
 queryNodeNgramNgramTable :: Query NodeNgramNgramRead
 queryNodeNgramNgramTable = queryTable nodeNgramNgramTable
@@ -78,3 +84,5 @@ instance QueryRunnerColumnDefault PGInt4 (Maybe Int) where
 
 instance QueryRunnerColumnDefault PGFloat8 (Maybe Double) where
     queryRunnerColumnDefault = fieldQueryRunnerColumn
+
+