[DB/FACT] fix warnings

bin/gargantext-import/Main.hs

@@ -28,7 +28,7 @@ import Gargantext.API.Admin.Types (GargError)
 import Gargantext.Core (Lang(..))
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Action.Flow (FlowCmdM, flowCorpusFile, flowAnnuaire, TermType(..))
-import Gargantext.Database.Action.Query.User (insertUsersDemo)
+import Gargantext.Database.Query.Table.User (insertUsersDemo)
 import Gargantext.Database.Admin.Types.Node (CorpusId, toHyperdataDocument)
 import Gargantext.Database.Admin.Utils (Cmd, )
 import Gargantext.Prelude

bin/gargantext-init/Main.hs

@@ -21,17 +21,17 @@ module Main where
 
 import Data.Either (Either(..))
 import Data.Maybe (Maybe(..))
-import Gargantext.API.Node () -- instances
 import Gargantext.API.Admin.Settings (withDevEnv, runCmdDev)
 import Gargantext.API.Admin.Types (GargError)
+import Gargantext.API.Node () -- instances
 import Gargantext.Core.Types.Individu (UserId, User(..))
 import Gargantext.Database.Action.Flow (getOrMkRoot, getOrMk_RootWithCorpus)
+import Gargantext.Database.Query.Table.Node (getOrMkList)
+import Gargantext.Database.Query.Table.User (insertUsersDemo)
 import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
 import Gargantext.Database.Admin.Trigger.Init (initTriggers)
 import Gargantext.Database.Admin.Types.Node (CorpusId, RootId, HyperdataCorpus, ListId)
 import Gargantext.Database.Admin.Utils (Cmd, )
-import Gargantext.Database.Action.Query.Node (getOrMkList)
-import Gargantext.Database.Action.Query.User (insertUsersDemo)
 import Gargantext.Prelude
 import System.Environment (getArgs)
 

package.yaml

@@ -36,8 +36,8 @@ library:
   - Gargantext.Core.Types.Main
   - Gargantext.Core.Utils.Prefix
   - Gargantext.Database.Action.Flow
-  - Gargantext.Database.Action.Query.User
-  - Gargantext.Database.Action.Query.Node
+  - Gargantext.Database.Query.Table.User
+  - Gargantext.Database.Query.Table.Node
   - Gargantext.Database.Admin.Utils
   - Gargantext.Database.Admin.Trigger.Init
   - Gargantext.Database.Admin.Config

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

@@ -26,29 +26,19 @@ module Gargantext.Database.Action.Flow.List
 
 import Control.Monad (mapM_)
 import Data.Map (Map, toList)
-import Data.Either
 import Data.Maybe (Maybe(..), catMaybes)
-import Data.Set (Set)
 import Data.Text (Text)
 import Gargantext.API.Ngrams (NgramsElement(..), putListNgrams)
-import Gargantext.Core (Lang(..))
-import Gargantext.Core.Types.Individu
 import Gargantext.Core.Flow.Types
 import Gargantext.Core.Types.Main (ListType(CandidateTerm))
 import Gargantext.Database.Action.Flow.Types
-import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
 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.Query.Table.NodeNgrams (NodeNgramsPoly(..), NodeNgramsW, listInsertDb, getCgramsId)
+import Gargantext.Database.Schema.Ngrams -- (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams,  NgramsType(..), text2ngrams, ngramsTypeId)
 import Gargantext.Database.Schema.Node_NodeNgramsNodeNgrams -- (insert_Node_NodeNgrams_NodeNgrams, Node_NodeNgrams_NodeNgrams(..))
 import Gargantext.Prelude
-import Gargantext.Text.List
 import qualified Data.List as List
 import qualified Data.Map  as Map
-import qualified Data.Set as Set
-import Gargantext.Database.Action.Metrics.NgramsByNode
-import Gargantext.Database.Query.Tree.Root (getOrMk_RootWithCorpus)
 
 -- FLOW LIST
 -- 1. select specific terms of the corpus when compared with others langs

src/Gargantext/Database/Action/Search.hs

@@ -36,7 +36,7 @@ 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.NodeNode
 import Gargantext.Database.Schema.NodeNodeNgrams
 import Gargantext.Prelude
 import Gargantext.Text.Terms.Mono.Stem.En (stemIt)

src/Gargantext/Database/Query/Table/NodeNode.hs

