[REFACT]

package.yaml

@@ -67,7 +67,6 @@ library:
   - Gargantext.Database.Admin.Types.Node
   - Gargantext.Prelude
   - Gargantext.Prelude.Crypto.Pass.User
-  - Gargantext.Prelude.GargDB
   - Gargantext.Prelude.Crypto.Hash
   - Gargantext.Prelude.Utils
   - Gargantext.Core.Text
@@ -111,7 +110,6 @@ library:
   - aeson
   - aeson-lens
   - aeson-pretty
-  - password
   - array
   - async
   - attoparsec
@@ -229,6 +227,7 @@ library:
   - cprng-aes
   - binary
   - crypto-random
+  - password
 
   - split
   - stemmer
@@ -333,7 +332,7 @@ executables:
       - optparse-generic
       - split
       - unordered-containers
-      - cryptohash  
+      - cryptohash
       - time 
 
   gargantext-import:

src/Gargantext/API/Dev.hs

@@ -39,8 +39,8 @@ withDevEnv iniPath k = do
       repo    <- readRepoEnv        (_gc_repofilepath cfg)
       setts   <- devSettings devJwkFile
       pure $ DevEnv
-        { _dev_env_pool = pool
-        , _dev_env_repo = repo
+        { _dev_env_pool     = pool
+        , _dev_env_repo     = repo
         , _dev_env_settings = setts
         , _dev_env_config   = cfg
         }

src/Gargantext/API/Ngrams.hs

@@ -594,7 +594,9 @@ getTableNgrams _nType nId tabType listId limit_ offset
   pure $ toVersionedWithCount fltrCount tableMap3
 
 
-scoresRecomputeTableNgrams :: forall env err m. (RepoCmdM env err m, HasNodeError err, HasConnectionPool env, HasConfig env) => NodeId -> TabType -> ListId -> m Int
+scoresRecomputeTableNgrams :: forall env err m.
+  (RepoCmdM env err m, HasNodeError err, HasConnectionPool env, HasConfig env)
+  => NodeId -> TabType -> ListId -> m Int
 scoresRecomputeTableNgrams nId tabType listId = do
   tableMap <- getNgramsTableMap listId ngramsType
   _ <- tableMap & v_data %%~ setScores
@@ -736,20 +738,20 @@ getTableNgramsDoc dId tabType listId limit_ offset listType minSize maxSize orde
 apiNgramsTableCorpus :: ( GargServerC env err m
                         )
                      => NodeId -> ServerT TableNgramsApi m
-apiNgramsTableCorpus cId =  getTableNgramsCorpus cId
+apiNgramsTableCorpus cId =  getTableNgramsCorpus       cId
                        :<|> tableNgramsPut
                        :<|> scoresRecomputeTableNgrams cId
-                       :<|> getTableNgramsVersion cId
-                       :<|> apiNgramsAsync cId
+                       :<|> getTableNgramsVersion      cId
+                       :<|> apiNgramsAsync             cId
 
 apiNgramsTableDoc :: ( GargServerC env err m
                      )
                   => DocId -> ServerT TableNgramsApi m
-apiNgramsTableDoc dId =  getTableNgramsDoc dId
+apiNgramsTableDoc dId =  getTableNgramsDoc          dId
                     :<|> tableNgramsPut
                     :<|> scoresRecomputeTableNgrams dId
-                    :<|> getTableNgramsVersion dId
-                    :<|> apiNgramsAsync dId
+                    :<|> getTableNgramsVersion      dId
+                    :<|> apiNgramsAsync             dId
                     -- > index all the corpus accordingly (TODO AD)
 
 apiNgramsAsync :: NodeId -> GargServer TableNgramsAsyncApi

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

@@ -52,7 +52,7 @@ import Gargantext.Database.Admin.Types.Node (CorpusId, NodeType(..), UserId)
 import Gargantext.Database.Query.Table.Node (getNodeWith)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Schema.Node (node_hyperdata)
-import qualified Gargantext.Prelude.GargDB as GargDB
+import qualified Gargantext.Database.GargDB as GargDB
 import qualified Gargantext.Core.Text.Corpus.API as API
 import qualified Gargantext.Core.Text.Corpus.Parsers as Parser (FileFormat(..), parseFormat)
 

src/Gargantext/API/Node/File.hs

@@ -27,7 +27,7 @@ import Servant.Job.Async (JobFunction(..), serveJobsAPI)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as BSL
 import qualified Data.MIME.Types as DMT
-import qualified Gargantext.Prelude.GargDB as GargDB
+import qualified Gargantext.Database.GargDB as GargDB
 import qualified Network.HTTP.Media as M
 
 data RESPONSE deriving Typeable

src/Gargantext/API/Node/Types.hs

@@ -18,7 +18,7 @@ import Web.FormUrlEncoded          (FromForm)
 import Gargantext.Core (Lang(..){-, allLangs-})
 import Gargantext.Core.Utils.Prefix (unPrefixSwagger)
 import Gargantext.Prelude
-import qualified Gargantext.Prelude.GargDB as GargDB
+import qualified Gargantext.Database.GargDB as GargDB
 import Gargantext.API.Node.Corpus.New.File (FileType)
 
 -------------------------------------------------------

src/Gargantext/Core/Text/Corpus/Parsers/GrandDebat.hs

@@ -32,7 +32,7 @@ import GHC.Generics (Generic)
 import Gargantext.Core (Lang(..))
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..), ToHyperdataDocument, toHyperdataDocument)
 import Gargantext.Prelude
-import Gargantext.Prelude.GargDB
+import Gargantext.Database.GargDB
 import qualified Data.ByteString.Lazy as DBL
 import qualified Data.JsonStream.Parser as P
 import qualified Data.Text as Text

src/Gargantext/Core/Text/Learn.hs

@@ -34,7 +34,7 @@ import Data.Tuple.Extra (both)
 import qualified Data.ByteString.Lazy as BSL
 
 import Gargantext.Prelude
-import Gargantext.Prelude.GargDB
+import Gargantext.Database.GargDB
 import Gargantext.Core (Lang(..), allLangs)
 import Gargantext.Core.Text.Terms.Mono (words)
 import Gargantext.Core.Text.Metrics.Count (occurrencesWith)

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

@@ -28,7 +28,7 @@ import Gargantext.Core
 import Gargantext.Core.Text.Metrics.Count (occurrencesWith)
 import Gargantext.Core.Types.Main (ListType(..))
 import Gargantext.Prelude
-import Gargantext.Prelude.GargDB
+import Gargantext.Database.GargDB
 
 ------------------------------------------------------------------------
 train :: Double -> Double -> SVM.Problem -> IO SVM.Model

src/Gargantext/Database/Action/Delete.hs

@@ -33,7 +33,7 @@ import Gargantext.Database.Query.Table.Node (getNodeWith)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Schema.Node
 import Gargantext.Prelude
-import qualified Gargantext.Prelude.GargDB as GargDB
+import qualified Gargantext.Database.GargDB as GargDB
 
 ------------------------------------------------------------------------
 

src/Gargantext/Prelude/GargDB.hs → src/Gargantext/Database/GargDB.hs

@@ -12,7 +12,7 @@ TODO_2: quantitative tests (coded)
 
 -}
 
-module Gargantext.Prelude.GargDB
+module Gargantext.Database.GargDB
   where
 
 import Control.Exception