[refactoring] some refactoring of imports

src/Gargantext/Database/Action/Flow.hs

@@ -64,7 +64,6 @@ import Data.Set qualified as Set
 import Data.Text qualified as T
 import EPO.API.Client.Types qualified as EPO
 import Gargantext.API.Ngrams.Tools (getTermsWith)
-import Gargantext.Core.Text.Ngrams (NgramsType(NgramsTerms), Ngrams(_ngramsTerms))
 import Gargantext.Core (Lang(..), NLPServerConfig, withDefaultLanguage)
 import Gargantext.Core.Ext.IMTUser (readFile_Annuaire)
 import Gargantext.Core.NLP (HasNLPServer, nlpServerGet)
@@ -74,6 +73,7 @@ import Gargantext.Core.Text.Corpus.Parsers (parseFile, FileFormat, FileType)
 import Gargantext.Core.Text.List (buildNgramsLists)
 import Gargantext.Core.Text.List.Group.WithStem (GroupParams(..))
 import Gargantext.Core.Text.List.Social (FlowSocialListWith(..))
+import Gargantext.Core.Text.Ngrams (NgramsType(NgramsTerms), Ngrams(_ngramsTerms))
 import Gargantext.Core.Text.Terms
 import Gargantext.Core.Text.Terms.Mono.Stem (stem, StemmingAlgorithm(..))
 import Gargantext.Core.Types (HasValidationError, TermsCount)

src/Gargantext/Database/Query/Facet.hs

@@ -41,15 +41,15 @@ module Gargantext.Database.Query.Facet
 import Control.Arrow (returnA)
 import Control.Lens ((^.))
 import Data.Text qualified as T
-import Gargantext.Core
+import Gargantext.Core ( HasDBid(toDBid) )
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset, IsTrash)
 import Gargantext.Database.Prelude (DBCmd, runCountOpaQuery, runOpaQuery)
 import Gargantext.Database.Query.Facet.Types
-import Gargantext.Database.Query.Filter
-import Gargantext.Database.Query.Table.Context
+import Gargantext.Database.Query.Filter ( limit', offset' )
+import Gargantext.Database.Query.Table.Context ( queryContextSearchTable )
 import Gargantext.Database.Query.Table.ContextNodeNgrams
-import Gargantext.Database.Query.Table.Ngrams
+import Gargantext.Database.Query.Table.Ngrams ( NgramsRead, NgramsPoly(_ngrams_id), queryNgramsTable, ngrams_id )
 import Gargantext.Database.Query.Table.Node (defaultList)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Table.NodeContext (queryNodeContextTable)
@@ -58,7 +58,6 @@ import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeContext
 import Opaleye
 import Opaleye.Aggregate qualified as OAgg
-import Opaleye.Internal.Unpackspec ()
 import Protolude hiding (null, map, sum, not)
 
 ------------------------------------------------------------------------

src/Gargantext/Database/Query/Facet/Types.hs

@@ -5,18 +5,18 @@ module Gargantext.Database.Query.Facet.Types where
 import Data.Aeson (FromJSON, ToJSON)
 import Data.Aeson.TH (deriveJSON)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
-import Data.Swagger
-import qualified Data.Text as T
+import Data.Swagger ( ToParamSchema, ToSchema(..), genericDeclareNamedSchema )
+import Data.Text qualified as T
 import Data.Time (UTCTime)
 import Data.Time.Segment (jour)
-import Gargantext.Core.Types
+import Gargantext.Database.Admin.Types.Node ( NodeId )
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger, wellNamedSchema)
-import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument, arbitraryHyperdataDocuments)
+import Gargantext.Database.Admin.Types.Hyperdata.Document ( HyperdataDocument, arbitraryHyperdataDocuments )
 import Opaleye
 import Protolude hiding (null, map, sum, not)
 import Servant.API (FromHttpApiData(..), ToHttpApiData(..))
 import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary
+import Test.QuickCheck.Arbitrary ( Arbitrary(arbitrary) )
 
 -- | DocFacet
 

