Renamed `Cmd'` -> `Cmd`

bin/gargantext-cli/CLI/Admin.hs

@@ -21,7 +21,7 @@ import Prelude (String)
 adminCLI :: AdminArgs -> IO ()
 adminCLI (AdminArgs settingsPath mails) = do
   withDevEnv settingsPath $ \env -> do
-    x <- runCmdDev env ((newUsers $ NE.map cs (NE.fromList mails)) :: Cmd'' DevEnv BackendInternalError (NonEmpty UserId))
+    x <- runCmdDev env ((newUsers $ NE.map cs (NE.fromList mails)) :: CmdRandom DevEnv BackendInternalError (NonEmpty UserId))
     putStrLn (show x :: Text)
 
 adminCmd :: HasCallStack => Mod CommandFields CLI

src/Gargantext/API/Admin/Auth.hs

@@ -62,7 +62,7 @@ import Gargantext.Core.Types.Individu (User(..), Username, GargPassword(..))
 import Gargantext.Core.Worker.Jobs.Types qualified as Jobs
 import Gargantext.Database.Action.User.New (guessUserName)
 import Gargantext.Database.Admin.Types.Node (NodeId(..), UserId)
-import Gargantext.Database.Prelude (Cmd', IsDBEnvExtra, IsDBCmd)
+import Gargantext.Database.Prelude (Cmd, IsDBEnvExtra, IsDBCmd)
 import Gargantext.Database.Query.Table.User
 import Gargantext.Database.Query.Tree (isDescendantOf, isIn)
 import Gargantext.Database.Query.Tree.Root (getRoot)
@@ -81,7 +81,7 @@ import Servant.Server.Generic (AsServerT)
 makeTokenForUser :: (HasJWTSettings env, HasAuthenticationError err)
                  => NodeId
                  -> UserId
-                 -> Cmd' env err Token
+                 -> Cmd env err Token
 makeTokenForUser nodeId userId = do
   jwtS <- view jwtSettings
   e <- liftBase $ makeJWT (AuthenticatedUser nodeId userId) jwtS Nothing
@@ -236,12 +236,12 @@ forgotPassword = Named.ForgotPasswordAPI
   }
 
 forgotPasswordPost :: (IsDBEnvExtra env)
-     => ForgotPasswordRequest -> Cmd' env err ForgotPasswordResponse
+     => ForgotPasswordRequest -> Cmd env err ForgotPasswordResponse
 forgotPasswordPost (ForgotPasswordRequest _email) = do
   pure $ ForgotPasswordResponse "ok"
 
 forgotPasswordGet :: (IsDBEnvExtra env, HasServerError err)
-     => Maybe Text -> Cmd' env err ForgotPasswordGet
+     => Maybe Text -> Cmd env err ForgotPasswordGet
 forgotPasswordGet Nothing = pure $ ForgotPasswordGet ""
 forgotPasswordGet (Just uuid) = do
   let mUuid = fromText uuid
@@ -258,7 +258,7 @@ forgotPasswordGet (Just uuid) = do
 ---------------------
 
 forgotPasswordGetUser :: ( IsDBEnvExtra env)
-     => UserLight -> Cmd' env err ForgotPasswordGet
+     => UserLight -> Cmd env err ForgotPasswordGet
 forgotPasswordGetUser (UserLight { .. }) = do
   -- pick some random password
   password <- liftBase gargPass
@@ -277,7 +277,7 @@ forgotPasswordGetUser (UserLight { .. }) = do
   pure $ ForgotPasswordGet password
 
 forgotUserPassword :: (IsDBEnvExtra env)
-     => UserLight -> Cmd' env err ()
+     => UserLight -> Cmd env err ()
 forgotUserPassword (UserLight { .. }) = do
   --printDebug "[forgotUserPassword] userLight_id" userLight_id
   --logDebug $ "[forgotUserPassword]" :# ["userLight_id" .= userLight_id]
@@ -302,7 +302,7 @@ forgotUserPassword (UserLight { .. }) = do
 
 -- Generate a unique (in whole DB) UUID for passwords.
 generateForgotPasswordUUID :: (IsDBEnvExtra env)
-  => Cmd' env err UUID
+  => Cmd env err UUID
 generateForgotPasswordUUID = do
   uuid <- liftBase $ nextRandom
   us <- getUsersWithForgotPasswordUUID uuid

src/Gargantext/API/Dev.hs

@@ -23,7 +23,7 @@ import Gargantext.API.Prelude ( GargM )
 import Gargantext.Core.Config (_gc_database_config)
 import Gargantext.Core.Config.Types (SettingsFile(..))
 import Gargantext.Core.NodeStory (fromDBNodeStoryEnv)
