[refactoring] yet more Cmd removals

src/Gargantext/API.hs

@@ -56,9 +56,9 @@ import Gargantext.API.Ngrams (saveNodeStoryImmediate)
 import Gargantext.API.Routes
 import Gargantext.API.Server (server)
 import Gargantext.Core.NodeStory
--- import Gargantext.Database.Prelude (Cmd)
--- import Gargantext.Database.Action.Metrics.NgramsByContext (refreshNgramsMaterialized)
+import Gargantext.Database.Prelude qualified as DB
 import Gargantext.Prelude hiding (putStrLn)
+import Gargantext.System.Logging
 import Network.HTTP.Types hiding (Query)
 import Network.Wai
 import Network.Wai.Handler.Warp hiding (defaultSettings)
@@ -66,10 +66,8 @@ import Network.Wai.Middleware.Cors
 import Network.Wai.Middleware.RequestLogger
 import Paths_gargantext (getDataDir)
 import Servant
+import System.Cron.Schedule qualified as Cron
 import System.FilePath
-import qualified Gargantext.Database.Prelude as DB
-import qualified System.Cron.Schedule as Cron
-import Gargantext.System.Logging
 
 -- | startGargantext takes as parameters port number and Ini file.
 startGargantext :: Mode -> PortNumber -> FilePath -> IO ()

src/Gargantext/API/Context.hs

@@ -25,7 +25,7 @@ import Gargantext.API.Admin.Auth (withAccess)
 import Gargantext.API.Admin.Auth.Types (PathId(..), AuthenticatedUser)
 import Gargantext.API.Prelude
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude -- (Cmd, CmdM)
+import Gargantext.Database.Prelude (JSONB)
 import Gargantext.Database.Query.Table.Context
 
 -------------------------------------------------------------------

src/Gargantext/API/Dev.hs

@@ -14,22 +14,22 @@ module Gargantext.API.Dev where
 
 import Control.Exception (finally)
 import Control.Monad (fail)
-import Control.Monad.Reader (runReaderT)
 import Control.Monad.Except (runExceptT)
+import Control.Monad.Reader (runReaderT)
 import Gargantext.API.Admin.EnvTypes
 import Gargantext.API.Admin.Settings
 import Gargantext.API.Ngrams (saveNodeStoryImmediate)
 import Gargantext.API.Prelude
 import Gargantext.Core.NLP (nlpServerMap)
 import Gargantext.Core.NodeStory
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (Cmd', Cmd'', databaseParameters, runCmd)
 import Gargantext.Prelude
 import Gargantext.Prelude.Config (readConfig)
-import qualified Gargantext.Prelude.Mail as Mail
-import qualified Gargantext.Prelude.NLP as NLP
+import Gargantext.Prelude.Mail qualified as Mail
+import Gargantext.Prelude.NLP qualified as NLP
+import Gargantext.System.Logging
 import Servant
 import System.IO (FilePath)
-import Gargantext.System.Logging
 
 type IniPath  = FilePath
 -------------------------------------------------------------------

src/Gargantext/API/GraphQL/Context.hs

@@ -211,8 +211,8 @@ toHyperdataRowDocumentGQL hyperdata =
                                      }
     HyperdataRowContact { } -> Nothing
 
-updateNodeContextCategory :: ( CmdCommon env, HasSettings env) =>
-                             NodeContextCategoryMArgs -> GqlM' e env [Int]
+updateNodeContextCategory :: (CmdCommon env, HasSettings env)
+                          => NodeContextCategoryMArgs -> GqlM' e env [Int]
 updateNodeContextCategory NodeContextCategoryMArgs { context_id, node_id, category } = do
   _ <- lift $ DNC.updateNodeContextCategory (NodeId context_id) (NodeId node_id) category
 

src/Gargantext/API/GraphQL/PolicyCheck.hs

@@ -8,7 +8,7 @@ import Gargantext.API.Admin.Auth.Types
 import Gargantext.API.Auth.PolicyCheck
 import Gargantext.API.GraphQL.Types
 import Gargantext.API.Prelude
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (HasConnectionPool, HasConfig)
 
 withPolicy :: (HasConnectionPool env, HasConfig env)
            => AuthenticatedUser

src/Gargantext/API/Metrics.hs