src/Gargantext/Database/Query/Filter.hs

@@ -10,9 +10,6 @@ Portability : POSIX
 
 
 
-{-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE TemplateHaskell        #-}
 {-# OPTIONS_GHC -fno-warn-orphans   #-}
 
 module Gargantext.Database.Query.Filter

src/Gargantext/Database/Query/Join.hs

@@ -15,10 +15,7 @@ Multiple Join functions with Opaleye.
 
 
 {-# LANGUAGE Arrows                    #-}
-{-# LANGUAGE FunctionalDependencies    #-}
-{-# LANGUAGE QuasiQuotes               #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
-{-# LANGUAGE TemplateHaskell           #-}
 
 ------------------------------------------------------------------------
 
@@ -36,11 +33,10 @@ module Gargantext.Database.Query.Join ( leftJoin2
   where
 
 import Control.Arrow ((>>>), returnA)
-import Data.Profunctor.Product.Default
-import Gargantext.Prelude
+import Data.Profunctor.Product.Default ( Default )
+import Gargantext.Prelude ( Applicative((<*>)), (<$>) )
 import Opaleye hiding (keepWhen)
 import Opaleye.Internal.Join (NullMaker(..))
-import qualified Opaleye.Internal.Unpackspec()
 
 
 keepWhen :: (a -> Field SqlBool) -> SelectArr a a

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

@@ -12,22 +12,20 @@ Portability : POSIX
 
 {-# LANGUAGE Arrows                 #-}
 {-# LANGUAGE ConstraintKinds        #-}
-{-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE TemplateHaskell        #-}
 {-# LANGUAGE TypeFamilies           #-}
 
 module Gargantext.Database.Query.Table.Context
   where
 
 import Control.Arrow (returnA)
-import Gargantext.Core
+import Gargantext.Core ( HasDBid(toDBid) )
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset)
-import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Hyperdata.Any ( HyperdataAny )
+import Gargantext.Database.Admin.Types.Hyperdata.Document ( HyperdataDocument, HyperdataDocumentV3 )
 import Gargantext.Database.Prelude (DBCmd, JSONB, runOpaQuery)
 import Gargantext.Database.Query.Filter (limit', offset')
-import Gargantext.Database.Query.Table.Node.Error
+import Gargantext.Database.Query.Table.Node.Error ( HasNodeError, nodeError, NodeError(NoContextFound) )
 import Gargantext.Database.Schema.Context
 import Gargantext.Prelude hiding (sum, head)
 import Opaleye            hiding (FromField)

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

@@ -11,9 +11,6 @@ Portability : POSIX
 
 {-#  OPTIONS_GHC -fno-warn-orphans  #-}
 
-{-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.ContextNodeNgrams
   ( module Gargantext.Database.Schema.ContextNodeNgrams

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

@@ -11,10 +11,6 @@ Portability : POSIX
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-{-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE TemplateHaskell        #-}
-
 module Gargantext.Database.Query.Table.ContextNodeNgrams2
   ( module Gargantext.Database.Schema.ContextNodeNgrams2
   , insertContextNodeNgrams2

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

@@ -30,7 +30,7 @@ import Data.List qualified as List
 import Data.Map.Strict qualified as Map
 import Database.PostgreSQL.Simple qualified as PGS
 import Gargantext.Core.Text.Ngrams (Ngrams, NgramsType)
-import Gargantext.Core.Types
+import Gargantext.Database.Admin.Types.Node ( pgNodeId, CorpusId, ListId, DocId )
 import Gargantext.Database.Prelude (runOpaQuery, formatPGSQuery, runPGSQuery, DBCmd)
 import Gargantext.Database.Query.Join (leftJoin3)
 import Gargantext.Database.Query.Table.ContextNodeNgrams2
@@ -38,7 +38,7 @@ import Gargantext.Database.Query.Table.NodeNgrams (queryNodeNgramsTable)
 import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Schema.NodeNgrams
 import Gargantext.Database.Schema.Prelude
-import Gargantext.Database.Types
+import Gargantext.Database.Types ( Indexed(Indexed) )
 import Gargantext.Prelude
 
 queryNgramsTable :: Select NgramsRead

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

@@ -14,7 +14,6 @@ Portability : POSIX
 {-# LANGUAGE ConstraintKinds        #-}
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE QuasiQuotes            #-}
-{-# LANGUAGE TemplateHaskell        #-}
 {-# LANGUAGE TypeFamilies           #-}
 {-# LANGUAGE ViewPatterns           #-}
 
@@ -23,14 +22,19 @@ module Gargantext.Database.Query.Table.Node
 
 import Control.Arrow (returnA)
 import Control.Lens (set, view)
-import Data.Aeson
+import Data.Aeson ( encode, Value, ToJSON )
 import Database.PostgreSQL.Simple qualified as PGS
 import Database.PostgreSQL.Simple.SqlQQ (sql)
-import Gargantext.Core
+import Gargantext.Core ( HasDBid(toDBid) )
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset)
-import Gargantext.Database.Admin.Types.Hyperdata
-import Gargantext.Database.Admin.Types.Hyperdata.Default
+import Gargantext.Database.Admin.Types.Hyperdata.Any ( HyperdataAny )
+import Gargantext.Database.Admin.Types.Hyperdata.Corpus ( HyperdataAnnuaire, HyperdataCorpus )
+import Gargantext.Database.Admin.Types.Hyperdata.Document ( HyperdataDocument, HyperdataDocumentV3 )
+import Gargantext.Database.Admin.Types.Hyperdata.List ( HyperdataList )
+import Gargantext.Database.Admin.Types.Hyperdata.Model ( HyperdataModel )
+import Gargantext.Database.Admin.Types.Hyperdata.Prelude ( Hyperdata )
+import Gargantext.Database.Admin.Types.Hyperdata.Default ( defaultHyperdata, DefaultHyperdata(..) )
 import Gargantext.Database.Prelude (DBCmd, JSONB, mkCmd, runPGSQuery, runOpaQuery)
 import Gargantext.Database.Query.Filter (limit', offset')
 import Gargantext.Database.Query.Table.Node.Error

src/Gargantext/Database/Query/Table/Node/Children.hs

@@ -10,23 +10,22 @@ Portability : POSIX
 
 
 {-# OPTIONS_GHC -fno-warn-orphans        #-}
-
 {-# LANGUAGE Arrows                      #-}
 
 module Gargantext.Database.Query.Table.Node.Children
   where
 
 import Control.Arrow (returnA)
-import Data.Proxy
-import Gargantext.Core
+import Gargantext.Core ( HasDBid(toDBid) )
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Query (Limit, Offset)
-import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument, HyperdataContact)
+import Gargantext.Database.Admin.Types.Hyperdata.Contact ( HyperdataContact )
+import Gargantext.Database.Admin.Types.Hyperdata.Document ( HyperdataDocument )
 import Gargantext.Database.Prelude (DBCmd, JSONB, runCountOpaQuery, runOpaQuery)
-import Gargantext.Database.Query.Filter
-import Gargantext.Database.Query.Table.NodeContext
+import Gargantext.Database.Query.Filter ( limit', offset' )
+import Gargantext.Database.Query.Table.NodeContext ( NodeContextPoly(NodeContext), queryNodeContextTable )
 import Gargantext.Database.Schema.Context
-import Gargantext.Database.Schema.Node
+import Gargantext.Database.Schema.Node ( NodeRead, NodePoly(Node, _node_id), queryNodeTable )
 import Gargantext.Prelude
 import Opaleye
 

src/Gargantext/Database/Query/Table/Node/Contact.hs

@@ -13,7 +13,7 @@ module Gargantext.Database.Query.Table.Node.Contact
   where
 
 import Gargantext.Database.Admin.Types.Node ( Node)
-import Gargantext.Database.Admin.Types.Hyperdata.Contact
+import Gargantext.Database.Admin.Types.Hyperdata.Contact ( HyperdataContact )
 
 ------------------------------------------------------------------------
 

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

@@ -20,11 +20,11 @@ module Gargantext.Database.Query.Table.Node.Document.Add
   where
 
 import Database.PostgreSQL.Simple (Query, Only(..))
-import Database.PostgreSQL.Simple.SqlQQ
+import Database.PostgreSQL.Simple.SqlQQ ( sql )
 import Database.PostgreSQL.Simple.ToField (toField)
 import Database.PostgreSQL.Simple.ToRow (ToRow(..))
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node ( CorpusId, ContextId, NodeId, ParentId )
 import Gargantext.Database.Prelude (runPGSQuery, formatPGSQuery, DBCmd)
 import Gargantext.Prelude
 

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

@@ -66,7 +66,8 @@ import Database.PostgreSQL.Simple.SqlQQ ( sql )
 import Database.PostgreSQL.Simple.ToField (toField, Action{-, ToField-})
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import Gargantext.Core (HasDBid(toDBid))
-import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Hyperdata.Contact ( HyperdataContact )
+import Gargantext.Database.Admin.Types.Hyperdata.Document ( HyperdataDocument(..) )
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude (runPGSQuery, DBCmd{-, formatPGSQuery-})
 import Gargantext.Database.Schema.Node (NodePoly(..))

src/Gargantext/Database/Query/Table/Node/Error.hs

@@ -27,9 +27,9 @@ module Gargantext.Database.Query.Table.Node.Error (
   ) where
 
 import Control.Lens (Prism', (#), (^?))
-import Data.Aeson
+import Data.Aeson ( object, ToJSON(toJSON) )
 import Data.Text qualified as T
-import Gargantext.Core.Types.Individu
+import Gargantext.Core.Types.Individu ( renderUser, User, Username )
 import Gargantext.Database.Admin.Types.Node (ListId, NodeId(..), ContextId, UserId, ParentId)
 import Gargantext.Prelude hiding (sum, head)
 import Prelude hiding (null, id, map, sum, show)

src/Gargantext/Database/Query/Table/Node/Select.hs

@@ -16,12 +16,12 @@ module Gargantext.Database.Query.Table.Node.Select
   where
 
 import Control.Arrow (returnA)
-import Gargantext.Core
-import Gargantext.Core.Types
+import Gargantext.Core ( HasDBid(toDBid) )
+import Gargantext.Database.Admin.Types.Node ( NodeType, NodeId )
 import Gargantext.Core.Types.Individu (Username)
 import Gargantext.Database.Prelude (DBCmd, runOpaQuery)
-import Gargantext.Database.Query.Table.User
-import Gargantext.Database.Schema.Node
+import Gargantext.Database.Query.Table.User ( UserPoly(user_username, user_id), queryUserTable )
+import Gargantext.Database.Schema.Node ( NodePoly(_node_id, _node_user_id, _node_typename), queryNodeTable )
 import Opaleye
 import Protolude
 

src/Gargantext/Database/Query/Table/Node/Update.hs

@@ -9,18 +9,15 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE QuasiQuotes       #-}
-
 module Gargantext.Database.Query.Table.Node.Update (Update(..), update)
   where
 
-import qualified Data.Text as DT
-import Database.PostgreSQL.Simple
-
-import Gargantext.Prelude
+import Data.Text qualified as DT
+import Database.PostgreSQL.Simple ( Only(Only) )
 import Gargantext.Core.Types (Name)
-import Gargantext.Database.Prelude (DBCmd, runPGSQuery)
 import Gargantext.Database.Admin.Types.Node (NodeId, ParentId)
+import Gargantext.Database.Prelude (DBCmd, runPGSQuery)
+import Gargantext.Prelude
 
 -- import Data.ByteString
 --rename :: NodeId -> Text -> IO ByteString

src/Gargantext/Database/Query/Table/Node/UpdateOpaleye.hs

@@ -9,19 +9,16 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE QuasiQuotes       #-}
-
-
 module Gargantext.Database.Query.Table.Node.UpdateOpaleye
   where
 
 import Data.Aeson (encode)
-import Gargantext.Core
-import Gargantext.Database.Admin.Types.Hyperdata
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Core ( HasDBid )
+import Gargantext.Database.Admin.Types.Hyperdata.Prelude ( HyperdataC )
+import Gargantext.Database.Admin.Types.Node (NodeType, pgNodeId, NodeId)
 import Gargantext.Database.Prelude (mkCmd, DBCmd)
-import Gargantext.Database.Query.Table.Node
-import Gargantext.Database.Query.Table.Node.Error
+import Gargantext.Database.Query.Table.Node ( getNodeWithType, getNodesIdWithType, getNodesWithType )
+import Gargantext.Database.Query.Table.Node.Error ( HasNodeError )
 import Gargantext.Database.Schema.Node
 import Gargantext.Prelude
 import Opaleye

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

@@ -12,13 +12,13 @@ Portability : POSIX
 module Gargantext.Database.Query.Table.Node.User
   where
 
-import Gargantext.Core
+import Gargantext.Core ( HasDBid )
 import Gargantext.Core.Types (Name)
-import Gargantext.Database.Admin.Types.Hyperdata (HyperdataUser(..), defaultHyperdataUser)
+import Gargantext.Database.Admin.Types.Hyperdata.User ( HyperdataUser(..), defaultHyperdataUser )
 import Gargantext.Database.Admin.Types.Node (Node, NodeId(..), UserId, NodeType(..), pgNodeId)
 import Gargantext.Database.Prelude (DBCmd, runOpaQuery)
-import Gargantext.Database.Query.Table.Node
-import Gargantext.Database.Schema.Node -- (Node(..))
+import Gargantext.Database.Query.Table.Node ( node, selectNode )
+import Gargantext.Database.Schema.Node ( NodeWrite ) -- (Node(..))
 import Gargantext.Prelude
 import Opaleye (limit)
 

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

@@ -10,7 +10,6 @@ Portability : POSIX
 
 {-# LANGUAGE Arrows                 #-}
 {-# LANGUAGE QuasiQuotes            #-}
-{-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.NodeContext_NodeContext
   ( module Gargantext.Database.Schema.NodeContext_NodeContext
@@ -20,10 +19,10 @@ module Gargantext.Database.Query.Table.NodeContext_NodeContext
   where
 
 import Database.PostgreSQL.Simple qualified as PGS
-import Gargantext.Core.Types
+import Gargantext.Database.Admin.Types.Node ( ContactId, CorpusId, AnnuaireId, DocId )
 import Gargantext.Database.Prelude (DBCmd, runPGSQuery)
 import Gargantext.Database.Schema.NodeContext_NodeContext
-import Gargantext.Database.Schema.Prelude hiding (sum)
+import Gargantext.Database.Schema.Prelude ( QualifiedIdentifier(QualifiedIdentifier), Values(Values), sql )
 import Gargantext.Prelude
 
 {-

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

@@ -30,9 +30,9 @@ import Data.List.Extra (nubOrd)
 import Data.Map.Strict qualified as Map
 import Data.Maybe (fromJust)
 import Database.PostgreSQL.Simple qualified as PGS (Query, Only(..))
-import Gargantext.Core
+import Gargantext.Core ( HasDBid(toDBid) )
 import Gargantext.Core.Text.Ngrams (NgramsType)
-import Gargantext.Core.Types
+import Gargantext.Database.Admin.Types.Node ( ListId )
 import Gargantext.Database.Prelude (DBCmd, runPGSQuery)
 import Gargantext.Database.Schema.Ngrams (fromNgramsTypeId)
 import Gargantext.Database.Schema.NodeNgrams

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

@@ -16,7 +16,6 @@ commentary with @some markup@.
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE LambdaCase             #-}
 {-# LANGUAGE QuasiQuotes            #-}
-{-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.NodeNode
   ( module Gargantext.Database.Schema.NodeNode

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

@@ -11,10 +11,6 @@ Portability : POSIX
 
 {-#  OPTIONS_GHC -fno-warn-orphans  #-}
 
-{-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE TemplateHaskell        #-}
-
 module Gargantext.Database.Query.Table.NodeNodeNgrams
   ( module Gargantext.Database.Schema.NodeNodeNgrams
   , queryNodeNodeNgramsTable

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

@@ -23,11 +23,6 @@ Next Step benchmark:
 
 {-# OPTIONS_GHC -fno-warn-orphans   #-}
 
-{-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE QuasiQuotes            #-}
-{-# LANGUAGE TemplateHaskell        #-}
-
 module Gargantext.Database.Query.Table.Node_NodeNgramsNodeNgrams
   where
 

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

@@ -11,11 +11,6 @@ Portability : POSIX
 
 {-# OPTIONS_GHC -fno-warn-orphans   #-}
 
-{-# LANGUAGE Arrows                     #-}
-{-# LANGUAGE FunctionalDependencies     #-}
-{-# LANGUAGE QuasiQuotes                #-}
-{-# LANGUAGE TemplateHaskell            #-}
-
 module Gargantext.Database.Query.Table.NodesNgramsRepo
   where
 

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

@@ -15,9 +15,6 @@ Functions to deal with users, database side.
 {-# OPTIONS_GHC -fno-warn-orphans        #-}
 
 {-# LANGUAGE Arrows                      #-}
-{-# LANGUAGE FunctionalDependencies      #-}
-{-# LANGUAGE QuasiQuotes            #-}
-{-# LANGUAGE TemplateHaskell             #-}
 {-# LANGUAGE ViewPatterns #-}
 
 module Gargantext.Database.Query.Table.User
@@ -53,16 +50,14 @@ module Gargantext.Database.Query.Table.User
 import Control.Arrow (returnA)
 import Control.Lens ((^.), (?~))
 import Data.List.NonEmpty qualified as NE
-import Data.Proxy
 import Data.Time (UTCTime)
 import Data.UUID qualified as UUID
 import Gargantext.Core (HasDBid, toDBid)
 import Gargantext.Core.Types.Individu
 import Gargantext.Database.Admin.Config ()
-import Gargantext.Database.Admin.Types.Hyperdata (HyperdataUser(..), hu_pubmed_api_key, hu_epo_api_user, hu_epo_api_token)
-import Gargantext.Database.Admin.Types.Node (NodeType(NodeUser), Node, NodeId(..), pgNodeId)
-import Gargantext.Database.Admin.Types.Node (UserId(..))
-import Gargantext.Database.Prelude
+import Gargantext.Database.Admin.Types.Hyperdata.User ( HyperdataUser(..), hu_pubmed_api_key, hu_epo_api_user, hu_epo_api_token )
+import Gargantext.Database.Admin.Types.Node (NodeType(NodeUser), Node, NodeId(..), UserId(..), pgNodeId)
+import Gargantext.Database.Prelude ( DBCmd, runOpaQuery, mkCmd )
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateNodeWithType)
 import Gargantext.Database.Schema.Node (NodeRead, node_hyperdata, queryNodeTable, node_id, node_user_id, node_typename)

src/Gargantext/Database/Query/Tree/Error.hs

@@ -9,17 +9,15 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE QuasiQuotes       #-}
-
 module Gargantext.Database.Query.Tree.Error
   where
 
 import Control.Lens (Prism', (#))
-import Gargantext.Core.Types
+import Data.List.NonEmpty qualified as NE
+import Data.Text qualified as T
+import Gargantext.Database.Admin.Types.Node ( NodeId )
 import Gargantext.Prelude
 import Prelude qualified
-import qualified Data.List.NonEmpty as NE
-import qualified Data.Text as T
 
 ------------------------------------------------------------------------
 data TreeError = NoRoot