Make CLI compile again

bin/gargantext-cli/CLI/Init.hs

@@ -29,12 +29,13 @@ import Gargantext.Database.Action.Flow (getOrMkRoot, getOrMkRootWithCorpus)
 import Gargantext.Database.Admin.Trigger.Init (initFirstTriggers, initLastTriggers)
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataCorpus)
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude (DBCmd, DBCmdWithEnv)
+import Gargantext.Database.Prelude
 import Gargantext.Database.Query.Table.Node (getOrMkList)
 import Gargantext.Database.Query.Table.User (insertNewUsers, )
 import Gargantext.Database.Query.Tree.Root (MkCorpusUser(MkCorpusUserMaster))
 import Gargantext.Prelude
 import Options.Applicative
+import Gargantext.Core.Types.Individu (toUserHash)
 
 
 initCLI :: InitArgs -> IO ()
@@ -45,34 +46,36 @@ initCLI (InitArgs settingsPath) = do
   putStrLn ("Enter master user (gargantua) _email_ :" :: Text)
   email     <- getLine
 
+  hashedUsers <- NE.fromList <$> mapM toUserHash (NewUser "gargantua" (cs email) (GargPassword $ cs password) : arbitraryNewUsers)
+
   cfg       <- readConfig         settingsPath
   let secret = _s_secret_key $ _gc_secrets cfg
 
-  let createUsers :: forall env. DBCmdWithEnv env BackendInternalError Int64
-      createUsers = insertNewUsers (NewUser "gargantua" (cs email) (GargPassword $ cs password)
-                                   NE.:| arbitraryNewUsers
-                                   )
+  let createUsers :: DBUpdate BackendInternalError Int64
+      createUsers = insertNewUsers hashedUsers
 
   let
-    mkRoots :: forall env. DBCmdWithEnv env BackendInternalError [(UserId, RootId)]
-    mkRoots = mapM getOrMkRoot $ map UserName ("gargantua" : arbitraryUsername)
+    mkRoots :: DBUpdate BackendInternalError [(UserId, RootId)]
+    mkRoots = mapM (getOrMkRoot cfg) $ map UserName ("gargantua" : arbitraryUsername)
     -- TODO create all users roots
 
   let
-    initMaster :: forall env. DBCmdWithEnv env BackendInternalError (UserId, RootId, CorpusId, ListId)
+    initMaster :: DBUpdate BackendInternalError (UserId, RootId, CorpusId, ListId)
     initMaster = do
       (masterUserId, masterRootId, masterCorpusId)
-                  <- getOrMkRootWithCorpus MkCorpusUserMaster
+                  <- getOrMkRootWithCorpus cfg MkCorpusUserMaster
                                             (Nothing :: Maybe HyperdataCorpus)
       masterListId <- getOrMkList masterCorpusId masterUserId
       _triggers    <- initLastTriggers masterListId
       pure (masterUserId, masterRootId, masterCorpusId, masterListId)
 
   withDevEnv settingsPath $ \env -> do
-    _ <- runCmdDev env (initFirstTriggers secret :: DBCmd BackendInternalError [Int64])
-    _ <- runCmdDev env createUsers
-    x <- runCmdDev env initMaster
-    _ <- runCmdDev env mkRoots
+    x <- runCmdDev env $ runDBTx $ do
+      _ <- initFirstTriggers secret
+      _ <- createUsers
+      x' <- initMaster
+      _  <- mkRoots
+      pure x'
     putStrLn (show x :: Text)
 
 initCmd :: HasCallStack => Mod CommandFields CLI

gargantext.cabal

@@ -707,6 +707,7 @@ executable gargantext
     , gargantext
     , gargantext-prelude
     , haskell-bee
+    , lens >= 5.2.2 && < 5.3
     , MonadRandom ^>= 0.6
     , optparse-applicative
     , postgresql-simple >= 0.6.4 && <= 0.7.0.0