@@ -35,7 +35,7 @@ import Gargantext.Core.Viz.Types
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataList(..), hl_chart, hl_pie, hl_scatter, hl_tree)
 import Gargantext.Database.Admin.Types.Metrics (ChartMetrics(..), Metric(..), Metrics(..))
 import Gargantext.Database.Admin.Types.Node (NodeId)
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd)
 import Gargantext.Database.Query.Table.Node (defaultList, getNodeWith)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)

src/Gargantext/API/Ngrams/Tools.hs

@@ -25,7 +25,7 @@ import Data.Validity
 import Gargantext.API.Ngrams.Types
 import Gargantext.Core.NodeStory
 import Gargantext.Core.Types (ListType(..), NodeId, NodeType(..), ListId)
-import Gargantext.Database.Prelude (CmdM, HasConnectionPool(..))
+import Gargantext.Database.Prelude (HasConnectionPool(..))
 import Gargantext.Database.Schema.Ngrams (NgramsType)
 import Gargantext.Prelude
 import qualified Data.HashMap.Strict as HM
@@ -229,7 +229,7 @@ getCoocByNgrams'' (Diagonal diag) (f1,f2) (m1,m2) =
 ------------------------------------------
 
 
-migrateFromDirToDb :: (CmdM env err m) -- , HasNodeStory env err m)
+migrateFromDirToDb :: (HasNodeStory env err m) -- , HasNodeStory env err m)
                    => m ()
 migrateFromDirToDb = do
   pool <- view connPool

src/Gargantext/API/Node.hs

@@ -37,12 +37,19 @@ import GHC.Generics (Generic)
 import Gargantext.API.Admin.Auth (withAccess, withPolicy)
 import Gargantext.API.Admin.Auth.Types (PathId(..), AuthenticatedUser (..))
 import Gargantext.API.Admin.EnvTypes
+import Gargantext.API.Auth.PolicyCheck
 import Gargantext.API.Metrics
 import Gargantext.API.Ngrams (TableNgramsApi, apiNgramsTableCorpus)
 import Gargantext.API.Ngrams.Types (TabType(..))
+import Gargantext.API.Node.DocumentUpload qualified as DocumentUpload
+import Gargantext.API.Node.DocumentsFromWriteNodes qualified as DocumentsFromWriteNodes
 import Gargantext.API.Node.File
+import Gargantext.API.Node.FrameCalcUpload qualified as FrameCalcUpload
 import Gargantext.API.Node.New
+import Gargantext.API.Node.Share qualified as Share
+import Gargantext.API.Node.Update qualified as Update
 import Gargantext.API.Prelude
+import Gargantext.API.Search qualified as Search
 import Gargantext.API.Table
 import Gargantext.Core.Types (NodeTableResult)
 import Gargantext.Core.Types.Individu (User(..))
@@ -50,15 +57,17 @@ import Gargantext.Core.Types.Main (Tree, NodeTree)
 import Gargantext.Core.Types.Query (Limit, Offset)
 import Gargantext.Core.Utils.Prefix (unPrefix)
 import Gargantext.Core.Viz.Phylo.API (PhyloAPI, phyloAPI)
+import Gargantext.Database.Action.Delete qualified as Action (deleteNode)
 import Gargantext.Database.Action.Flow.Pairing (pairing)
 import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude -- (Cmd, CmdM)
+import Gargantext.Database.Prelude (Cmd, JSONB)
 import Gargantext.Database.Query.Facet (FacetDoc, OrderBy(..))
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.Children (getChildren)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Database.Query.Table.Node.Update (Update(..), update)
+import Gargantext.Database.Query.Table.Node.Update qualified as U (update, Update(..))
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Query.Table.NodeContext (nodeContextsCategory, nodeContextsScore)
 import Gargantext.Database.Query.Table.NodeNode
@@ -67,15 +76,6 @@ import Gargantext.Prelude
 import Servant
 import Test.QuickCheck (elements)
 import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
-import qualified Gargantext.API.Node.DocumentUpload as DocumentUpload
-import qualified Gargantext.API.Node.DocumentsFromWriteNodes as DocumentsFromWriteNodes
-import qualified Gargantext.API.Node.FrameCalcUpload as FrameCalcUpload
-import qualified Gargantext.API.Node.Share  as Share
-import qualified Gargantext.API.Node.Update as Update
-import qualified Gargantext.API.Search as Search
-import qualified Gargantext.Database.Action.Delete as Action (deleteNode)
-import qualified Gargantext.Database.Query.Table.Node.Update as U (update, Update(..))
-import Gargantext.API.Auth.PolicyCheck
 
 
 -- | Admin NodesAPI

