[Warnings+FEAT] insert for new created ngrams

src/Gargantext/API/Ngrams.hs

@@ -307,6 +307,10 @@ commitStatePatch (Versioned p_version p) = do
     pure (r', Versioned (r' ^. r_version) q')
 
   saveRepo
+
+  -- Save new ngrams
+  _ <- insertNgrams (newNgramsFromNgramsStatePatch p)
+
   pure vq'
 
 -- This is a special case of tableNgramsPut where the input patch is empty.

src/Gargantext/API/Ngrams/Types.hs

@@ -50,7 +50,7 @@ import Gargantext.Core.Text (size)
 import Gargantext.Core.Types (ListType(..), ListId, NodeId)
 import Gargantext.Core.Types (TODO)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixUntagged, unPrefixSwagger, wellNamedSchema)
-import Gargantext.Database.Prelude (fromField', CmdM')
+import Gargantext.Database.Prelude (fromField', CmdM', HasConnectionPool, HasConfig)
 import qualified Gargantext.Database.Query.Table.Ngrams as TableNgrams
 
 ------------------------------------------------------------------------
@@ -706,8 +706,10 @@ instance HasRepoSaver RepoEnv where
   repoSaver = renv_saver
 
 type RepoCmdM   env err m =
-  ( CmdM' env err m
-  , HasRepo     env
+  ( CmdM'             env err m
+  , HasRepo           env
+  , HasConnectionPool env
+  , HasConfig         env
   )
 
 

src/Gargantext/Core/Text/List.hs

@@ -133,7 +133,7 @@ buildNgramsTermsList :: ( HasNodeError err
                         -> GroupParams
                         -> (NgramsType, MapListSize)
                         -> m (Map NgramsType [NgramsElement])
-buildNgramsTermsList user uCid mCid groupParams (nt, mapListSize)= do
+buildNgramsTermsList user uCid mCid groupParams (nt, _mapListSize)= do
 
 -- | Filter 0 With Double
 

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

@@ -18,22 +18,17 @@ Portability : POSIX
 module Gargantext.Core.Text.List.Group
   where
 
-import Control.Lens (set, view, over)
-import Data.Set (Set)
+import Control.Lens (view)
 import Data.Map (Map)
 import Data.Maybe (fromMaybe)
 import Data.Monoid (Monoid, mempty)
 import Data.Text (Text)
-import Gargantext.Core.Types (ListType(..))
-import Gargantext.Database.Admin.Types.Node (NodeId)
 import Gargantext.Core.Text.List.Social.Prelude
 import Gargantext.Core.Text.List.Group.Prelude
 import Gargantext.Core.Text.List.Group.WithStem
 import Gargantext.Core.Text.List.Group.WithScores
 import Gargantext.Prelude
-import qualified Data.Set  as Set
 import qualified Data.Map  as Map
-import qualified Data.List as List
 
 ------------------------------------------------------------------------
 -- | TODO add group with stemming
@@ -60,7 +55,7 @@ setScoresWithMap :: (Ord a, Ord b, Monoid b) => Map Text b
                  -> Map Text (GroupedTreeScores b)
 setScoresWithMap m = setScoresWith (score m)
   where
-    score m t = case Map.lookup t m of
+    score m' t = case Map.lookup t m' of
       Nothing -> mempty
       Just  r -> r
 

src/Gargantext/Core/Text/List/Group/Prelude.hs

@@ -25,7 +25,7 @@ import Data.Maybe (fromMaybe)
 import Data.Map (Map)
 import Gargantext.Core.Types (ListType(..))
 import Gargantext.Database.Admin.Types.Node (NodeId)
-import Gargantext.Core.Text.Metrics (scored', Scored(..), scored_speExc, scored_genInc, normalizeGlobal, normalizeLocal)
+import Gargantext.Core.Text.Metrics (Scored(..), scored_genInc)
 import Gargantext.API.Ngrams.Types (NgramsElement, mkNgramsElement, NgramsTerm(..), RootParent(..), mSetFromList)
 import Gargantext.Prelude
 import qualified Data.Set  as Set

src/Gargantext/Core/Text/List/Group/WithScores.hs

@@ -15,20 +15,16 @@ Portability : POSIX
 module Gargantext.Core.Text.List.Group.WithScores
   where
 
-import Control.Lens (makeLenses, view, set, over)
+import Control.Lens (view, set, over)
 import Data.Semigroup
-import Data.Set (Set)
 import Data.Map (Map)
 import Data.Monoid (Monoid, mempty)
-import Data.Maybe (catMaybes, fromMaybe)
+import Data.Maybe (fromMaybe)
 import Data.Text (Text)
-import Gargantext.Core.Types (ListType(..))
-import Gargantext.Database.Admin.Types.Node (NodeId)
 import Gargantext.Core.Text.List.Social.Prelude
 import Gargantext.Core.Text.List.Group.Prelude
 import Gargantext.Prelude
 import qualified Data.Map  as Map
-import qualified Data.Set  as Set
 
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------

src/Gargantext/Core/Text/List/Group/WithStem.hs

@@ -17,20 +17,17 @@ Portability : POSIX
 module Gargantext.Core.Text.List.Group.WithStem
   where
 
-import Control.Lens (makeLenses, view, over)
+import Control.Lens (view, over)
 import Data.Set (Set)
 import Data.Map (Map)
 import Data.Monoid (mempty)
 import Data.Text (Text)
 import Gargantext.Core (Lang(..))
-import Gargantext.Core.Text (size)
 import Gargantext.Database.Admin.Types.Node (NodeId)
-import Gargantext.Core.Text.List.Group.WithScores
 import Gargantext.Core.Text.List.Group.Prelude
 import Gargantext.Core.Text.List.Social.Prelude
 import Gargantext.Core.Text.Terms.Mono.Stem (stem)
 import Gargantext.Prelude
-import qualified Data.Set  as Set
 import qualified Data.Map  as Map
 import qualified Data.List as List
 import qualified Data.Text as Text

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

@@ -11,27 +11,20 @@ Portability : POSIX
 module Gargantext.Core.Text.List.Social
   where
 
-import Data.Map (Map)
-import Data.Maybe (fromMaybe)
 import Data.Monoid (mconcat)
-import Data.Set (Set)
 import Data.Text (Text)
 import Gargantext.API.Ngrams.Tools -- (getListNgrams)
 import Gargantext.API.Ngrams.Types
 import Gargantext.Core.Text.List.Social.Find
-import Gargantext.Core.Text.List.Social.ListType
 import Gargantext.Core.Text.List.Social.Prelude
 import Gargantext.Core.Text.List.Social.Scores
 import Gargantext.Core.Types.Individu
-import Gargantext.Core.Types.Main
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude
 import Gargantext.Database.Query.Table.Node.Error
 import Gargantext.Database.Query.Tree
 import Gargantext.Database.Schema.Ngrams
 import Gargantext.Prelude
-import qualified Data.Map   as Map
-import qualified Data.Set   as Set
 
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------

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

@@ -22,14 +22,11 @@ import Control.Lens
 import Data.Semigroup (Semigroup(..))
 import Data.Monoid
 import Data.Map (Map)
-import Data.Maybe (fromMaybe)
-import Data.Set (Set)
 import Data.Text (Text)
 import Gargantext.Core.Types.Main
 import Gargantext.Prelude
 import GHC.Generics (Generic)
 import qualified Data.Map   as Map
-import qualified Data.Set   as Set
 
 ------------------------------------------------------------------------
 type Parent = Text

src/Gargantext/Core/Text/Metrics.hs

@@ -20,7 +20,7 @@ module Gargantext.Core.Text.Metrics
 --import Math.KMeans (kmeans, euclidSq, elements)
 import Control.Lens (makeLenses)
 import Data.Map (Map)
-import Data.Semigroup (Semigroup, (<>))
+import Data.Semigroup (Semigroup)
 import Data.Monoid (Monoid, mempty)
 import Gargantext.Prelude
 import Gargantext.Core.Methods.Distances.Accelerate.SpeGen

src/Gargantext/Prelude.hs

@@ -10,6 +10,7 @@ Portability : POSIX
 -}
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -fno-warn-orphans        #-}
 {-# OPTIONS_GHC -fno-warn-type-defaults  #-}
 
 module Gargantext.Prelude