[FACTO/WIP] files org and import fix in Database/*

src/Gargantext/Database.hs

@@ -21,5 +21,5 @@ module Gargantext.Database ( module Gargantext.Database.Utils
                            )
     where
 
-import Gargantext.Database.Utils (connectGargandb)
+import Gargantext.Database.Admin.Utils (connectGargandb)
 -- import Gargantext.Database.Bashql

src/Gargantext/Database/Action/Flow.hs

@@ -53,22 +53,22 @@ import Gargantext.Core.Flow.Types
 import Gargantext.Core.Types (NodePoly(..), Terms(..))
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Core.Types.Main
-import Gargantext.Database.Config (userMaster, corpusMasterName)
-import Gargantext.Database.Flow.List
-import Gargantext.Database.Flow.Types
-import Gargantext.Database.Flow.Utils (insertDocNgrams)
-import Gargantext.Database.Node.Contact -- (HyperdataContact(..), ContactWho(..))
-import Gargantext.Database.Node.Document.Insert -- (insertDocuments, ReturnId(..), addUniqIdsDoc, addUniqIdsContact, ToDbData(..))
-import Gargantext.Database.Root (getRoot)
+import Gargantext.Database.Action.Flow.List
+import Gargantext.Database.Action.Flow.Types
+import Gargantext.Database.Action.Flow.Utils (insertDocNgrams)
+import Gargantext.Database.Action.Query.Node.Contact -- (HyperdataContact(..), ContactWho(..))
+import Gargantext.Database.Action.Query.Node.Document.Insert -- (insertDocuments, ReturnId(..), addUniqIdsDoc, addUniqIdsContact, ToDbData(..))
+import Gargantext.Database.Action.Root (getRoot)
+import Gargantext.Database.Action.Search (searchInDatabase)
+import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
+import Gargantext.Database.Admin.Types.Errors (HasNodeError(..), NodeError(..), nodeError)
+import Gargantext.Database.Admin.Types.Node -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
+import Gargantext.Database.Admin.Utils (Cmd)
 import Gargantext.Database.Schema.Ngrams -- (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams,  NgramsType(..), text2ngrams, ngramsTypeId)
 import Gargantext.Database.Schema.Node -- (mkRoot, mkCorpus, getOrMkList, mkGraph, {-mkPhylo,-} mkDashboard, mkAnnuaire, getCorporaWithParentId, HasNodeError, NodeError(..), nodeError)
 import Gargantext.Database.Schema.NodeNgrams (listInsertDb , getCgramsId)
 import Gargantext.Database.Schema.NodeNodeNgrams2 -- (NodeNodeNgrams2, insertNodeNodeNgrams2)
 import Gargantext.Database.Schema.User (getUserId)
-import Gargantext.Database.TextSearch (searchInDatabase)
-import Gargantext.Database.Types.Errors (HasNodeError(..), NodeError(..), nodeError)
-import Gargantext.Database.Types.Node -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
-import Gargantext.Database.Utils (Cmd)
 import Gargantext.Ext.IMT (toSchoolName)
 import Gargantext.Ext.IMTUser (deserialiseImtUsersFromFile)
 import Gargantext.Prelude
@@ -83,7 +83,7 @@ import System.FilePath (FilePath)
 import qualified Data.List as List
 import qualified Data.Map  as Map
 import qualified Data.Text as Text
-import qualified Gargantext.Database.Node.Document.Add  as Doc  (add)
+import qualified Gargantext.Database.Action.Query.Node.Document.Add  as Doc  (add)
 import qualified Gargantext.Text.Corpus.API.Isidore as Isidore
 import qualified Gargantext.Text.Corpus.Parsers.GrandDebat as GD
 

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

@@ -23,17 +23,18 @@ Portability : POSIX
 
 module Gargantext.Database.Action.Flow.List
     where
-import Data.Text (Text)
+
 import Control.Monad (mapM_)
 import Data.Map (Map, toList)
 import Data.Maybe (Maybe(..), catMaybes)
+import Data.Text (Text)
 import Gargantext.API.Ngrams (NgramsElement(..), putListNgrams)
-import Gargantext.Database.Schema.Ngrams -- (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams,  NgramsType(..), text2ngrams, ngramsTypeId)
 import Gargantext.Core.Types.Main (ListType(CandidateTerm))
+import Gargantext.Database.Action.Flow.Types
+import Gargantext.Database.Admin.Types.Node -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
+import Gargantext.Database.Schema.Ngrams -- (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams,  NgramsType(..), text2ngrams, ngramsTypeId)
 import Gargantext.Database.Schema.NodeNgrams (NodeNgramsPoly(..), NodeNgramsW, listInsertDb, getCgramsId)
 import Gargantext.Database.Schema.Node_NodeNgramsNodeNgrams -- (insert_Node_NodeNgrams_NodeNgrams, Node_NodeNgrams_NodeNgrams(..))
-import Gargantext.Database.Types.Node -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
-import Gargantext.Database.Flow.Types
 import Gargantext.Prelude
 import qualified Data.List as List
 import qualified Data.Map  as Map

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

@@ -20,26 +20,22 @@ module Gargantext.Database.Action.Flow.Pairing
   (pairing)
     where
 
---import Debug.Trace (trace)
 import Control.Lens (_Just, (^.))
-import Database.PostgreSQL.Simple.SqlQQ (sql)
--- import Opaleye
--- import Opaleye.Aggregate
--- import Control.Arrow (returnA)
-import Data.Maybe (catMaybes)
 import Data.Map (Map, fromList)
-import Safe (lastMay)
-import qualified Data.Map as DM
+import Data.Maybe (catMaybes)
 import Data.Text (Text, toLower)
-import qualified Data.Text as DT
-import Gargantext.Prelude hiding (sum)
+import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Gargantext.Core.Types (TableResult(..))
-import Gargantext.Database.Schema.Ngrams -- (NgramsType(..))
-import Gargantext.Database.Node.Contact -- (HyperdataContact(..))
-import Gargantext.Database.Flow.Utils
-import Gargantext.Database.Utils (Cmd, runPGSQuery)
-import Gargantext.Database.Types.Node (AnnuaireId, CorpusId, ListId{-, DocId, ContactId-})
+import Gargantext.Database.Action.Flow.Utils
+import Gargantext.Database.Admin.Types.Node (AnnuaireId, CorpusId, ListId{-, DocId, ContactId-})
+import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery)
 import Gargantext.Database.Node.Children (getAllContacts)
+import Gargantext.Database.Node.Contact -- (HyperdataContact(..))
+import Gargantext.Database.Schema.Ngrams -- (NgramsType(..))
+import Gargantext.Prelude hiding (sum)
+import Safe (lastMay)
+import qualified Data.Map as DM
+import qualified Data.Text as DT
 
 -- TODO mv this type in Types Main
 type Terms = Text

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

@@ -29,9 +29,9 @@ import Gargantext.Prelude
 import Gargantext.Core.Flow.Types
 import Gargantext.API.Ngrams (HasRepoVar, RepoCmdM)
 import Gargantext.Database.Schema.Ngrams (Ngrams(..), NgramsType(..))
-import Gargantext.Database.Types.Node (NodeId)
-import Gargantext.Database.Types.Errors (HasNodeError)
-import Gargantext.Database.Utils (CmdM)
+import Gargantext.Database.Admin.Types.Node (NodeId)
+import Gargantext.Database.Admin.Types.Errors (HasNodeError)
+import Gargantext.Database.Admin.Utils (CmdM)
 
 type FlowCmdM env err m =
   ( CmdM     env err m

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

@@ -18,13 +18,13 @@ module Gargantext.Database.Action.Flow.Utils
     where
 
 import Data.Map (Map)
-import qualified Data.Map as DM
-import Gargantext.Prelude
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node (NodeId, Node, NodePoly(..), Hyperdata)
+import Gargantext.Database.Admin.Utils (Cmd)
 import Gargantext.Database.Schema.Ngrams
-import Gargantext.Database.Types.Node (NodeId, Node, NodePoly(..), Hyperdata)
-import Gargantext.Database.Utils (Cmd)
 import Gargantext.Database.Schema.NodeNodeNgrams
-import Gargantext.Database.Types.Node
+import Gargantext.Prelude
+import qualified Data.Map as DM
 
 toMaps :: Hyperdata a
        => (a -> Map (NgramsT Ngrams) Int)

src/Gargantext/Database/Action/Learn.hs

@@ -19,18 +19,17 @@ Portability : POSIX
 module Gargantext.Database.Action.Learn
   where
 
+import Data.Maybe
 import Data.Text (Text)
 import Data.Tuple (snd)
-import Data.Maybe
-import Gargantext.Database.Facet
-import Gargantext.Database.Types.Node
+import Gargantext.Core.Types (Offset, Limit)
+import Gargantext.Database.Action.Facet
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Utils (Cmd)
 import Gargantext.Prelude
 import Gargantext.Text.Learn
 import qualified Data.List as List
 import qualified Data.Text as Text
---import Gargantext.Database.Schema.NodeNode (nodeNodesCategory)
-import Gargantext.Database.Utils (Cmd)
-import Gargantext.Core.Types (Offset, Limit)
 
 data FavOrTrash = IsFav | IsTrash
   deriving (Eq)

src/Gargantext/Database/Action/Metrics.hs

@@ -23,17 +23,15 @@ import Data.Text (Text)
 import Gargantext.API.Ngrams (TabType(..), ngramsTypeFromTabType)
 import Gargantext.API.Ngrams.Tools (filterListWithRoot, groupNodesByNgrams, Diagonal(..), getCoocByNgrams, mapTermListRoot, RootTerm, getRepo)
 import Gargantext.Core.Types (ListType(..), Limit, NodeType(..))
-import Gargantext.Database.Flow (FlowCmdM)
-import Gargantext.Database.Metrics.NgramsByNode (getNodesByNgramsOnlyUser{-, getTficfWith-})
-import Gargantext.Database.Node.Select
+import Gargantext.Database.Action.Flow (FlowCmdM)
+import Gargantext.Database.Action.Metrics.NgramsByNode (getNodesByNgramsOnlyUser{-, getTficfWith-})
+import Gargantext.Database.Action.Query.Node.Select
+import Gargantext.Database.Admin.Config (userMaster)
+import Gargantext.Database.Admin.Types.Node (ListId, CorpusId{-, HyperdataCorpus-})
 import Gargantext.Database.Schema.Node (defaultList)
-import Gargantext.Database.Types.Node (ListId, CorpusId{-, HyperdataCorpus-})
---import Gargantext.Database.Flow (getOrMkRootWithCorpus)
-import Gargantext.Database.Config (userMaster)
 import Gargantext.Prelude
 import Gargantext.Text.Metrics (scored, Scored(..), {-localMetrics, toScored-})
 import qualified Data.Map    as Map
---import qualified Data.Vector.Storable as Vec
 
 getMetrics :: FlowCmdM env err m
             => CorpusId -> Maybe ListId -> TabType -> Maybe Limit

src/Gargantext/Database/Action/Metrics/Lists.hs

@@ -28,14 +28,13 @@ module Gargantext.Database.Action.Metrics.Lists
 
 import Gargantext.API.Ngrams (TabType(..))
 import Gargantext.Core.Types -- (NodePoly(..), NodeCorpus, ListId)
-import Gargantext.Database.Flow (FlowCmdM)
+import Gargantext.Database.Action.Flow (FlowCmdM)
 import Gargantext.Prelude hiding (sum, head)
 import Gargantext.Text.Metrics (Scored(..))
 import Prelude hiding (null, id, map, sum)
 import qualified Data.Map as Map
 import qualified Data.Vector as Vec
-import qualified Gargantext.Database.Metrics as Metrics
-
+import qualified Gargantext.Database.Action.Metrics as Metrics
 
 {-
 trainModel :: FlowCmdM env ServantErr m

src/Gargantext/Database/Action/Metrics/NgramsByNode.hs

@@ -20,7 +20,6 @@ Ngrams by node enable contextual metrics.
 module Gargantext.Database.Action.Metrics.NgramsByNode
   where
 
-import Debug.Trace (trace)
 import Data.Map.Strict (Map, fromListWith, elems, toList, fromList)
 import Data.Map.Strict.Patch (PatchMap, Replace, diff)
 import Data.Set (Set)
@@ -28,11 +27,12 @@ import Data.Text (Text)
 import Data.Tuple.Extra (second, swap)
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
+import Debug.Trace (trace)
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Config (nodeTypeId)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Node -- (ListId, CorpusId, NodeId)
+import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery)
 import Gargantext.Database.Schema.Ngrams (ngramsTypeId, NgramsType(..))
-import Gargantext.Database.Types.Node -- (ListId, CorpusId, NodeId)
-import Gargantext.Database.Utils (Cmd, runPGSQuery)
 import Gargantext.Prelude
 import Gargantext.Text.Metrics.TFICF
 import Gargantext.Text.Terms.Mono.Stem (stem)

src/Gargantext/Database/Query/Facet.hs → src/Gargantext/Database/Action/Query/Facet.hs

@@ -25,7 +25,7 @@ Portability : POSIX
 {-# LANGUAGE TemplateHaskell           #-}
 {-# LANGUAGE TypeFamilies              #-}
 ------------------------------------------------------------------------
-module Gargantext.Database.Query.Facet
+module Gargantext.Database.Action.Query.Facet
   ( runViewAuthorsDoc
   , runViewDocuments
   , filterWith
@@ -39,10 +39,9 @@ module Gargantext.Database.Query.Facet
   , OrderBy(..)
   )
   where
-------------------------------------------------------------------------
+
 import Control.Arrow (returnA)
 import Control.Lens ((^.))
--- import Control.Lens.TH (makeLensesWith, abbreviatedFields)
 import Data.Aeson (FromJSON, ToJSON)
 import Data.Aeson.TH (deriveJSON)
 import Data.Either(Either(Left))
@@ -55,15 +54,14 @@ import Data.Time.Segment (jour)
 import GHC.Generics (Generic)
 import Gargantext.Core.Types
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Schema.Node
+import Gargantext.Database.Action.Query.Filter
+import Gargantext.Database.Action.Query.Join (leftJoin5)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Schema.Ngrams
+import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeNode
 import Gargantext.Database.Schema.NodeNodeNgrams
--- import Gargantext.Database.Schema.NodeNodeNgrams2
-import Gargantext.Database.Utils
-import Gargantext.Database.Query.Filter
-import Gargantext.Database.Query.Join (leftJoin5)
 import Opaleye
 import Prelude hiding (null, id, map, sum, not, read)
 import Servant.API

src/Gargantext/Database/Query/Filter.hs → src/Gargantext/Database/Action/Query/Filter.hs

@@ -19,7 +19,8 @@ Portability : POSIX
 {-# LANGUAGE TemplateHaskell        #-}
 {-# OPTIONS_GHC -fno-warn-orphans   #-}
 
-module Gargantext.Database.Query.Filter where
+module Gargantext.Database.Action.Query.Filter
+  where
 
 import Gargantext.Core.Types (Limit, Offset)
 import Data.Maybe (Maybe, maybe)

src/Gargantext/Database/Query/Join.hs → src/Gargantext/Database/Action/Query/Join.hs

@@ -25,10 +25,11 @@ Multiple Join functions with Opaleye.
 {-# LANGUAGE NoMonomorphismRestriction #-}
 {-# LANGUAGE OverloadedStrings         #-}
 {-# LANGUAGE TemplateHaskell           #-}
+
 ------------------------------------------------------------------------
-module Gargantext.Database.Query.Query.Join
+
+module Gargantext.Database.Action.Query.Join
   where
-------------------------------------------------------------------------
 
 import Control.Applicative ((<*>))
 import Control.Arrow ((>>>))
@@ -38,7 +39,6 @@ import Opaleye
 import Opaleye.Internal.Join (NullMaker(..))
 import qualified Opaleye.Internal.Unpackspec()
 
-
 --leftJoin3 :: Query columnsL1 -> Query columnsR -> Query columnsL
 --     -> ((columnsL1, columnsR) -> Column PGBool)
 --     -> ((columnsL, (columnsL1, nullableColumnsR1)) -> Column PGBool)
@@ -50,7 +50,6 @@ join3 :: Query columnsA -> Query columnsB -> Query columnsC
 join3 q1 q2 q3 cond = ((,,) <$> q1 <*> q2 <*> q3) >>> keepWhen cond
 
 ------------------------------------------------------------------------
-
 leftJoin3
   :: (Default Unpackspec fieldsL1 fieldsL1,
       Default Unpackspec fieldsL2 fieldsL2,

src/Gargantext/Database/Query/Ngrams.hs → src/Gargantext/Database/Action/Query/Ngrams.hs

@@ -14,19 +14,19 @@ Portability : POSIX
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE RankNTypes        #-}
 
-module Gargantext.Database.Query.Ngrams
+module Gargantext.Database.Action.Query.Ngrams
     where
 
-import Data.Text (Text)
+import Control.Arrow (returnA)
 import Control.Lens ((^.))
+import Data.Text (Text)
 import Gargantext.Core.Types
 import Gargantext.Database.Admin.Utils (runOpaQuery, Cmd)
-import Gargantext.Database.Admin.Schema.Ngrams
-import Gargantext.Database.Admin.Schema.NodeNodeNgrams
-import Gargantext.Database.Admin.Schema.Node
+import Gargantext.Database.Schema.Ngrams
+import Gargantext.Database.Schema.Node
+import Gargantext.Database.Schema.NodeNodeNgrams
 import Gargantext.Prelude
 import Opaleye
-import Control.Arrow (returnA)
 
 selectNgramsByDoc :: [ListId] -> DocId -> NgramsType -> Cmd err [Text]
 selectNgramsByDoc lIds dId nt = runOpaQuery (query lIds dId nt)

src/Gargantext/Database/Query/Node.hs → src/Gargantext/Database/Action/Query/Node.hs

@@ -24,7 +24,8 @@ Portability : POSIX
 {-# LANGUAGE TemplateHaskell        #-}
 {-# LANGUAGE TypeFamilies           #-}
 
-module Gargantext.Database.Query.Node where
+module Gargantext.Database.Action.Query.Node
+  where
 
 import Control.Arrow (returnA)
 import Control.Lens (set, view)
@@ -37,13 +38,13 @@ import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import GHC.Int (Int64)
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Individu (User(..))
-import Gargantext.Database.Config (nodeTypeId)
+import Gargantext.Database.Action.Query.Filter (limit', offset')
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Errors
+import Gargantext.Database.Admin.Types.Node (NodeType(..), defaultCorpus, Hyperdata, HyperData(..))
+import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Node.Contact (HyperdataContact(..), arbitraryHyperdataContact)
-import Gargantext.Database.Query.Filter (limit', offset')
 import Gargantext.Database.Schema.Node
-import Gargantext.Database.Types.Errors
-import Gargantext.Database.Types.Node (NodeType(..), defaultCorpus, Hyperdata, HyperData(..))
-import Gargantext.Database.Utils
 import Gargantext.Prelude hiding (sum, head)
 import Gargantext.Viz.Graph (HyperdataGraph(..))
 import Opaleye hiding (FromField)

src/Gargantext/Database/Query/Node/Children.hs → src/Gargantext/Database/Action/Query/Node/Children.hs

@@ -16,19 +16,20 @@ Portability : POSIX
 {-# LANGUAGE FlexibleContexts       #-}
 {-# LANGUAGE RankNTypes             #-}
 
-module Gargantext.Database.Query.Node.Children where
+module Gargantext.Database.Action.Query.Node.Children
+  where
 
+import Control.Arrow (returnA)
 import Data.Proxy
-import Opaleye
 import Gargantext.Core.Types
-import Gargantext.Database.Admin.Schema.Node
-import Gargantext.Database.Admin.Utils
-import Gargantext.Database.Admin.Schema.NodeNode
+import Gargantext.Database.Action.Query.Filter
+import Gargantext.Database.Action.Query.Node.Contact (HyperdataContact)
 import Gargantext.Database.Admin.Config (nodeTypeId)
-import Gargantext.Database.Query.Filter
-import Gargantext.Database.Query.Node.Contact (HyperdataContact)
-import Gargantext.Database.Admin.Schema.Node (pgNodeId)
-import Control.Arrow (returnA)
+import Gargantext.Database.Admin.Utils
+import Gargantext.Database.Schema.Node
+import Gargantext.Database.Schema.Node (pgNodeId)
+import Gargantext.Database.Schema.NodeNode
+import Opaleye
 
 getAllDocuments :: ParentId -> Cmd err (TableResult (Node HyperdataDocument))
 getAllDocuments pId = getAllChildren pId (Proxy :: Proxy HyperdataDocument)

src/Gargantext/Database/Query/Node/Contact.hs → src/Gargantext/Database/Action/Query/Node/Contact.hs

@@ -17,7 +17,7 @@ Portability : POSIX
 {-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Query.Node.Contact
+module Gargantext.Database.Action.Query.Node.Contact
   where
 
 import Control.Lens (makeLenses)
@@ -29,8 +29,8 @@ import Data.Time (UTCTime)
 import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import GHC.Generics (Generic)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Database.Types.Node (Node,Hyperdata)
-import Gargantext.Database.Utils (fromField')
+import Gargantext.Database.Admin.Types.Node (Node,Hyperdata)
+import Gargantext.Database.Admin.Utils (fromField')
 import Gargantext.Prelude
 import Opaleye (QueryRunnerColumnDefault, queryRunnerColumnDefault, PGJsonb, fieldQueryRunnerColumn)
 import Test.QuickCheck (elements)

src/Gargantext/Database/Query/Node/Document/Add.hs → src/Gargantext/Database/Action/Query/Node/Document/Add.hs

@@ -23,24 +23,22 @@ Add Documents/Contact to a Corpus/Annuaire.
 {-# LANGUAGE TypeSynonymInstances #-}
 
 ------------------------------------------------------------------------
-module Gargantext.Database.Query.Node.Document.Add
+module Gargantext.Database.Action.Query.Node.Document.Add
   where
 
 import Data.ByteString.Internal (ByteString)
+import Data.Text (Text)
 import Data.Typeable (Typeable)
 import Database.PostgreSQL.Simple (Query, Only(..))
 import Database.PostgreSQL.Simple.SqlQQ
 import Database.PostgreSQL.Simple.ToField (toField)
 import Database.PostgreSQL.Simple.ToRow (ToRow(..))
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-
-import Data.Text (Text)
-
-import Gargantext.Database.Utils (Cmd, runPGSQuery, formatPGSQuery)
-import Gargantext.Database.Types.Node
+import GHC.Generics (Generic)
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery, formatPGSQuery)
 import Gargantext.Prelude
 
-import GHC.Generics (Generic)
 ---------------------------------------------------------------------------
 
 add :: ParentId -> [NodeId] -> Cmd err [Only Int]

src/Gargantext/Database/Query/Node/Document/Insert.hs → src/Gargantext/Database/Action/Query/Node/Document/Insert.hs

@@ -57,30 +57,32 @@ the concatenation of the parameters defined by @shaParameters@.
 {-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 ------------------------------------------------------------------------
-module Gargantext.Database.Query.Node.Document.Insert where
+module Gargantext.Database.Action.Query.Node.Document.Insert
+  where
 
 import Control.Lens (set, view)
-import Control.Lens.Prism
 import Control.Lens.Cons
+import Control.Lens.Prism
 import Data.Aeson (toJSON)
 import Data.Maybe (maybe)
-import Data.Time.Segment (jour)
 import Data.Text (Text)
+import Data.Time.Segment (jour)
 import Database.PostgreSQL.Simple (FromRow, Query, Only(..))
 import Database.PostgreSQL.Simple.FromRow (fromRow, field)
 import Database.PostgreSQL.Simple.SqlQQ
 import Database.PostgreSQL.Simple.ToField (toField, Action)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import GHC.Generics (Generic)
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Utils (Cmd, runPGSQuery)
-import Gargantext.Database.Node.Contact -- (HyperdataContact(..), ContactWho(..))
-import Gargantext.Database.Types.Node
+import Gargantext.Database.Action.Query.Node.Contact -- (HyperdataContact(..), ContactWho(..))
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery)
 import Gargantext.Prelude
+import Gargantext.Prelude.Utils (sha)
 import qualified Data.ByteString.Lazy.Char8  as DC (pack)
 import qualified Data.Digest.Pure.SHA        as SHA (sha256, showDigest)
 import qualified Data.Text                   as DT (pack, unpack, concat, take)
-import Gargantext.Prelude.Utils (sha)
+
 -- TODO : the import of Document constructor below does not work
 -- import Gargantext.Database.Types.Node (Document)
 --import Gargantext.Database.Types.Node (docExample, hyperdataDocument, HyperdataDocument(..)

src/Gargantext/Database/Query/Node/Select.hs → src/Gargantext/Database/Action/Query/Node/Select.hs

@@ -14,17 +14,17 @@ Portability : POSIX
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE RankNTypes        #-}
 
-module Gargantext.Database.Query.Node.Select
+module Gargantext.Database.Action.Query.Node.Select
   where
 
-import Opaleye
+import Control.Arrow (returnA)
 import Gargantext.Core.Types
+import Gargantext.Core.Types.Individu (Username)
+import Gargantext.Database.Admin.Config
+import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Schema.Node
-import Gargantext.Database.Utils
-import Gargantext.Database.Config
 import Gargantext.Database.Schema.User
-import Gargantext.Core.Types.Individu (Username)
-import Control.Arrow (returnA)
+import Opaleye
 
 selectNodesWithUsername :: NodeType -> Username -> Cmd err [NodeId]
 selectNodesWithUsername nt u = runOpaQuery (q u)

src/Gargantext/Database/Query/Node/Update.hs → src/Gargantext/Database/Action/Query/Node/Update.hs

@@ -15,8 +15,7 @@ Portability : POSIX
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE RankNTypes        #-}
 
-
-module Gargantext.Database.Query.Node.Update (Update(..), update)
+module Gargantext.Database.Action.Query.Node.Update (Update(..), update)
   where
 
 import qualified Data.Text as DT
@@ -24,8 +23,8 @@ import Database.PostgreSQL.Simple
 
 import Gargantext.Prelude
 import Gargantext.Core.Types (Name)
-import Gargantext.Database.Utils
-import Gargantext.Database.Types.Node (NodeId, ParentId)
+import Gargantext.Database.Admin.Utils
+import Gargantext.Database.Admin.Types.Node (NodeId, ParentId)
 
 -- import Data.ByteString
 --rename :: NodeId -> Text -> IO ByteString

src/Gargantext/Database/Query/Node/UpdateOpaleye.hs → src/Gargantext/Database/Action/Query/Node/UpdateOpaleye.hs

@@ -16,15 +16,16 @@ Portability : POSIX
 {-# LANGUAGE RankNTypes        #-}
 
 
-module Gargantext.Database.Query.Node.UpdateOpaleye where
+module Gargantext.Database.Action.Query.Node.UpdateOpaleye
+  where
 
 
 import Opaleye
 import Data.Aeson (encode, ToJSON)
 import Gargantext.Prelude
 import Gargantext.Database.Schema.Node 
-import Gargantext.Database.Types.Node
-import Gargantext.Database.Utils (Cmd, mkCmd)
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Utils (Cmd, mkCmd)
 
 updateHyperdata :: ToJSON a => NodeId -> a -> Cmd err Int64
 updateHyperdata i h = mkCmd $ \c -> runUpdate_ c (updateHyperdataQuery i h)

src/Gargantext/Database/Query/Node/User.hs → src/Gargantext/Database/Action/Query/Node/User.hs

@@ -17,7 +17,7 @@ Portability : POSIX
 {-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Query.Node.User
+module Gargantext.Database.Action.Query.Node.User
   where
 
 import Control.Lens (makeLenses)
@@ -27,13 +27,13 @@ import Data.Text (Text)
 import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import GHC.Generics (Generic)
 import Gargantext.Core (Lang(..))
+import Gargantext.Core.Types.Individu (Username, arbitraryUsername, User(..), UserId)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Database.Node.Contact (HyperdataContact, fake_HyperdataContact)
-import Gargantext.Database.Types.Node (Node,Hyperdata, DocumentId, NodeId(..))
-import Gargantext.Database.Utils (fromField')
-import Gargantext.Database.Tools.Node (getNode)
+import Gargantext.Database.Action.Query.Node (getNode)
+import Gargantext.Database.Action.Query.Node.Contact (HyperdataContact, fake_HyperdataContact)
+import Gargantext.Database.Admin.Types.Node (Node,Hyperdata, DocumentId, NodeId(..))
+import Gargantext.Database.Admin.Utils (fromField')
 import Gargantext.Database.Schema.Node (Node(..))
-import Gargantext.Core.Types.Individu (Username, arbitraryUsername, User(..), UserId)
 import Gargantext.Prelude
 import Opaleye (QueryRunnerColumnDefault, queryRunnerColumnDefault, PGJsonb, fieldQueryRunnerColumn)
 import Test.QuickCheck (elements)

src/Gargantext/Database/Query/Tree.hs → src/Gargantext/Database/Action/Query/Tree.hs

@@ -17,7 +17,7 @@ Let a Root Node, return the Tree of the Node as a directed acyclic graph
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE RankNTypes        #-}
 
-module Gargantext.Database.Query.Tree
+module Gargantext.Database.Action.Query.Tree
   ( treeDB
   , TreeError(..)
   , HasTreeError(..)
@@ -38,10 +38,10 @@ import Database.PostgreSQL.Simple.SqlQQ
 import Gargantext.Prelude
 import Gargantext.Core.Types.Main (NodeTree(..), Tree(..))
 import Gargantext.Database.Config (fromNodeTypeId, nodeTypeId)
-import Gargantext.Database.Types.Node (NodeId, NodeType, DocId, allNodeTypes)
-import Gargantext.Database.Utils (Cmd, runPGSQuery)
-import Gargantext.Database.Tools.Node
-import Gargantext.Database.Tools.User
+import Gargantext.Database.Admin.Types.Node (NodeId, NodeType, DocId, allNodeTypes)
+import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery)
+import Gargantext.Database.Admin.Tools.Node
+import Gargantext.Database.Admin.Tools.User
 
 ------------------------------------------------------------------------
 -- import Gargantext.Database.Utils (runCmdDev)

src/Gargantext/Database/Query/Tree/Root.hs → src/Gargantext/Database/Action/Query/Tree/Root.hs

@@ -24,17 +24,18 @@ Portability : POSIX
 {-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Query.Tree.Root where
+module Gargantext.Database.Action.Query.Tree.Root
+  where
 
 import Control.Arrow (returnA)
 import Gargantext.Core.Types.Individu (User(..))
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Node.User (HyperdataUser)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Action.Node.User (HyperdataUser)
 import Gargantext.Database.Schema.Node (NodeRead)
 import Gargantext.Database.Schema.Node (queryNodeTable)
 import Gargantext.Database.Schema.User (queryUserTable, UserPoly(..))
-import Gargantext.Database.Types.Node (Node, NodePoly(..), NodeType(NodeUser))
-import Gargantext.Database.Utils (Cmd, runOpaQuery)
+import Gargantext.Database.Admin.Types.Node (Node, NodePoly(..), NodeType(NodeUser))
+import Gargantext.Database.Admin.Utils (Cmd, runOpaQuery)
 import Gargantext.Prelude
 import Opaleye (restrict, (.==), Query)
 import Opaleye.PGTypes (pgStrictText, pgInt4)

src/Gargantext/Database/Query/User.hs → src/Gargantext/Database/Action/Query/User.hs

@@ -23,7 +23,7 @@ Functions to deal with users, database side.
 {-# LANGUAGE OverloadedStrings           #-}
 {-# LANGUAGE RankNTypes                  #-}
 
-module Gargantext.Database.Query.Tools.User
+module Gargantext.Database.Action.Query.User
   where
 
 import Control.Arrow (returnA)
@@ -36,9 +36,9 @@ import Data.Text (Text)
 import Data.Time (UTCTime)
 import GHC.Show(Show(..))
 import Gargantext.Core.Types.Individu (Username, arbitraryUsername, User(..), UserId)
-import Gargantext.Database.Types.Errors
+import Gargantext.Database.Admin.Types.Errors
 import Gargantext.Database.Schema.User
-import Gargantext.Database.Utils
+import Gargantext.Database.Admin.Utils
 import Gargantext.Prelude
 import Opaleye
 

src/Gargantext/Database/Action/Search.hs

@@ -16,32 +16,32 @@ Portability : POSIX
 
 module Gargantext.Database.Action.Search where
 
+--import Gargantext.Database.Node.Contact
+import Control.Arrow (returnA)
+import Control.Lens ((^.))
 import Data.Aeson
+import Data.List (intersperse, take, drop)
 import Data.Map.Strict hiding (map, drop, take)
 import Data.Maybe
-import Control.Lens ((^.))
-import Data.List (intersperse, take, drop)
 import Data.String (IsString(..))
 import Data.Text (Text, words, unpack, intercalate)
 import Data.Time (UTCTime)
 import Database.PostgreSQL.Simple (Query)
 import Database.PostgreSQL.Simple.ToField
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Types.Node (NodeType(..))
-import Gargantext.Prelude
---import Gargantext.Database.Node.Contact
-import Gargantext.Database.Facet
-import Gargantext.Database.Schema.Node
+import Gargantext.Core.Types
+import Gargantext.Database.Action.Facet
+import Gargantext.Database.Action.Query.Join (leftJoin6)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Node (NodeType(..))
+import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery, runOpaQuery, runCountOpaQuery)
 import Gargantext.Database.Schema.Ngrams
+import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeNode hiding (joinInCorpus)
 import Gargantext.Database.Schema.NodeNodeNgrams
-import Gargantext.Database.Query.Join (leftJoin6)
-import Gargantext.Database.Utils (Cmd, runPGSQuery, runOpaQuery, runCountOpaQuery)
+import Gargantext.Prelude
 import Gargantext.Text.Terms.Mono.Stem.En (stemIt)
-import Gargantext.Core.Types
-import Control.Arrow (returnA)
-import qualified Opaleye as O hiding (Order)
 import Opaleye hiding (Query, Order)
+import qualified Opaleye as O hiding (Order)
 
 
 ------------------------------------------------------------------------

src/Gargantext/Database/Admin/Bashql.hs

@@ -83,9 +83,9 @@ import Data.Text (Text)
 import Data.List (concat, last)
 
 import Gargantext.Core.Types
-import Gargantext.Database.Utils (runOpaQuery, Cmd)
+import Gargantext.Database.Admin.Utils (runOpaQuery, Cmd)
 import Gargantext.Database.Schema.Node
-import qualified Gargantext.Database.Node.Update as U (Update(..), update)
+import qualified Gargantext.Database.Action.Query.Node.Update as U (Update(..), update)
 import Gargantext.Prelude
 
 

src/Gargantext/Database/Admin/Config.hs

@@ -19,13 +19,11 @@ TODO: configure nodes table in Haskell (Config typenames etc.)
 module Gargantext.Database.Admin.Config
     where
 
-
+import Data.List        (lookup)
+import Data.Maybe       (fromMaybe)
 import Data.Text        (Text,pack)
 import Data.Tuple.Extra (swap)
-import Data.Maybe       (fromMaybe)
-import Data.List        (lookup)
-
-import Gargantext.Database.Types.Node
+import Gargantext.Database.Admin.Types.Node
 import Gargantext.Prelude
 
 -- TODO put this in config.ini file

src/Gargantext/Database/Admin/Trigger/Init.hs

@@ -20,12 +20,12 @@ Ngrams by node enable contextual metrics.
 module Gargantext.Database.Admin.Trigger.Init
   where
 
--- import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Gargantext.Database.Utils (Cmd)
+import Gargantext.Database.Admin.Triggers.NodeNodeNgrams (triggerCountInsert, triggerCountInsert2)
+import Gargantext.Database.Admin.Triggers.Nodes (triggerSearchUpdate)
+import Gargantext.Database.Admin.Triggers.NodesNodes (triggerDeleteCount, triggerInsertCount, triggerUpdateAdd, triggerUpdateDel, MasterListId) -- , triggerCoocInsert)
+import Gargantext.Database.Admin.Utils (Cmd)
 import Gargantext.Prelude
-import Gargantext.Database.Triggers.Nodes (triggerSearchUpdate)
-import Gargantext.Database.Triggers.NodesNodes (triggerDeleteCount, triggerInsertCount, triggerUpdateAdd, triggerUpdateDel, MasterListId) -- , triggerCoocInsert)
-import Gargantext.Database.Triggers.NodeNodeNgrams (triggerCountInsert, triggerCountInsert2)
+
 ------------------------------------------------------------------------
 
 initTriggers :: MasterListId -> Cmd err [Int64]

src/Gargantext/Database/Admin/Trigger/NodeNodeNgrams.hs

@@ -21,11 +21,10 @@ module Gargantext.Database.Admin.Trigger.NodeNodeNgrams
   where
 
 import Database.PostgreSQL.Simple.SqlQQ (sql)
--- import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Types.Node -- (ListId, CorpusId, NodeId)
 import Gargantext.Core.Types.Main (listTypeId, ListType(CandidateTerm))
-import Gargantext.Database.Utils (Cmd, execPGSQuery)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Node -- (ListId, CorpusId, NodeId)
+import Gargantext.Database.Admin.Utils (Cmd, execPGSQuery)
 import Gargantext.Prelude
 import qualified Database.PostgreSQL.Simple as DPS
 

src/Gargantext/Database/Admin/Trigger/Nodes.hs

@@ -21,10 +21,9 @@ module Gargantext.Database.Admin.Trigger.Nodes
   where
 
 import Database.PostgreSQL.Simple.SqlQQ (sql)
--- import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Types.Node -- (ListId, CorpusId, NodeId)
-import Gargantext.Database.Utils (Cmd, execPGSQuery)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Node -- (ListId, CorpusId, NodeId)
+import Gargantext.Database.Admin.Utils (Cmd, execPGSQuery)
 import Gargantext.Prelude
 import qualified Database.PostgreSQL.Simple as DPS
 

src/Gargantext/Database/Admin/Trigger/NodesNodes.hs

@@ -22,10 +22,10 @@ module Gargantext.Database.Admin.Trigger.NodesNodes
 
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 -- import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Types.Node -- (ListId, CorpusId, NodeId)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Node -- (ListId, CorpusId, NodeId)
 import Gargantext.Core.Types.Main (listTypeId, ListType(CandidateTerm))
-import Gargantext.Database.Utils (Cmd, execPGSQuery)
+import Gargantext.Database.Admin.Utils (Cmd, execPGSQuery)
 import Gargantext.Prelude
 import qualified Database.PostgreSQL.Simple as DPS
 

src/Gargantext/Database/Admin/Types/Node.hs

@@ -25,42 +25,35 @@ Portability : POSIX
 module Gargantext.Database.Admin.Types.Node
   where
 
-import Prelude (Enum, Bounded, minBound, maxBound)
-
-import GHC.Generics (Generic)
-
-import           Control.Lens hiding (elements, (&))
-import           Control.Applicative ((<*>))
-import           Control.Monad (mzero)
-
-import           Data.Aeson
-import           Data.Aeson.Types (emptyObject)
-import           Data.Aeson (Object, toJSON)
-import           Data.Aeson.TH (deriveJSON)
-import           Data.ByteString.Lazy (ByteString)
-import           Data.Either
-import           Data.Eq (Eq)
-import           Data.Monoid (mempty)
-import           Data.Text (Text, unpack)
-import           Data.Time (UTCTime)
-import           Data.Swagger
-
-import           Text.Read (read)
-import           Text.Show (Show())
-
-import Database.PostgreSQL.Simple.ToField (ToField, toField, toJSONField)
+import Control.Applicative ((<*>))
+import Control.Lens hiding (elements, (&))
+import Control.Monad (mzero)
+import Data.Aeson
+import Data.Aeson (Object, toJSON)
+import Data.Aeson.TH (deriveJSON)
+import Data.Aeson.Types (emptyObject)
+import Data.ByteString.Lazy (ByteString)
+import Data.Either
+import Data.Eq (Eq)
+import Data.Monoid (mempty)
+import Data.Swagger
+import Data.Text (Text, unpack)
+import Data.Time (UTCTime)
 import Database.PostgreSQL.Simple.FromField (FromField, fromField)
-import           Servant
-
-import           Test.QuickCheck.Arbitrary
-import           Test.QuickCheck (elements)
-import           Test.QuickCheck.Instances.Time ()
-import           Test.QuickCheck.Instances.Text ()
+import Database.PostgreSQL.Simple.ToField (ToField, toField, toJSONField)
+import GHC.Generics (Generic)
+import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
+import Gargantext.Prelude
+import Gargantext.Viz.Phylo (Phylo)
+import Prelude (Enum, Bounded, minBound, maxBound)
+import Servant
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary
+import Test.QuickCheck.Instances.Text ()
+import Test.QuickCheck.Instances.Time ()
+import Text.Read (read)
+import Text.Show (Show())
 
-import           Gargantext.Prelude
-import           Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import           Gargantext.Viz.Phylo (Phylo)
---import Gargantext.Database.Utils
 ------------------------------------------------------------------------
 
 newtype NodeId = NodeId Int

src/Gargantext/Database/Admin/Utils.hs

@@ -21,18 +21,16 @@ commentary with @some markup@.
 
 module Gargantext.Database.Admin.Utils where
 
-import Data.ByteString.Char8 (hPutStrLn)
-import System.IO (stderr)
 import Control.Exception
-import Control.Monad.Error.Class -- (MonadError(..), Error)
 import Control.Lens (Getter, view)
+import Control.Monad.Error.Class -- (MonadError(..), Error)
+import Control.Monad.Except
 import Control.Monad.Reader
 import Control.Monad.Trans.Control (MonadBaseControl)
-import Control.Monad.Except
 import Data.Aeson (Result(Error,Success), fromJSON, FromJSON)
+import Data.ByteString.Char8 (hPutStrLn)
 import Data.Either.Extra (Either(Left, Right))
 import Data.Ini (readIniFile, lookupValue)
-import qualified Data.List as DL
 import Data.Maybe (maybe)
 import Data.Monoid ((<>))
 import Data.Pool (Pool, withResource)
@@ -40,7 +38,6 @@ import Data.Profunctor.Product.Default (Default)
 import Data.Text (unpack, pack)
 import Data.Typeable (Typeable)
 import Data.Word (Word16)
---import Database.PostgreSQL.Simple (Connection, Pool, connect, withPoolConnection)
 import Database.PostgreSQL.Simple (Connection, connect)
 import Database.PostgreSQL.Simple.FromField ( Conversion, ResultError(ConversionFailed), fromField, returnError)
 import Database.PostgreSQL.Simple.Internal  (Field)
@@ -48,8 +45,10 @@ import Gargantext.Prelude
 import Opaleye (Query, Unpackspec, showSqlForPostgres, FromFields, Select, runQuery)
 import Opaleye.Aggregate (countRows)
 import System.IO (FilePath)
+import System.IO (stderr)
 import Text.Read (read)
 import qualified Data.ByteString      as DB
+import qualified Data.List as DL
 import qualified Database.PostgreSQL.Simple as PGS
 
 class HasConnectionPool env where

src/Gargantext/Database/Admin/Schema/Ngrams.hs → src/Gargantext/Database/Schema/Ngrams.hs

@@ -24,7 +24,7 @@ Ngrams connection to the Database.
 {-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Admin.Schema.Ngrams where
+module Gargantext.Database.Schema.Ngrams where
 
 import Control.Lens (makeLenses, over)
 import Control.Monad (mzero)
@@ -33,22 +33,22 @@ import Data.Aeson.Types (toJSONKeyText)
 import Data.ByteString.Internal (ByteString)
 import Data.Map (Map, fromList, lookup)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
+import Data.Swagger (ToParamSchema, toParamSchema, ToSchema)
 import Data.Text (Text, splitOn, pack)
+import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import Database.PostgreSQL.Simple.FromRow (fromRow, field)
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Database.PostgreSQL.Simple.ToField (toField, ToField)
-import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import Database.PostgreSQL.Simple.ToRow   (toRow)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import GHC.Generics (Generic)
-import Gargantext.Database.Utils (Cmd, runPGSQuery, runOpaQuery, formatPGSQuery)
 import Gargantext.Core.Types (TODO(..))
+import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery, runOpaQuery, formatPGSQuery)
 import Gargantext.Prelude
 import Opaleye hiding (FromField)
+import Prelude (Enum, Bounded, minBound, maxBound, Functor)
 import Servant (FromHttpApiData, parseUrlPiece, Proxy(..))
 import Text.Read (read)
-import Data.Swagger (ToParamSchema, toParamSchema, ToSchema)
-import Prelude (Enum, Bounded, minBound, maxBound, Functor)
 import qualified Database.PostgreSQL.Simple as PGS
 
 

src/Gargantext/Database/Admin/Schema/Node.hs → src/Gargantext/Database/Schema/Node.hs

@@ -37,12 +37,12 @@ import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import GHC.Int (Int64)
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Individu (User(..))
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Node.Contact (HyperdataContact(..), arbitraryHyperdataContact)
-import Gargantext.Database.Query.Filter (limit', offset')
-import Gargantext.Database.Types.Errors
-import Gargantext.Database.Types.Node (NodeType(..), defaultCorpus, Hyperdata, HyperData(..))
-import Gargantext.Database.Utils
+import Gargantext.Database.Action.Query.Filter (limit', offset')
+import Gargantext.Database.Action.Query.Node.Contact (HyperdataContact(..), arbitraryHyperdataContact)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Errors
+import Gargantext.Database.Admin.Types.Node (NodeType(..), defaultCorpus, Hyperdata, HyperData(..))
+import Gargantext.Database.Admin.Utils
 import Gargantext.Prelude hiding (sum, head)
 import Gargantext.Viz.Graph (HyperdataGraph(..))
 import Opaleye hiding (FromField)

src/Gargantext/Database/Admin/Schema/NodeNgrams.hs → src/Gargantext/Database/Schema/NodeNgrams.hs

@@ -25,25 +25,24 @@ NodeNgrams register Context of Ngrams (named Cgrams then)
 {-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Admin.Schema.NodeNgrams where
+module Gargantext.Database.Schema.NodeNgrams where
 
-import Data.Map (Map)
-import qualified Data.Map as Map
-import qualified Data.List as List
 import Data.List.Extra (nubOrd)
+import Data.Map (Map)
+import Data.Maybe (Maybe, fromMaybe)
 import Data.Text (Text)
-import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
-import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Database.PostgreSQL.Simple.FromRow (fromRow, field)
-import Database.PostgreSQL.Simple.ToField (toField)
 import Database.PostgreSQL.Simple (FromRow)
+import Database.PostgreSQL.Simple.FromRow (fromRow, field)
 import Database.PostgreSQL.Simple.SqlQQ (sql)
--- import Control.Lens.TH (makeLenses)
-import Data.Maybe (Maybe, fromMaybe)
+import Database.PostgreSQL.Simple.ToField (toField)
+import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import Gargantext.Core.Types
-import Gargantext.Database.Utils
+import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Schema.Ngrams (NgramsType, ngramsTypeId, fromNgramsTypeId)
 import Gargantext.Prelude
+import qualified Data.List as List
+import qualified Data.Map as Map
+import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
 
 type NodeNgramsId = Int
 

src/Gargantext/Database/Admin/Schema/NodeNode.hs → src/Gargantext/Database/Schema/NodeNode.hs

@@ -24,24 +24,24 @@ commentary with @some markup@.
 {-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Admin.Schema.NodeNode where
+module Gargantext.Database.Schema.NodeNode where
 
+import Control.Arrow (returnA)
 import Control.Lens (view, (^.))
-import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
-import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Control.Lens.TH (makeLenses)
 import Data.Maybe (Maybe, catMaybes)
-import Data.Text (Text, splitOn)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
-import Gargantext.Database.Tools.Node (pgNodeId)
+import Data.Text (Text, splitOn)
+import Database.PostgreSQL.Simple.SqlQQ (sql)
+import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import Gargantext.Core.Types
-import Gargantext.Database.Utils
-import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Types.Node (CorpusId, DocId)
+import Gargantext.Database.Action.Query.Node (pgNodeId)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Node (CorpusId, DocId)
+import Gargantext.Database.Admin.Utils
 import Gargantext.Prelude
 import Opaleye
-import Control.Arrow (returnA)
+import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
 import qualified Opaleye as O
 
 data NodeNodePoly node1_id node2_id score cat

src/Gargantext/Database/Admin/Schema/NodeNodeNgrams.hs → src/Gargantext/Database/Schema/NodeNodeNgrams.hs

@@ -20,16 +20,16 @@ Portability : POSIX
 {-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Admin.Schema.NodeNodeNgrams
+module Gargantext.Database.Schema.NodeNodeNgrams
   where
 
 import Prelude
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Control.Lens.TH (makeLenses)
-import Gargantext.Database.Utils (Cmd, mkCmd)
+import Gargantext.Database.Admin.Utils (Cmd, mkCmd)
 import Gargantext.Database.Schema.Ngrams (NgramsTypeId, pgNgramsTypeId, NgramsId)
-import Gargantext.Database.Tools.Node (pgNodeId)
-import Gargantext.Database.Types.Node
+import Gargantext.Database.Action.Query.Node (pgNodeId)
+import Gargantext.Database.Admin.Types.Node
 import Opaleye
 
 data NodeNodeNgramsPoly n1 n2 ngrams_id ngt w

src/Gargantext/Database/Admin/Schema/NodeNodeNgrams2.hs → src/Gargantext/Database/Schema/NodeNodeNgrams2.hs

@@ -20,17 +20,17 @@ Portability : POSIX
 {-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Admin.Schema.NodeNodeNgrams2
+module Gargantext.Database.Schema.NodeNodeNgrams2
   where
 
-import Prelude
-import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Control.Lens.TH (makeLenses)
-import Gargantext.Database.Utils (Cmd, mkCmd)
+import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Gargantext.Database.Schema.NodeNgrams (NodeNgramsId)
-import Gargantext.Database.Tools.Node (pgNodeId)
-import Gargantext.Database.Types.Node
+import Gargantext.Database.Action.Query.Node (pgNodeId)
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Utils (Cmd, mkCmd)
 import Opaleye
+import Prelude
 
 data NodeNodeNgrams2Poly node_id nodengrams_id w
    = NodeNodeNgrams2 { _nnng2_node_id      :: node_id

src/Gargantext/Database/Admin/Schema/Node_NodeNgramsNodeNgrams.hs → src/Gargantext/Database/Schema/Node_NodeNgramsNodeNgrams.hs

@@ -33,15 +33,15 @@ Next Step benchmark:
 {-# LANGUAGE TemplateHaskell        #-}
 {-# OPTIONS_GHC -fno-warn-orphans   #-}
 
-module Gargantext.Database.Admin.Schema.Node_NodeNgramsNodeNgrams
+module Gargantext.Database.Schema.Node_NodeNgramsNodeNgrams
   where
 
 import Control.Lens.TH (makeLensesWith, abbreviatedFields)
 import Data.Maybe (Maybe)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
-import Gargantext.Database.Utils (Cmd, runOpaQuery, mkCmd)
-import Gargantext.Database.Types.Node (CorpusId)
-import Gargantext.Database.Tools.Node (pgNodeId)
+import Gargantext.Database.Admin.Utils (Cmd, runOpaQuery, mkCmd)
+import Gargantext.Database.Admin.Types.Node (CorpusId)
+import Gargantext.Database.Action.Query.Node (pgNodeId)
 import Gargantext.Prelude
 import Opaleye
 

src/Gargantext/Database/Admin/Schema/NodesNgramsRepo.hs → src/Gargantext/Database/Schema/NodesNgramsRepo.hs

@@ -25,7 +25,7 @@ Portability : POSIX
 {-# LANGUAGE TemplateHaskell            #-}
 
 
-module Gargantext.Database.Admin.Schema.NodesNgramsRepo
+module Gargantext.Database.Schema.NodesNgramsRepo
   where
 
 import Control.Arrow (returnA)
@@ -34,8 +34,8 @@ import Data.Map.Strict.Patch (PatchMap)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Gargantext.API.Ngrams (NgramsStatePatch, NgramsTablePatch)
 import Gargantext.Database.Schema.Ngrams (NgramsType)
-import Gargantext.Database.Types.Node (NodeId)
-import Gargantext.Database.Utils (mkCmd, Cmd, runOpaQuery)
+import Gargantext.Database.Admin.Types.Node (NodeId)
+import Gargantext.Database.Admin.Utils (mkCmd, Cmd, runOpaQuery)
 import Gargantext.Prelude
 import Opaleye
 

src/Gargantext/Database/Admin/Schema/User.hs → src/Gargantext/Database/Schema/User.hs

@@ -23,7 +23,7 @@ Functions to deal with users, database side.
 {-# LANGUAGE OverloadedStrings           #-}
 {-# LANGUAGE RankNTypes                  #-}
 
-module Gargantext.Database.Admin.Schema.User where
+module Gargantext.Database.Schema.User where
 
 import Control.Arrow (returnA)
 import Control.Lens.TH (makeLensesWith, abbreviatedFields)
@@ -35,8 +35,8 @@ import Data.Text (Text)
 import Data.Time (UTCTime)
 import GHC.Show(Show(..))
 import Gargantext.Core.Types.Individu (Username, arbitraryUsername, User(..), UserId)
-import Gargantext.Database.Types.Errors
-import Gargantext.Database.Utils
+import Gargantext.Database.Admin.Types.Errors
+import Gargantext.Database.Admin.Utils
 import Gargantext.Prelude
 import Opaleye
 

src/Gargantext/Ext/IMTUser.hs

@@ -27,7 +27,7 @@ import Data.Text (Text)
 import GHC.Generics (Generic)
 import Gargantext.Prelude
 
-import Gargantext.Database.Node.Contact -- (HyperdataContact, ContactWho, ContactWhere, ContactTouch, ContactMetaData)
+import Gargantext.Database.Admin.Node.Contact -- (HyperdataContact, ContactWho, ContactWhere, ContactTouch, ContactMetaData)
 import qualified Data.ByteString.Lazy as BSL
 
 instance Serialise IMTUser