src/Gargantext/API/Node/Corpus/New/File.hs

@@ -32,7 +32,7 @@ import Servant.Swagger.Internal
 import Gargantext.API.Node.Corpus.New.Types
 import Gargantext.Core.Types (TODO)
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude -- (Cmd, CmdM)
+import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Prelude
 import Gargantext.Prelude.Crypto.Hash (hash)
 

src/Gargantext/API/Node/Corpus/Update.hs

@@ -9,7 +9,7 @@ import Data.Proxy
 import Gargantext.Core
 import Gargantext.Database.Admin.Types.Hyperdata.Corpus
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DbCmd')
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.Error
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)

src/Gargantext/API/Node/New.hs

@@ -36,7 +36,7 @@ import Gargantext.API.Prelude
 import Gargantext.Database.Action.Flow.Types
 import Gargantext.Database.Action.Node
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Database.Query.Table.Node.User
 import Gargantext.Database.Schema.Node

src/Gargantext/API/Node/Share.hs

@@ -27,7 +27,7 @@ import Gargantext.Database.Action.Share as DB (shareNodeWith, unPublish)
 import Gargantext.Database.Action.User
 import Gargantext.Database.Action.User.New
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (CmdRandom)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Database.Query.Tree (findNodesWithType)
 import Gargantext.Prelude

src/Gargantext/API/Prelude.hs

