[Phylo] Code session Phylo

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

@@ -17,6 +17,7 @@ Portability : POSIX
 module Gargantext.Core.Viz.Phylo.API
   where
 
+import Data.Maybe (fromMaybe)
 import Control.Lens ((^.))
 import Data.String.Conversions
 --import Control.Monad.Reader (ask)
@@ -98,13 +99,13 @@ getPhylo :: PhyloId -> GargServer GetPhylo
 getPhylo phId _lId l msb  = do
   phNode     <- getNodeWith phId (Proxy :: Proxy HyperdataPhylo)
   let
-    level = maybe 2 identity l
-    branc = maybe 2 identity msb
+    level = fromMaybe 2 l
+    branc = fromMaybe 2 msb
     maybePhylo = phNode ^. (node_hyperdata . hp_data)
 
   p <- liftBase $ viewPhylo2Svg
                 $ viewPhylo level branc
-                $ maybe phyloFromQuery identity maybePhylo
+                $ fromMaybe phyloFromQuery maybePhylo
   pure (SVG p)
 ------------------------------------------------------------------------
 type PostPhylo =  QueryParam "listId" ListId
@@ -112,16 +113,16 @@ type PostPhylo =  QueryParam "listId" ListId
                :> (Post '[JSON] NodeId)
 
 postPhylo :: CorpusId -> UserId -> GargServer PostPhylo
-postPhylo n userId _lId = do
+postPhylo corpusId userId _lId = do
   -- TODO get Reader settings
   -- s <- ask
   -- let
     -- _vrs = Just ("1" :: Text)
     -- _sft = Just (Software "Gargantext" "4")
     -- _prm = initPhyloParam vrs sft (Just q)
-  phy <- flowPhylo n
-  pId <- insertNodes [node NodePhylo "Phylo" (HyperdataPhylo Nothing (Just phy)) (Just n) userId]
-  pure $ NodeId (fromIntegral pId)
+  phy <- flowPhylo corpusId -- params
+  phyloId <- insertNodes [node NodePhylo "Phylo" (HyperdataPhylo Nothing (Just phy)) (Just corpusId) userId]
+  pure $ NodeId (fromIntegral phyloId)
 
 ------------------------------------------------------------------------
 -- | DELETE Phylo == delete a node

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

@@ -37,6 +37,17 @@ import qualified Data.Set as Set
 -- | To Phylo | --
 ------------------
 
+{-
+-- TODO AD
+data Phylo' = PhyloBase { _phylo'_phyloBase :: Phylo}
+            | PhyloN    { _phylo'_phylo1    :: Phylo}
+
+
+toPhylo' :: Phylo' -> [Document] -> TermList -> Config -> Phylo
+toPhylo' (PhyloN    phylo) = toPhylo' 
+toPhylo' (PhyloBase phylo) = toPhylo 
+-}
+
 
 toPhylo :: [Document] -> TermList -> Config -> Phylo
 toPhylo docs lst conf = trace ("# phylo1 groups " <> show(length $ getGroupsFromLevel 1 phylo1))
@@ -48,9 +59,11 @@ toPhylo docs lst conf = trace ("# phylo1 groups " <> show(length $ getGroupsFrom
         --------------------------------------
         phylo1 :: Phylo
         phylo1 = toPhylo1 docs phyloBase
+        -- > AD to db here
         --------------------------------------
-        phyloBase :: Phylo 
+        phyloBase :: Phylo
         phyloBase = toPhyloBase docs lst conf
+        -- > AD to db here
         --------------------------------------