@@ -28,9 +28,7 @@ module Gargantext.Database.Query.Table.NodeNode where
 
 import Control.Arrow (returnA)
 import Control.Lens (view, (^.))
-import Control.Lens.TH (makeLenses)
-import Data.Maybe (Maybe, catMaybes)
-import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
+import Data.Maybe (catMaybes)
 import Data.Text (Text, splitOn)
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))

src/Gargantext/Database/Query/Table/User.hs

@@ -27,6 +27,12 @@ module Gargantext.Database.Query.Table.User
   ( insertUsers
   , queryUserTable
   , getUser
+  , gargantextUser
+  , insertUsersDemo
+  , selectUsersLight
+  , userWithUsername
+  , userWithId
+  , userLightWithId
   , module Gargantext.Database.Schema.User
   )
   where

src/Gargantext/Database/Schema/Node.hs

@@ -27,8 +27,6 @@ Portability : POSIX
 module Gargantext.Database.Schema.Node where
 
 import Control.Lens hiding (elements, (&))
-import Data.Text (Text)
-import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Schema.Prelude
 import Prelude hiding (null, id, map, sum)
 

src/Gargantext/Database/Schema/NodeNgrams.hs

@@ -26,17 +26,11 @@ NodeNgrams register Context of Ngrams (named Cgrams then)
 
 module Gargantext.Database.Schema.NodeNgrams where
 
-import Data.List.Extra (nubOrd)
-import Data.Map (Map)
-import Data.Maybe (Maybe, fromMaybe)
+import Data.Maybe (Maybe)
 import Data.Text (Text)
-import Gargantext.Database.Schema.Prelude
 import Gargantext.Core.Types
-import Gargantext.Database.Admin.Utils
-import Gargantext.Database.Schema.Ngrams (NgramsType, ngramsTypeId, fromNgramsTypeId)
+import Gargantext.Database.Schema.Ngrams (NgramsType)
 import Gargantext.Prelude
-import qualified Data.List as List
-import qualified Data.Map as Map
 
 
 data NodeNgramsPoly id

src/Gargantext/Database/Schema/NodeNode.hs

@@ -26,22 +26,11 @@ commentary with @some markup@.
 
 module Gargantext.Database.Schema.NodeNode where
 
-import Control.Arrow (returnA)
-import Control.Lens (view, (^.))
-import Control.Lens.TH (makeLenses)
-import Data.Maybe (Maybe, catMaybes)
-import Data.Text (Text, splitOn)
+import Data.Maybe (Maybe)
 import Gargantext.Core.Types
-import Gargantext.Database.Admin.Types.Node (pgNodeId)
-import Gargantext.Database.Admin.Config (nodeTypeId)
-import Gargantext.Database.Admin.Types.Node (CorpusId, DocId)
 import Gargantext.Database.Admin.Utils
-import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.Prelude
 import Gargantext.Prelude
-import Opaleye
-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/Schema/Node_NodeNgramsNodeNgrams.hs

@@ -43,7 +43,6 @@ import Gargantext.Database.Admin.Utils (Cmd, runOpaQuery, mkCmd)
 import Gargantext.Database.Admin.Types.Node (CorpusId, pgNodeId)
 import Gargantext.Database.Schema.Node()
 import Gargantext.Prelude
-import Opaleye
 
 data Node_NodeNgrams_NodeNgrams_Poly node_id nng1_id nng2_id weight =
   Node_NodeNgrams_NodeNgrams { _nnn_node_id :: !node_id

src/Gargantext/Database/Schema/NodesNgramsRepo.hs

@@ -35,7 +35,6 @@ import Gargantext.Database.Schema.Ngrams (NgramsType)
 import Gargantext.Database.Admin.Types.Node (NodeId)
 import Gargantext.Database.Admin.Utils (mkCmd, Cmd, runOpaQuery)
 import Gargantext.Prelude
-import Opaleye
 
 
 data RepoDbPoly version patches

src/Gargantext/Viz/Graph/API.hs

@@ -52,7 +52,7 @@ import Gargantext.Database.Query.Table.Node.Select
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.User
 import Gargantext.Database.Admin.Types.Errors (HasNodeError)
-import Gargantext.Database.Admin.Types.Node hiding (node_id) -- (GraphId, ListId, CorpusId, NodeId)
+import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Admin.Utils (Cmd)
 import Gargantext.Prelude