@@ -25,31 +25,31 @@ import Control.Exception (Exception)
 import Control.Lens (Prism', (#))
 import Control.Lens.TH (makePrisms)
 import Control.Monad (mapM_)
+import Control.Monad.Error.Class (MonadError(..))
 import Control.Monad.Except (ExceptT)
 import Control.Monad.Reader (ReaderT)
-import Control.Monad.Error.Class (MonadError(..))
 import Crypto.JOSE.Error as Jose
 import Data.Aeson.Types
-import qualified Data.Text as Text
 import Data.Typeable
 import Data.Validity
 import Gargantext.API.Admin.Orchestrator.Types
 import Gargantext.API.Admin.Types
+import Gargantext.Core.Mail.Types (HasMail)
 import Gargantext.Core.NLP (HasNLPServer)
 import Gargantext.Core.NodeStory
-import Gargantext.Core.Mail.Types (HasMail)
 import Gargantext.Core.Types
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (CmdM, CmdRandom, HasConnectionPool, HasConfig)
 import Gargantext.Database.Query.Table.Node.Error (NodeError(..), HasNodeError(..))
 import Gargantext.Database.Query.Tree
 import Gargantext.Prelude
-import           Gargantext.Utils.Jobs.Monad (MonadJobStatus(..), JobHandle)
-import qualified Gargantext.Utils.Jobs.Monad as Jobs
+import Gargantext.System.Logging
+import Gargantext.Utils.Jobs.Monad (MonadJobStatus(..), JobHandle)
+import Gargantext.Utils.Jobs.Monad qualified as Jobs
 import Servant
 import Servant.Job.Async
 import Servant.Job.Core (HasServerError(..), serverError)
-import qualified Servant.Job.Types as SJ
-import Gargantext.System.Logging
+import Servant.Job.Types qualified as SJ
+import qualified Data.Text as Text
 
 class HasJoseError e where
   _JoseError :: Prism' e Jose.Error

src/Gargantext/API/Public.hs

@@ -34,7 +34,7 @@ import qualified Data.Set as Set
 import Gargantext.API.Prelude
 import Gargantext.API.Node.File
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (Cmd, DBCmd)
 import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Hyperdata.CorpusField
 import Gargantext.Database.Admin.Types.Node
@@ -79,7 +79,7 @@ api_node nId = do
 
 
 selectPublic :: HasNodeError err
-             => Cmd err [( Node HyperdataFolder, Maybe Int)]
+             => DBCmd err [( Node HyperdataFolder, Maybe Int)]
 selectPublic = selectPublicNodes
 
   -- For tests only

src/Gargantext/API/Table.hs

@@ -47,7 +47,7 @@ import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
 import Gargantext.Database.Action.Learn (FavOrTrash(..), moreLike)
 import Gargantext.Database.Action.Search
 import Gargantext.Database.Admin.Types.Node hiding (ERROR, DEBUG)
-import Gargantext.Database.Prelude -- (Cmd, CmdM)
+import Gargantext.Database.Prelude (CmdM, DbCmd', DBCmd)
 import Gargantext.Database.Query.Facet (FacetDoc , runViewDocuments, runCountDocuments, OrderBy(..), runViewAuthorsDoc)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Prelude
@@ -184,7 +184,7 @@ getTable :: HasNodeError err
          -> Maybe OrderBy
          -> Maybe RawQuery
          -> Maybe Text
-         -> Cmd err FacetTableResult
+         -> DBCmd err FacetTableResult
 getTable cId ft o l order raw_query year = do
   docs      <- getTable' cId ft o l order query year
   docsCount <- runCountDocuments cId (ft == Just Trash) query year

src/Gargantext/Core/Mail.hs

@@ -14,16 +14,16 @@ module Gargantext.Core.Mail where
 import Control.Lens (view)
 import Control.Monad.Reader (MonadReader)
 import Control.Monad.Trans.Control (MonadBaseControl)
-import Network.URI.Encode (encodeText)
+import Data.List qualified as List
 import Data.Text (Text, unlines, splitOn)
 import Gargantext.Core.Types.Individu
+import Gargantext.Database.Prelude (HasConfig(..))
 import Gargantext.Database.Schema.User (UserLight(..))
 import Gargantext.Prelude
 import Gargantext.Prelude.Config (gc_url, gc_backend_name)
-import Gargantext.Database.Prelude
 import Gargantext.Prelude.Mail (gargMail, GargMail(..))
 import Gargantext.Prelude.Mail.Types (MailConfig)
-import qualified Data.List as List
+import Network.URI.Encode (encodeText)
 
 
 -- | Tool to put elsewhere

src/Gargantext/Core/NodeStoryFile.hs

@@ -23,7 +23,7 @@ import Control.Concurrent (MVar(), modifyMVar_, newMVar, readMVar, withMVar)
 import Control.Debounce (mkDebounce, defaultDebounceSettings, debounceFreq, debounceAction)
 import Gargantext.Core.NodeStory hiding (readNodeStoryEnv)
 import Gargantext.Core.Types (ListId, NodeId(..))
-import Gargantext.Database.Prelude (CmdM, hasConfig)
+import Gargantext.Database.Prelude (hasConfig)
 import Gargantext.Prelude
 import Gargantext.Prelude.Config (gc_repofilepath)
 import System.Directory (renameFile, createDirectoryIfMissing, doesFileExist, removeFile)
@@ -46,7 +46,7 @@ getRepo listIds = do
   -- v' <- liftBase $ readMVar v
   -- pure $ v'
 
-getRepoReadConfig :: (CmdM env err m)
+getRepoReadConfig :: (HasNodeStory env err m)
              => [ListId] -> m NodeListStory
 getRepoReadConfig listIds = do
   repoFP <- view $ hasConfig . gc_repofilepath

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

@@ -17,10 +17,14 @@ import Control.Lens (view)
 import Control.Monad (mzero)
 import Data.Aeson
 import Data.HashMap.Strict (HashMap)
+import Data.List qualified as List
 import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
 import Data.Monoid (mconcat)
 import Data.Pool
 import Data.Swagger
+import Data.Text qualified as T
+import Data.Vector qualified as V
 import GHC.Generics
 import Gargantext.API.Ngrams.Types (NgramsTerm, NgramsPatch)
 import Gargantext.Core.NodeStory (getNodesArchiveHistory)
@@ -29,17 +33,13 @@ import Gargantext.Core.Text.List.Social.Patch (addScorePatches)
 import Gargantext.Core.Text.List.Social.Prelude (FlowCont, FlowListScores)
 import Gargantext.Core.Types.Individu (User)
 import Gargantext.Database.Admin.Types.Node (ListId, NodeId(..))
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, connPool)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Tree (NodeMode(Private), HasTreeError)
 import Gargantext.Database.Schema.Ngrams (NgramsType)
 import Gargantext.Prelude
 import Test.QuickCheck
 import Web.Internal.HttpApiData (ToHttpApiData, FromHttpApiData, parseUrlPiece, toUrlPiece)
-import qualified Data.List       as List
-import qualified Data.Map.Strict as Map
-import qualified Data.Text       as T
-import qualified Data.Vector     as V
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
 -- | Main parameters

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

@@ -17,7 +17,7 @@ import Control.Lens (view)
 import Gargantext.Core.Types.Individu
 import Gargantext.Database.Admin.Config
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd)
 import Gargantext.Database.Query.Table.Node.Error
 import Gargantext.Database.Query.Tree
 import Gargantext.Database.Query.Tree.Root (getRootId)

