[Database][Schema] Node

src/Gargantext/API/Node.hs

@@ -51,7 +51,7 @@ import Servant
 import Gargantext.API.Ngrams (TabType(..), TableNgramsApi, TableNgramsApiGet,tableNgramsPatch, getTableNgrams, NgramsIdPatchsFeed, NgramsIdPatchsBack, NgramsTable)
 import Gargantext.Prelude
 import Gargantext.Database.Types.Node
-import Gargantext.Database.Node ( runCmd
+import Gargantext.Database.Schema.Node ( runCmd
                                 , getNodesWithParentId
                                 , getNode
                                 , deleteNode, deleteNodes, mk, JSONB)

src/Gargantext/Database/Bashql.hs

@@ -81,7 +81,7 @@ import Data.List (concat, last)
 
 import Gargantext.Core.Types
 import Gargantext.Database.Utils (connectGargandb)
-import Gargantext.Database.Node
+import Gargantext.Database.Schema.Node
 import qualified Gargantext.Database.Node.Update as U (Update(..), update)
 import Gargantext.Prelude
 

src/Gargantext/Database/Facet.hs

@@ -45,7 +45,7 @@ import Gargantext.Core.Types
 import Gargantext.Core.Utils.Prefix (unPrefix)
 import Gargantext.Database.Config (nodeTypeId)
 import Gargantext.Database.Schema.Ngrams
-import Gargantext.Database.Node
+import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeNgram
 import Gargantext.Database.Schema.NodeNode
 import Gargantext.Database.Queries

src/Gargantext/Database/Flow.hs

@@ -28,7 +28,7 @@ import Gargantext.Core.Types (NodePoly(..), ListType(..), listTypeId)
 import Gargantext.Database.Bashql (runCmd') -- , del)
 import Gargantext.Database.Config (userMaster, userArbitrary, corpusMasterName)
 import Gargantext.Database.Schema.Ngrams (insertNgrams, Ngrams(..), NgramsT(..), NgramsIndexed(..), indexNgramsT,  NgramsType(..), text2ngrams)
-import Gargantext.Database.Node (mkRoot, mkCorpus, Cmd(..), mkList, mkGraph, mkDashboard, mkAnnuaire, getCorporaWithParentId')
+import Gargantext.Database.Schema.Node (mkRoot, mkCorpus, Cmd(..), mkList, mkGraph, mkDashboard, mkAnnuaire, getCorporaWithParentId')
 import Gargantext.Database.Root (getRootCmd)
 import Gargantext.Database.Types.Node (NodeType(..), NodeId)
 import Gargantext.Database.Node.Document.Add    (add)

src/Gargantext/Database/Flow/Pairing.hs

@@ -36,7 +36,7 @@ import Gargantext.Database.Schema.Ngrams -- (NgramsType(..))
 --import Gargantext.Database.Types.Node -- (Hyperdata(..))
 import Gargantext.Database.Node.Contact
 import Gargantext.Database.Flow.Utils
-import Gargantext.Database.Node (Cmd, mkCmd)
+import Gargantext.Database.Schema.Node (Cmd, mkCmd)
 import Gargantext.Database.Node.Children
 import Gargantext.Core.Types.Main
 import Gargantext.Core.Types (NodeType(..))

src/Gargantext/Database/Flow/Utils.hs

@@ -20,7 +20,7 @@ import qualified Data.Map as DM
 import Gargantext.Prelude
 import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Types.Node (NodeId, Node, NodePoly(..), Hyperdata)
-import Gargantext.Database.Node  -- (Cmd)
+import Gargantext.Database.Schema.Node  -- (Cmd)
 import Gargantext.Database.Schema.NodeNgram
 
 toMaps :: Hyperdata a => (a -> Map (NgramsT Ngrams) Int) -> [Node a] -> Map (NgramsT Ngrams) (Map NodeId Int)

src/Gargantext/Database/Node/Children.hs

@@ -20,7 +20,7 @@ module Gargantext.Database.Node.Children where
 import Database.PostgreSQL.Simple (Connection)
 import Opaleye
 import Gargantext.Core.Types
-import Gargantext.Database.Node
+import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeNode
 import Gargantext.Database.Config (nodeTypeId)
 import Gargantext.Database.Queries

src/Gargantext/Database/Node/Contact.hs

@@ -29,7 +29,7 @@ import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import GHC.Generics (Generic)
 import Gargantext.Core.Utils.Prefix (unPrefix)
 import Gargantext.Core.Types.Main (AnnuaireId, UserId)
-import Gargantext.Database.Node (NodeWrite', Name, node)
+import Gargantext.Database.Schema.Node (NodeWrite', Name, node)
 import Gargantext.Database.Types.Node (Node,Hyperdata,NodeType(..))
 import Gargantext.Database.Utils (fromField')
 import Gargantext.Prelude

src/Gargantext/Database/Node/Document/Add.hs

@@ -32,7 +32,7 @@ import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 
 import Data.Text (Text)
 
-import Gargantext.Database.Node (mkCmd, Cmd(..))
+import Gargantext.Database.Schema.Node (mkCmd, Cmd(..))
 import Gargantext.Database.Types.Node
 import Gargantext.Prelude
 

src/Gargantext/Database/Node/Document/Insert.hs

@@ -74,7 +74,7 @@ import Database.PostgreSQL.Simple.ToRow (ToRow(..))
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import GHC.Generics (Generic)
 import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Node (mkCmd, Cmd(..))
+import Gargantext.Database.Schema.Node (mkCmd, Cmd(..))
 import Gargantext.Database.Node.Contact -- (HyperdataContact(..), ContactWho(..))
 import Gargantext.Database.Types.Node
 import Gargantext.Prelude

src/Gargantext/Database/Root.hs

@@ -32,11 +32,11 @@ import Control.Arrow (returnA)
 import Gargantext.Prelude
 import Gargantext.Database.Types.Node (Node, NodePoly(..), NodeType(NodeUser), HyperdataUser)
 import Gargantext.Database.Queries (NodeRead)
-import Gargantext.Database.Node (queryNodeTable)
+import Gargantext.Database.Schema.Node (queryNodeTable)
 import Gargantext.Database.Schema.User (queryUserTable, UserPoly(..))
 import Gargantext.Database.Config (nodeTypeId)
 import Gargantext.Core.Types.Individu (Username)
-import Gargantext.Database.Node (Cmd(..), mkCmd)
+import Gargantext.Database.Schema.Node (Cmd(..), mkCmd)
 
 getRootCmd :: Username -> Cmd [Node HyperdataUser]
 getRootCmd u = mkCmd $ \c -> getRoot u c

src/Gargantext/Database/Schema/Ngrams.hs

@@ -41,7 +41,7 @@ import Debug.Trace (trace)
 import GHC.Generics (Generic)
 import Gargantext.Core.Types -- (fromListTypeId, ListType, NodePoly(Node))
 import Gargantext.Database.Config (nodeTypeId,userMaster)
-import Gargantext.Database.Node (mkCmd, Cmd(..),getListsWithParentId, getCorporaWithParentId)
+import Gargantext.Database.Schema.Node (mkCmd, Cmd(..),getListsWithParentId, getCorporaWithParentId)
 import Gargantext.Database.Root (getRoot)
 import Gargantext.Core.Types (CorpusId)
 import Gargantext.Database.Types.Node (NodeType)

src/Gargantext/Database/Schema/Node.hs

 {-|
-Module      : Gargantext.Database.Node
+Module      : Gargantext.Database.Schema.Node
 Description : Main requests of Node to the database
 Copyright   : (c) CNRS, 2017-Present
 License     : AGPL + CECILL v3
@@ -23,7 +23,7 @@ Portability : POSIX
 {-# LANGUAGE NoImplicitPrelude      #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Node where
+module Gargantext.Database.Schema.Node where
 
 import Control.Applicative (Applicative)
 import Control.Arrow (returnA)

src/Gargantext/Database/Schema/NodeNgram.hs

@@ -35,7 +35,7 @@ import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Gargantext.Core.Types.Main (ListId, ListTypeId)
-import Gargantext.Database.Node (mkCmd, Cmd(..))
+import Gargantext.Database.Schema.Node (mkCmd, Cmd(..))
 import Gargantext.Prelude
 import Opaleye
 import qualified Database.PostgreSQL.Simple as PGS (Connection, query, Only(..))

src/Gargantext/Database/Schema/NodeNgramsNgrams.hs

@@ -37,7 +37,7 @@ import Data.Maybe (Maybe)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Gargantext.Database.Node (mkCmd, Cmd(..))
+import Gargantext.Database.Schema.Node (mkCmd, Cmd(..))
 import Gargantext.Prelude
 import Opaleye
 import qualified Database.PostgreSQL.Simple as DPS

src/Gargantext/Database/Schema/NodeNode.hs

@@ -30,7 +30,7 @@ import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Control.Lens.TH (makeLensesWith, abbreviatedFields)
 import Data.Maybe (Maybe)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
-import Gargantext.Database.Node (Cmd(..), mkCmd)
+import Gargantext.Database.Schema.Node (Cmd(..), mkCmd)
 import Gargantext.Core.Types.Main (CorpusId, DocId)
 import Gargantext.Prelude
 import Opaleye

src/Gargantext/Database/Schema/User.hs

@@ -31,7 +31,7 @@ import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Data.Text (Text)
 import Data.Time (UTCTime)
 import GHC.Show(Show(..))
-import Gargantext.Database.Node (Cmd(..), mkCmd, runCmd)
+import Gargantext.Database.Schema.Node (Cmd(..), mkCmd, runCmd)
 import Gargantext.Core.Types.Individu (Username)
 import Gargantext.Prelude
 import Opaleye

src/Gargantext/Database/TextSearch.hs

@@ -27,7 +27,7 @@ import Gargantext.Database.Config (nodeTypeId)
 import Gargantext.Database.Types.Node (NodeType(..))
 import Gargantext.Prelude
 import Gargantext.Database.Facet
-import Gargantext.Database.Node
+import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Schema.NodeNode
 import Gargantext.Database.Schema.NodeNgram

src/Gargantext/Text/Flow.hs

@@ -29,7 +29,7 @@ import qualified Data.Map.Strict as M
 ----------------------------------------------
 import Gargantext.Database (Connection)
 
-import Gargantext.Database.Node
+import Gargantext.Database.Schema.Node
 import Gargantext.Database.Types.Node
 
 import Gargantext.Core (Lang)