-import Gargantext.Database.Prelude (Cmd', Cmd'', connPool, runCmd)
+import Gargantext.Database.Prelude (Cmd, CmdRandom, connPool, runCmd)
 import Gargantext.Prelude
 import Gargantext.Core.Config.Utils (readConfig)
 import Gargantext.System.Logging ( withLoggerHoisted )
@@ -52,17 +52,17 @@ defaultSettingsFile :: SettingsFile
 defaultSettingsFile = SettingsFile "gargantext-settings.toml"
 
 -- | Run Cmd Sugar for the Repl (GHCI)
-runCmdRepl :: Show err => Cmd'' DevEnv err a -> IO a
+runCmdRepl :: Show err => CmdRandom DevEnv err a -> IO a
 runCmdRepl f = withDevEnv defaultSettingsFile $ \env -> runCmdDev env f
 
-runCmdReplServantErr :: Cmd'' DevEnv ServerError a -> IO a
+runCmdReplServantErr :: CmdRandom DevEnv ServerError a -> IO a
 runCmdReplServantErr = runCmdRepl
 
 -- In particular this writes the repo file after running
 -- the command.
 -- This function is constrained to the DevEnv rather than
 -- using HasConnectionPool and HasRepoVar.
-runCmdDev :: Show err => DevEnv -> Cmd'' DevEnv err a -> IO a
+runCmdDev :: Show err => DevEnv -> CmdRandom DevEnv err a -> IO a
 runCmdDev env f =
   either (fail . show) pure =<< runCmd env f
 
@@ -70,13 +70,13 @@ runCmdGargDev :: DevEnv -> GargM DevEnv BackendInternalError a -> IO a
 runCmdGargDev env cmd =
   either (fail . show) pure =<< runExceptT (runReaderT cmd env)
 
-runCmdDevNoErr :: DevEnv -> Cmd' DevEnv () a -> IO a
+runCmdDevNoErr :: DevEnv -> Cmd DevEnv () a -> IO a
 runCmdDevNoErr = runCmdDev
 
-runCmdDevServantErr :: DevEnv -> Cmd' DevEnv ServerError a -> IO a
+runCmdDevServantErr :: DevEnv -> Cmd DevEnv ServerError a -> IO a
 runCmdDevServantErr = runCmdDev
 
-runCmdReplEasy :: Cmd'' DevEnv BackendInternalError a -> IO a
+runCmdReplEasy :: CmdRandom DevEnv BackendInternalError a -> IO a
 runCmdReplEasy f = withDevEnv defaultSettingsFile $ \env -> runCmdDev env f
 
 -- | Execute a function that takes PSQL.Connection from the DB pool as

src/Gargantext/API/GraphQL/Utils.hs

@@ -16,13 +16,13 @@ import Control.Lens (view)
 import Gargantext.API.Admin.Auth.Types (AuthenticatedUser (..), auth_node_id)
 import Gargantext.Core.Config (HasJWTSettings(..))
 import Gargantext.Database.Admin.Types.Node (NodeId)
-import Gargantext.Database.Prelude (Cmd')
+import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Prelude
 import Servant.Auth.Server (verifyJWT, JWTSettings)
 
 data AuthStatus = Valid | Invalid
 
-authUser :: (HasJWTSettings env) => NodeId -> Text -> Cmd' env err AuthStatus
+authUser :: (HasJWTSettings env) => NodeId -> Text -> Cmd env err AuthStatus
 authUser ui_id token = do
   let token' = encodeUtf8 token
   jwtS <- view jwtSettings

src/Gargantext/Core/Worker/Jobs.hs

@@ -20,14 +20,14 @@ import Gargantext.Core.Config.Worker (WorkerSettings(..), WorkerDefinition(..))
 import Gargantext.Core.Worker.Broker (initBrokerWithDBCreate)
 import Gargantext.Core.Worker.Jobs.Types (Job(..))
 import Gargantext.Core.Worker.PGMQTypes (HasWorkerBroker, MessageId, SendJob)
-import Gargantext.Database.Prelude (Cmd')
+import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Prelude
 import Gargantext.System.Logging (logMsg, withLogger, LogLevel(..))
 
 
 sendJob :: (HasWorkerBroker, HasConfig env)
         => Job
-        -> Cmd' env err MessageId
+        -> Cmd env err MessageId
 sendJob job = do
   gcConfig <- view $ hasConfig
   liftBase $ sendJobWithCfg gcConfig job

src/Gargantext/Database/Action/Delete.hs

@@ -27,7 +27,7 @@ import Gargantext.Database.Action.User (getUserId)
 import Gargantext.Database.Admin.Types.Hyperdata.File ( HyperdataFile(..) )
 import Gargantext.Database.Admin.Types.Node ( NodeId, NodeType(..) ) -- (NodeType(..))
 import Gargantext.Database.GargDB qualified as GargDB
-import Gargantext.Database.Prelude (Cmd', IsDBEnvExtra)
+import Gargantext.Database.Prelude (Cmd, IsDBEnvExtra)
 import Gargantext.Database.Query.Table.Node (getNodeWith)
 import Gargantext.Database.Query.Table.Node qualified as N (getNode, deleteNode)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
@@ -41,7 +41,7 @@ import Gargantext.Prelude
 deleteNode :: (IsDBEnvExtra env, HasNodeError err)
            => User
            -> NodeId
-           -> Cmd' env err Int
+           -> Cmd env err Int
 deleteNode u nodeId = do
   node' <- N.getNode nodeId
   num <- case (view node_typename node') of

src/Gargantext/Database/Prelude.hs

@@ -87,7 +87,7 @@ type IsDBCmdExtra env err m =
   , IsDBEnvExtra env
   )
 
-type CmdM'' env err m =
+type IsCmdRandom env err m =
   ( MonadReader     env     m
   , MonadError          err m
   , MonadBaseControl IO     m
@@ -95,8 +95,8 @@ type CmdM'' env err m =
   )
 
 
-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 CmdRandom    env err a = forall m.     IsCmdRandom  env err m => m a
+type Cmd          env err a = forall m.     IsCmd        env err m => m a
 type DBCmdExtra       err a = forall m env. IsDBCmdExtra env err m => m a
 type DBCmdWithEnv env err a = forall m.     IsDBCmd      env err m => m a
 type DBCmd            err a = forall m env. IsDBCmd      env err m => m a
@@ -112,7 +112,7 @@ mkCmd k = do
   liftBase $ withResource pool (liftBase . k)
 
 runCmd :: env
-       -> Cmd'' env err a
+       -> CmdRandom env err a
        -> IO (Either err a)
 runCmd env m = runExceptT $ runReaderT m env