src/Gargantext/Core/Viz/Chart.hs

@@ -25,7 +25,7 @@ import Gargantext.Core.NodeStory (HasNodeStory)
 import Gargantext.Core.Text.Metrics.Count (occurrencesWith)
 import Gargantext.Core.Types.Main
 import Gargantext.Database.Admin.Config
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd)
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.Select
 import Gargantext.Database.Query.Table.NodeContext (selectDocsDates)

src/Gargantext/Database.hs

@@ -26,7 +26,7 @@ module Gargantext.Database ( module Gargantext.Database.Prelude
     where
 
 import Gargantext.Prelude
-import Gargantext.Database.Prelude -- (connectGargandb)
+import Gargantext.Database.Prelude (DBCmd) -- (connectGargandb)
 
 -- import Gargantext.Database.Schema.Node
 -- import Gargantext.Database.Query.Table.Node
@@ -40,7 +40,7 @@ class InsertDB a where
 
 {-
 class DeleteDB a where
-  deleteDB :: a -> Cmd err Int
+  deleteDB :: a -> DBCmd err Int
 -}
 
 instance InsertDB [NodeNode] where

src/Gargantext/Database/Action/Flow.hs

@@ -103,7 +103,7 @@ import Gargantext.Database.Action.Search (searchDocInDatabase)
 import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
 import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node hiding (DEBUG) -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DbCmd', DBCmd)
 import Gargantext.Database.Query.Table.ContextNodeNgrams2
 import Gargantext.Database.Query.Table.Ngrams
 import Gargantext.Database.Query.Table.Node

src/Gargantext/Database/Action/Flow/Pairing.hs

@@ -16,13 +16,18 @@ module Gargantext.Database.Action.Flow.Pairing
   -- (pairing)
     where
 
-import Debug.Trace (trace)
 import Control.Lens (_Just, (^.), view)
-import Data.Hashable (Hashable)
 import Data.HashMap.Strict (HashMap)
+import Data.HashMap.Strict qualified as HM
+import Data.HashMap.Strict qualified as HashMap
+import Data.Hashable (Hashable)
+import Data.List qualified as List
 import Data.Maybe (fromMaybe, catMaybes)
 import Data.Set (Set)
+import Data.Set qualified as Set
 import Data.Text (Text)
+import Data.Text qualified as Text
+import Debug.Trace (trace)
 import Gargantext.API.Ngrams.Tools
 import Gargantext.API.Ngrams.Types (NgramsTerm(..))
 import Gargantext.Core
@@ -42,16 +47,11 @@ import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Table.Node.Select (selectNodesWithUsername)
 import Gargantext.Database.Query.Table.NodeContext_NodeContext (insertNodeContext_NodeContext)
 import Gargantext.Database.Query.Table.NodeNode (insertNodeNode)
+import Gargantext.Database.Prelude (Cmd, runOpaQuery)
 import Gargantext.Database.Schema.Ngrams -- (NgramsType(..))
 import Gargantext.Database.Schema.Node
--- import Gargantext.Database.Schema.Context
-import qualified Data.HashMap.Strict as HM
 import Gargantext.Prelude hiding (sum)
 import Opaleye
-import qualified Data.HashMap.Strict as HashMap
-import qualified Data.List           as List
-import qualified Data.Set            as Set
-import qualified Data.Text           as Text
 
 -- | isPairedWith
 -- All NodeAnnuaire paired with a Corpus of NodeId nId:

src/Gargantext/Database/Action/Mail.hs

@@ -18,7 +18,7 @@ import Gargantext.Core.Mail (mail, MailModel(..))
 import Gargantext.Core.Mail.Types (mailSettings)
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Action.User
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (CmdM)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Database.Schema.User
 import Gargantext.Prelude

src/Gargantext/Database/Action/Node.hs

@@ -30,7 +30,7 @@ import Gargantext.Database.Query.Table.Node.Error
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Prelude
 import Gargantext.Prelude.Crypto.Hash (hash)
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, HasConfig(..))
 import Control.Lens (view)
 import Gargantext.Prelude.Config (GargConfig(..))
 

src/Gargantext/Database/Action/Share.hs

