Renamed `IsCmdM` -> `IsDBCmdExtra`

src/Gargantext/API/Node/New.hs

@@ -31,7 +31,7 @@ import Gargantext.Core.NLP (HasNLPServer)
 import Gargantext.Core.Worker.Jobs.Types qualified as Jobs
 import Gargantext.Database.Action.Node (mkNodeWithParent)
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude (CmdM, DBCmd')
+import Gargantext.Database.Prelude (IsDBCmdExtra, DBCmd')
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Prelude
 import Servant.Server.Generic (AsServerT)
@@ -73,7 +73,7 @@ postNodeAsyncAPI authenticatedUser nId =
 --           -> PostNode
 --           -> m [NodeId]
 -- postNode' authenticatedUser pId (PostNode nodeName nt) = do
-postNode' :: ( CmdM env err m
+postNode' :: ( IsDBCmdExtra env err m
              , HasNodeError err
              , HasMail env
              , CE.HasCentralExchangeNotification env)

src/Gargantext/API/Prelude.hs

@@ -27,7 +27,7 @@ import Gargantext.Core.Mail.Types (HasMail)
 import Gargantext.Core.NLP (HasNLPServer)
 import Gargantext.Core.NodeStory (HasNodeStory, HasNodeStoryEnv)
 import Gargantext.Core.Types (HasValidationError)
-import Gargantext.Database.Prelude (CmdM, CmdRandom, HasConnectionPool)
+import Gargantext.Database.Prelude (IsDBCmdExtra, CmdRandom, HasConnectionPool)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Database.Query.Tree (HasTreeError)
 import Gargantext.Prelude
@@ -84,9 +84,9 @@ type GargNoServer t =
   forall env err m. GargNoServer' env err m => m t
 
 type GargNoServer' env err m =
-  ( CmdM           env err m
-  , HasNodeStory   env err m
-  , HasNodeError       err
+  ( IsDBCmdExtra env err m
+  , HasNodeStory env err m
+  , HasNodeError     err
   )
 
 ------------------------------------------------------------------------

src/Gargantext/API/Table.hs

@@ -41,7 +41,7 @@ import Gargantext.Core.Types.Query (Offset, Limit)
 import Gargantext.Database.Action.Learn (FavOrTrash(..), moreLike)
 import Gargantext.Database.Action.Search (searchCountInCorpus, searchInCorpus)
 import Gargantext.Database.Admin.Types.Node (ContactId, CorpusId, NodeId)
-import Gargantext.Database.Prelude (CmdM, IsDBCmd, DBCmd)
+import Gargantext.Database.Prelude (IsDBCmdExtra, IsDBCmd, DBCmd)
 import Gargantext.Database.Query.Facet (FacetDoc , runViewDocuments, runCountDocuments, OrderBy(..), runViewAuthorsDoc)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Prelude
@@ -56,7 +56,7 @@ tableApi id' = Named.TableAPI
   }
 
 
-getTableApi :: (CmdM env err m, HasNodeError err, MonadLogger m)
+getTableApi :: (IsDBCmdExtra env err m, HasNodeError err, MonadLogger m)
             => NodeId
             -> Maybe TabType
             -> Maybe Limit
@@ -84,7 +84,7 @@ getTableApi cId tabType mLimit mOffset mOrderBy mQuery mYear =
       t <- getTable cId tabType mOffset mLimit mOrderBy mQuery mYear
       pure $ constructHashedResponse t
 
-postTableApi :: (CmdM env err m, MonadLogger m, HasNodeError err)
+postTableApi :: (IsDBCmdExtra env err m, MonadLogger m, HasNodeError err)
              => NodeId
              -> TableQuery
              -> m FacetTableResult
@@ -99,7 +99,7 @@ postTableApi cId tq = case tq of
    Trash -> searchInCorpus' cId True  q (Just o) (Just l) (Just order)
    x     -> panicTrace $ "not implemented in tableApi " <> (show x)
 
-getTableHashApi :: (CmdM env err m, HasNodeError err, MonadLogger m)
+getTableHashApi :: (IsDBCmdExtra env err m, HasNodeError err, MonadLogger m)
                 => NodeId
                 -> Maybe TabType
                 -> m Text

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

@@ -30,7 +30,7 @@ import Gargantext.Core.Types (HasValidationError, TermsCount)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
 import Gargantext.Database.Admin.Types.Hyperdata.Document ( HyperdataDocument )
 import Gargantext.Database.Admin.Types.Node (NodeId)
-import Gargantext.Database.Prelude (CmdM)
+import Gargantext.Database.Prelude (IsDBCmdExtra)
 import Gargantext.Database.Query.Table.Node.Document.Insert ( UniqParameters, InsertDb, ToNode, AddUniqId )
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Tree.Error (HasTreeError)
@@ -40,12 +40,12 @@ import Gargantext.System.Logging ( MonadLogger )
 
 
 type FlowCmdM env err m =
-  ( CmdM     env err m
-  , HasNodeStory env err m
-  , HasNodeError err
+  ( IsDBCmdExtra   env err m
+  , HasNodeStory   env err m
+  , HasNodeError       err
   , HasValidationError err
-  , HasTreeError err
-  , MonadLogger m
+  , HasTreeError       err
+  , MonadLogger            m
   )
 
 type FlowCorpus a = ( UniqParameters a

src/Gargantext/Database/Action/Mail.hs

@@ -20,7 +20,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 (CmdM)
+import Gargantext.Database.Prelude (IsDBCmdExtra)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Database.Schema.User
 import Gargantext.Prelude
@@ -28,7 +28,8 @@ import Gargantext.System.Logging (MonadLogger, LogLevel(..), logLocM)
 
 ------------------------------------------------------------------------
 
-sendMail :: (HasNodeError err, CmdM env err m, MonadLogger m) => User -> m ()
+sendMail :: (HasNodeError err, IsDBCmdExtra env err m, MonadLogger m)
+         => User -> m ()
 sendMail u = do
   cfg       <- view $ mailSettings
   userLight <- getUserLightDB u

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

@@ -34,7 +34,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 (Cmd, DBCmd, CmdM, DBCmd')
+import Gargantext.Database.Prelude (Cmd, DBCmd, IsDBCmdExtra, DBCmd')
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..), nodeError, NodeError(..))
 import Gargantext.Database.Query.Table.User
 import Gargantext.Prelude
@@ -45,7 +45,7 @@ import qualified Data.List.NonEmpty as NE
 ------------------------------------------------------------------------
 -- | Creates a new 'User' from the input 'EmailAddress', which needs to
 -- be valid (i.e. a valid username needs to be inferred via 'guessUsername').
-newUser :: (CmdM env err m, MonadRandom m, HasNodeError err, HasMail env)
+newUser :: (IsDBCmdExtra env err m, MonadRandom m, HasNodeError err, HasMail env)
         => EmailAddress
         -> m UserId
 newUser emailAddress = do
@@ -82,7 +82,7 @@ new_users us = do
   mapM (fmap fst . getOrMkRoot) $ NE.map  (\u -> UserName   (_nu_username u)) us
 
 ------------------------------------------------------------------------
-newUsers :: (CmdM env err m, MonadRandom m, HasNodeError err, HasMail env)
+newUsers :: (IsDBCmdExtra env err m, MonadRandom m, HasNodeError err, HasMail env)
          => NonEmpty EmailAddress
          -> m (NonEmpty UserId)
 newUsers us = do
@@ -129,7 +129,7 @@ updateUser (SendEmail send) cfg u = do
   pure n
 
 ------------------------------------------------------------------------
-_updateUsersPassword :: (CmdM env err m, MonadRandom m, HasNodeError err, HasMail env)
+_updateUsersPassword :: (IsDBCmdExtra env err m, MonadRandom m, HasNodeError err, HasMail env)
          => [EmailAddress] -> m Int64
 _updateUsersPassword us = do
   us' <- mapM (\ea -> mkNewUser ea . GargPassword <$> gargPass) us

src/Gargantext/Database/Prelude.hs

@@ -81,7 +81,7 @@ type IsDBEnvExtra env =
   , CET.HasCentralExchangeNotification env
   )
 
-type CmdM env err m =
+type IsDBCmdExtra env err m =
   ( IsCmd        env err m
   , IsDBEnvExtra env
   )
@@ -93,12 +93,12 @@ type CmdRandom env err m =
   , HasMail           env
   )
 
-type Cmd''  env err a = forall m.     CmdM''    env err m => m a
-type Cmd'   env err a = forall m.     IsCmd     env err m => m a
-type Cmd        err a = forall m env. CmdM      env err m => m a
-type CmdR       err a = forall m env. CmdRandom env err m => m a
-type DBCmd' env err a = forall m.     IsDBCmd   env err m => m a
-type DBCmd      err a = forall m env. IsDBCmd   env err m => m a
+type Cmd''  env err a = forall m.     CmdM''       env err m => m a
+type Cmd'   env err a = forall m.     IsCmd        env err m => m a
+type Cmd        err a = forall m env. IsDBCmdExtra env err m => m a
+type CmdR       err a = forall m env. CmdRandom    env err m => m a
+type DBCmd' env err a = forall m.     IsDBCmd      env err m => m a
+type DBCmd      err a = forall m env. IsDBCmd      env err m => m a
 
 -- | Only the /minimum/ amount of class constraints required
 -- to use the Gargantext Database. It's important, to ease testability,