[FEAT] FlowPhylo implemented

src/Gargantext/API/Ngrams/List.hs

@@ -19,15 +19,16 @@ import Control.Lens hiding (elements, Indexed)
 import Data.Aeson
 import Data.Either (Either(..))
 import Data.HashMap.Strict (HashMap)
-import Data.Map (Map, toList, fromList)
+import Data.Map (Map, toList)
 import Data.Maybe (catMaybes)
 import Data.Set (Set)
 import Data.Text (Text, concat, pack)
 import Data.Vector (Vector)
 import Gargantext.API.Admin.Orchestrator.Types
-import Gargantext.API.Ngrams (getNgramsTableMap, setListNgrams)
+import Gargantext.API.Ngrams (setListNgrams)
 import Gargantext.API.Ngrams.Tools (getTermsWith)
 import Gargantext.API.Ngrams.Types
+import Gargantext.API.Ngrams.Prelude (getNgramsList)
 import Gargantext.API.Ngrams.List.Types
 import Gargantext.API.Prelude (GargServer)
 import Gargantext.Core.NodeStory
@@ -110,7 +111,7 @@ csvApi = csvPostAsync
 get :: HasNodeStory env err m =>
        ListId -> m (Headers '[Header "Content-Disposition" Text] NgramsList)
 get lId = do
-  lst <- get' lId
+  lst <- getNgramsList lId
   let (NodeId id') = lId
   return $ addHeader (concat [ "attachment; filename=GarganText_NgramsList-"
                              , pack $ show id'
@@ -118,12 +119,6 @@ get lId = do
                              ]
                      ) lst
 
-get' :: HasNodeStory env err m
-    => ListId -> m NgramsList
-get' lId = fromList
-       <$> zip ngramsTypes
-       <$> mapM (getNgramsTableMap lId) ngramsTypes
-
 ------------------------------------------------------------------------
 -- TODO : purge list
 -- TODO talk

src/Gargantext/API/Ngrams/Prelude.hs

@@ -16,19 +16,38 @@ module Gargantext.API.Ngrams.Prelude
 
 import Data.Maybe (catMaybes)
 import Control.Lens (view)
+import Data.Map (fromList)
 import Data.Hashable (Hashable)
 import Data.Validity
 import Gargantext.API.Ngrams.Types
 import Gargantext.Core.Types (ListType)
-import Gargantext.Database.Schema.Ngrams (NgramsType)
+import Gargantext.Database.Schema.Ngrams (NgramsType, ngramsTypes)
 import Gargantext.Prelude
 import Gargantext.Core.Text.List.Social.Prelude
+import Gargantext.API.Ngrams (getNgramsTableMap)
 import Gargantext.Core.Text.Context (TermList)
+import Gargantext.Core.NodeStory (HasNodeStory)
+import Gargantext.Database.Admin.Types.Node (ListId)
 import qualified Data.HashMap.Strict as HM
 import qualified Data.Map.Strict as Map
 import qualified Data.List as List
 import qualified Data.Text as Text
 
+
+------------------------------------------------------------------------
+getNgramsList :: HasNodeStory env err m
+    => ListId -> m NgramsList
+getNgramsList lId = fromList
+       <$> zip ngramsTypes
+       <$> mapM (getNgramsTableMap lId) ngramsTypes
+
+getTermList :: HasNodeStory env err m
+            => ListId -> ListType -> NgramsType -> m (Maybe TermList)
+getTermList lId listType ngramsType = do
+  ngramsList <- getNgramsList lId
+  pure $ toTermList listType ngramsType ngramsList
+
+
 ------------------------------------------------------------------------
 -- | Tools
 -- Usage example: toTermList MapTerm NgramsTerms ngramsList

src/Gargantext/Core/Viz/Phylo/PhyloMaker.hs

@@ -67,11 +67,9 @@ toPhylo phyloStep = trace ("# phylo1 groups " <> show(length $ getGroupsFromLeve
         --------------------------------------
         phylo1 :: Phylo
         phylo1 = toPhylo1 phyloStep
-        -- > AD to db here
         --------------------------------------
 
 
-
 --------------------
 -- | To Phylo 1 | --
 --------------------