@@ -25,17 +25,17 @@ import Gargantext.Database.Action.User (getUserId)
 import Gargantext.Database.Admin.Config (hasNodeType, isInNodeTypes)
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataAny(..))
 import Gargantext.Database.Admin.Types.Node
--- import Gargantext.Database.Query.Join (leftJoin3')
 import Gargantext.Database.Query.Table.Node (getNode, getNodesWith)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError, errorWith)
 import Gargantext.Database.Query.Table.NodeNode (deleteNodeNode, queryNodeNodeTable)
 import Gargantext.Database.Query.Table.User
 import Gargantext.Database.Query.Tree.Root (getRootId)
+import Gargantext.Database.Prelude (Cmd, runOpaQuery)
 import Gargantext.Database.Schema.Node
 import Gargantext.Prelude
 import Gargantext.Utils.Tuple (uncurryMaybe)
 import Opaleye hiding (not)
-import qualified Opaleye as O
+import Opaleye qualified as O
 
 -- | TODO move in PhyloConfig of Gargantext
 publicNodeTypes :: [NodeType]

src/Gargantext/Database/Action/TSQuery.hs

+{-|
+Module      : Gargantext.Database.Action.TSQuery
+Description :
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+Here is a longer description of this module, containing some
+commentary with @some markup@.
+-}
+
 module Gargantext.Database.Action.TSQuery where
 
 import Data.Aeson
@@ -8,11 +21,11 @@ import Data.Text (Text, words)
 import Database.PostgreSQL.Simple (Query)
 import Database.PostgreSQL.Simple.ToField
 import Gargantext.Core
+import Gargantext.Core.Text.Terms.Mono.Stem.En (stemIt)
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset)
-import Gargantext.Database.Prelude (Cmd, runPGSQuery)
+import Gargantext.Database.Prelude (DBCmd, runPGSQuery)
 import Gargantext.Prelude
-import Gargantext.Core.Text.Terms.Mono.Stem.En (stemIt)
 
 
 newtype TSQuery = UnsafeTSQuery [Text]
@@ -71,7 +84,7 @@ textSearchQuery = "SELECT n.id, n.hyperdata->'publication_year'     \
 textSearch :: HasDBid NodeType
            => TSQuery -> ParentId
            -> Limit -> Offset -> Order
-           -> Cmd err [(Int,Value,Value,Value, Value, Maybe Int)]
+           -> DBCmd err [(Int,Value,Value,Value, Value, Maybe Int)]
 textSearch q p l o ord = runPGSQuery textSearchQuery (q,p,p,typeId,ord,o,l)
   where
     typeId = toDBid NodeDocument

src/Gargantext/Database/Action/User/New.hs

@@ -29,7 +29,7 @@ import Gargantext.Core.Mail.Types (HasMail, mailSettings)
 import Gargantext.Core.Types.Individu
 import Gargantext.Database.Action.Flow (getOrMkRoot)
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (Cmd, DBCmd, CmdM)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..), nodeError, NodeError(..))
 import Gargantext.Database.Query.Table.User
 import Gargantext.Prelude

src/Gargantext/Database/Query/Facet.hs

@@ -43,7 +43,7 @@ import Data.Text qualified as T
 import Gargantext.Core
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset, IsTrash)
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, runCountOpaQuery, runOpaQuery)
 import Gargantext.Database.Query.Facet.Types
 import Gargantext.Database.Query.Filter
 import Gargantext.Database.Query.Table.Context

src/Gargantext/Database/Query/Table/Context.hs

@@ -25,7 +25,7 @@ import Gargantext.Core
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset)
 import Gargantext.Database.Admin.Types.Hyperdata
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, JSONB, runOpaQuery)
 import Gargantext.Database.Query.Filter (limit', offset')
 import Gargantext.Database.Query.Table.Node.Error
 import Gargantext.Database.Schema.Context
@@ -35,7 +35,7 @@ import Prelude            hiding (null, id, map, sum)
 
 
 getContextWith :: (HasNodeError err, JSONB a)
-            => ContextId -> proxy a -> Cmd err (Node a)
+            => ContextId -> proxy a -> DBCmd err (Node a)
 getContextWith nId _ = do
   maybeContext <- headMay <$> runOpaQuery (selectContext (pgNodeId nId))
   case maybeContext of
@@ -51,7 +51,7 @@ selectContext id' = proc () -> do
     restrict -< _context_id row .== id'
     returnA  -< row
 
