[FEAT] SocialList refactoring

src/Gargantext/Core/Text/List.hs

@@ -29,7 +29,7 @@ import qualified Data.Text as Text
 -- import Gargantext.API.Ngrams.Tools (getCoocByNgrams', Diagonal(..))
 import Gargantext.API.Ngrams.Types (NgramsElement, mkNgramsElement, NgramsTerm(..), RootParent(..), mSetFromList)
 import Gargantext.API.Ngrams.Types (RepoCmdM)
-import Gargantext.Core.Text.List.Social (flowSocialList, invertForw)
+import Gargantext.Core.Text.List.Social (flowSocialList, flowSocialList', FlowSocialListPriority(..), invertForw)
 import Gargantext.Core.Text.Metrics (scored', Scored(..), normalizeGlobal, normalizeLocal)
 import Gargantext.Core.Text.Group
 import Gargantext.Core.Types (ListType(..), MasterCorpusId, UserCorpusId)
@@ -88,6 +88,8 @@ buildNgramsOthersList user uCid groupIt (nt, MapListSize mapListSize) = do
             $ ngs
 
   socialLists <- flowSocialList user nt (Set.fromList $ Map.keys ngs)
+  -- PrivateFirst for first development since Public is not implemented yet
+  socialLists' <- flowSocialList' PrivateFirst user nt (Set.fromList $ Map.keys ngs)
 
   let
     groupedWithList        = map (addListType (invertForw socialLists)) grouped

src/Gargantext/Core/Text/List/Social.hs

@@ -63,6 +63,7 @@ flowSocialList user nt ngrams' = do
   -- printDebug "* socialLists *: results \n" result
   pure result
 
+------------------------------------------------------------------------
 ------------------------------------------------------------------------
 -- | FlowSocialListPriority
 -- Sociological assumption: either private or others (public) first
@@ -73,6 +74,7 @@ flowSocialListPriority :: FlowSocialListPriority -> [NodeMode]
 flowSocialListPriority PrivateFirst = [Private, Shared{-, Public -}]
 flowSocialListPriority OthersFirst  = reverse $ flowSocialListPriority PrivateFirst
 
+------------------------------------------------------------------------
 flowSocialList' :: ( RepoCmdM env err m
                   , CmdM     env err m
                   , HasNodeError err
@@ -82,7 +84,7 @@ flowSocialList' :: ( RepoCmdM env err m
                   -> User -> NgramsType -> Set Text
                   -> m (Map Text FlowListScores)
 flowSocialList' flowPriority user nt ngrams' =
-  parentUnionsExcl <$> mapM (\m -> flowSocialListByMode' user m nt ngrams')
+  parentUnionsExcl <$> mapM (flowSocialListByMode' user nt ngrams')
                             (flowSocialListPriority flowPriority)
 
 
@@ -106,11 +108,11 @@ flowSocialListByMode' :: ( RepoCmdM env err m
                          , HasNodeError err
                          , HasTreeError err
                          )
-                      => User -> NodeMode -> NgramsType -> Set Text
+                      => User -> NgramsType -> Set Text -> NodeMode 
                       -> m (Map Text FlowListScores)
-flowSocialListByMode' user mode nt st = do
-  listIds <- findListsId user mode
-  flowSocialListByModeWith listIds nt st
+flowSocialListByMode' user nt st mode =
+      findListsId user mode
+  >>= flowSocialListByModeWith nt st
 
 
 flowSocialListByModeWith :: ( RepoCmdM env err m
@@ -118,11 +120,12 @@ flowSocialListByModeWith :: ( RepoCmdM env err m
                          , HasNodeError err
                          , HasTreeError err
                          )
-                      => [NodeId]-> NgramsType -> Set Text
+                      => NgramsType -> Set Text -> [NodeId]
                       -> m (Map Text FlowListScores)
-flowSocialListByModeWith ns nt st = do
-  ngramsRepos <- mapM (\l -> getListNgrams [l] nt) ns
-  pure $ toFlowListScores (keepAllParents nt) st Map.empty ngramsRepos
+flowSocialListByModeWith nt st ns =
+      mapM (\l -> getListNgrams [l] nt) ns
+  >>= pure
+    . toFlowListScores (keepAllParents nt) st Map.empty
 
 
 -- | We keep the parents for all ngrams but terms