-runGetContexts :: Select ContextRead -> Cmd err [Context HyperdataAny]
+runGetContexts :: Select ContextRead -> DBCmd err [Context HyperdataAny]
 runGetContexts = runOpaQuery
 
 ------------------------------------------------------------------------
@@ -84,11 +84,11 @@ selectContextsWith' parentId maybeContextType = proc () -> do
 
 
 ------------------------------------------------------------------------
-getDocumentsV3WithParentId :: HasDBid NodeType => NodeId -> Cmd err [Context HyperdataDocumentV3]
+getDocumentsV3WithParentId :: HasDBid NodeType => NodeId -> DBCmd err [Context HyperdataDocumentV3]
 getDocumentsV3WithParentId n = runOpaQuery $ selectContextsWith' n (Just NodeDocument)
 
 -- TODO: merge with getDocumentsWithParentId by having a class IsHyperdataDocument
-getDocumentsWithParentId :: HasDBid NodeType => NodeId -> Cmd err [Context HyperdataDocument]
+getDocumentsWithParentId :: HasDBid NodeType => NodeId -> DBCmd err [Context HyperdataDocument]
 getDocumentsWithParentId n = runOpaQuery $ selectContextsWith' n (Just NodeDocument)
 
 ------------------------------------------------------------------------
@@ -102,7 +102,8 @@ selectContextsWithParentID n = proc () -> do
 ------------------------------------------------------------------------
 -- | Example of use:
 -- runCmdReplEasy  (getNodesWithType NodeList (Proxy :: Proxy HyperdataList))
-getContextsWithType :: (HasNodeError err, JSONB a, HasDBid NodeType) => NodeType -> proxy a -> Cmd err [Context a]
+getContextsWithType :: (HasNodeError err, JSONB a, HasDBid NodeType)
+                    => NodeType -> proxy a -> DBCmd err [Context a]
 getContextsWithType nt _ = runOpaQuery $ selectContextsWithType nt
   where
     selectContextsWithType ::  HasDBid NodeType
@@ -112,7 +113,8 @@ getContextsWithType nt _ = runOpaQuery $ selectContextsWithType nt
         restrict -< tn .== (sqlInt4 $ toDBid nt')
         returnA -< row
 
-getContextsIdWithType :: (HasNodeError err, HasDBid NodeType) => NodeType -> Cmd err [ContextId]
+getContextsIdWithType :: (HasNodeError err, HasDBid NodeType)
+                      => NodeType -> DBCmd err [ContextId]
 getContextsIdWithType nt = do
   ns <- runOpaQuery $ selectContextsIdWithType nt
   pure (map NodeId ns)

src/Gargantext/Database/Query/Table/Node.hs

@@ -32,7 +32,7 @@ import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset)
 import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Hyperdata.Default
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, JSONB, mkCmd, runPGSQuery, runOpaQuery)
 import Gargantext.Database.Query.Filter (limit', offset')
 import Gargantext.Database.Query.Table.Node.Error
 import Gargantext.Database.Schema.Node

src/Gargantext/Database/Query/Table/Node/Children.hs

@@ -22,15 +22,11 @@ import Gargantext.Core
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset)
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument, HyperdataContact)
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, JSONB, runCountOpaQuery, runOpaQuery)
 import Gargantext.Database.Query.Filter
-
-import Gargantext.Database.Schema.Node
-import Gargantext.Database.Schema.Context
-import Gargantext.Database.Schema.NodeContext
 import Gargantext.Database.Query.Table.NodeContext
-
-
+import Gargantext.Database.Schema.Context
+import Gargantext.Database.Schema.Node
 import Gargantext.Prelude
 import Opaleye
 

src/Gargantext/Database/Query/Table/Node/Select.hs

@@ -16,16 +16,14 @@ module Gargantext.Database.Query.Table.Node.Select
   where
 
 import Control.Arrow (returnA)
-import Opaleye
-import Protolude
-
 import Gargantext.Core
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Individu (Username)
-import Gargantext.Database.Prelude
-import Gargantext.Database.Schema.Node
-import Gargantext.Database.Schema.User
+import Gargantext.Database.Prelude (DBCmd, runOpaQuery)
 import Gargantext.Database.Query.Table.User
+import Gargantext.Database.Schema.Node
+import Opaleye
+import Protolude
 
 selectNodesWithUsername :: (HasDBid NodeType) => NodeType -> Username -> DBCmd err [NodeId]
 selectNodesWithUsername nt u = runOpaQuery $ proc () -> do

src/Gargantext/Database/Query/Table/NodeContext.hs

@@ -46,25 +46,23 @@ module Gargantext.Database.Query.Table.NodeContext
 import Control.Arrow (returnA)
 import Control.Lens (view, (^.))
 import Data.Maybe (catMaybes)
-import Data.Time (UTCTime)
 import Data.Text (Text, splitOn)
+import Data.Time (UTCTime)
+import Database.PostgreSQL.Simple qualified as PGS (In(..), Query, Only(..))
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Opaleye
-import qualified Database.PostgreSQL.Simple as PGS (In(..), Query, Only(..))
-import qualified Opaleye as O
-
 import Gargantext.Core
 import Gargantext.Core.Types
--- import Gargantext.Core.Types.Search (HyperdataRow(..), toHyperdataRow)
 import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Prelude (DBCmd, execPGSQuery, mkCmd, restrictMaybe, runCountOpaQuery, runPGSQuery, runOpaQuery)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError, NodeError(DoesNotExist), nodeError)
-import Gargantext.Database.Prelude
-import Gargantext.Prelude.Crypto.Hash (Hash)
 import Gargantext.Database.Schema.Context
 import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeContext
 import Gargantext.Prelude
+import Gargantext.Prelude.Crypto.Hash (Hash)
+import Opaleye
+import Opaleye qualified as O
 
 queryNodeContextTable :: Select NodeContextRead
 queryNodeContextTable = selectTable nodeContextTable

src/Gargantext/Database/Query/Table/NodeContext_NodeContext.hs

@@ -20,12 +20,12 @@ module Gargantext.Database.Query.Table.NodeContext_NodeContext
   where
 
 import Data.Text (Text)
+import Database.PostgreSQL.Simple qualified as PGS
 import Gargantext.Core.Types
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, runPGSQuery)
 import Gargantext.Database.Schema.NodeContext_NodeContext
 import Gargantext.Database.Schema.Prelude hiding (sum)
 import Gargantext.Prelude
-import qualified Database.PostgreSQL.Simple as PGS
 
 {-
 queryNodeContext_NodeContextTable :: Select NodeContext_NodeContextRead

src/Gargantext/Database/Query/Table/NodeNgrams.hs

@@ -26,20 +26,20 @@ module Gargantext.Database.Query.Table.NodeNgrams
   )
   where
 
+import Data.List qualified as List
 import Data.List.Extra (nubOrd)
 import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
 import Data.Maybe (fromMaybe)
 import Data.Text (Text)
+import Database.PostgreSQL.Simple qualified as PGS (Query, Only(..))
 import Gargantext.Core
 import Gargantext.Core.Types
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, runPGSQuery)
 import Gargantext.Database.Schema.Ngrams (NgramsType, ngramsTypeId, fromNgramsTypeId)
 import Gargantext.Database.Schema.NodeNgrams
 import Gargantext.Database.Schema.Prelude (Select, FromRow, sql, fromRow, toField, field, Values(..), QualifiedIdentifier(..), selectTable)
 import Gargantext.Prelude
-import qualified Data.List as List
-import qualified Data.Map.Strict as Map
-import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
 
 
 queryNodeNgramsTable :: Select NodeNgramsRead

src/Gargantext/Database/Query/Table/NodeNode.hs

@@ -35,20 +35,20 @@ module Gargantext.Database.Query.Table.NodeNode
 
 import Control.Arrow (returnA)
 import Control.Lens ((^.), view)
-import Data.Text (Text, splitOn)
 import Data.Maybe (catMaybes)
+import Data.Text (Text, splitOn)
+import Database.PostgreSQL.Simple qualified as PGS
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import Gargantext.Core
 import Gargantext.Core.Types
 import Gargantext.Database.Admin.Types.Hyperdata
-import Gargantext.Database.Prelude
+import Gargantext.Database.Prelude (DBCmd, mkCmd, runPGSQuery, runCountOpaQuery, runOpaQuery)
 import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeNode
 import Gargantext.Prelude
 import Opaleye
-import qualified Database.PostgreSQL.Simple as PGS
-import qualified Opaleye as O
+import Opaleye qualified as O
 
 queryNodeNodeTable :: Select NodeNodeRead
 queryNodeNodeTable = selectTable nodeNodeTable