[refactor] some import refactorings

gargantext.cabal

@@ -147,6 +147,7 @@ library
       Gargantext.API.Node.Update
       Gargantext.API.Node.Update.Types
       Gargantext.API.Prelude
+      Gargantext.API.Public.Types
       Gargantext.API.Routes
       Gargantext.API.Routes.Named
       Gargantext.API.Routes.Named.Annuaire
@@ -170,6 +171,7 @@ library
       Gargantext.API.Routes.Named.Tree
       Gargantext.API.Routes.Named.Viz
       Gargantext.API.Routes.Types
+      Gargantext.API.Search.Types
       Gargantext.API.Types
       Gargantext.API.Viz.Types
       Gargantext.API.Worker
@@ -332,9 +334,7 @@ library
       Gargantext.API.Node.DocumentsFromWriteNodes
       Gargantext.API.Node.FrameCalcUpload
       Gargantext.API.Node.New
-      Gargantext.API.Public.Types
       Gargantext.API.Search
-      Gargantext.API.Search.Types
       Gargantext.API.Server.Named
       Gargantext.API.Server.Named.EKG
       Gargantext.API.Server.Named.Ngrams

src/Gargantext/API/Admin/Auth.hs

@@ -51,8 +51,9 @@ import Data.UUID.V4 (nextRandom)
 import Gargantext.API.Admin.Auth.Types
 import Gargantext.API.Admin.EnvTypes (Env)
 import Gargantext.API.Auth.PolicyCheck
-import Gargantext.API.Errors
+import Gargantext.API.Errors (BackendInternalError(..), HasAuthenticationError, _AuthenticationError)
 import Gargantext.API.Prelude (authenticationError, HasServerError, GargServerC, _ServerError, GargM, IsGargServer)
+import Gargantext.API.Routes.Named qualified as Named
 import Gargantext.API.Worker (serveWorkerAPI)
 import Gargantext.Core.Config (HasJWTSettings(..))
 import Gargantext.Core.Mail (MailModel(..), mail)
@@ -69,11 +70,9 @@ import Gargantext.Database.Schema.Node (NodePoly(_node_id))
 import Gargantext.Prelude hiding (Handler, reverse, to)
 import Gargantext.Prelude.Crypto.Auth qualified as Auth
 import Gargantext.Prelude.Crypto.Pass.User (gargPass)
-import Servant
-import Servant.API.Generic ()
-import Servant.Auth.Server
-import Servant.Server.Generic
-import qualified Gargantext.API.Routes.Named as Named
+import Servant (HasServer, ServerT, NamedRoutes, errBody, hoistServer, err404)
+import Servant.Auth.Server (makeJWT)
+import Servant.Server.Generic (AsServerT)
 
 ---------------------------------------------------
 

src/Gargantext/API/Admin/Auth/Types.hs

@@ -47,7 +47,7 @@ import Gargantext.Core.Types.Individu (Username, GargPassword(..), arbitraryUser
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
 import Gargantext.Database.Admin.Types.Node (NodeId(..), ListId, DocId, UserId (..))
 import Gargantext.Prelude hiding (reverse)
-import Servant.Auth.Server
+import Servant.Auth.Server (CookieSettings, JWTSettings, ToJWT, FromJWT)
 import Test.QuickCheck (elements)
 import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
 

src/Gargantext/API/Admin/EnvTypes.hs

--- |
+{-|
+Module      : Gargantext.API.Admin.EnvTypes
+Description : Env definitions in which the Gargantext app is run
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
 
 {-# LANGUAGE TemplateHaskell     #-}
 {-# LANGUAGE TypeFamilies        #-}
@@ -25,15 +35,13 @@ module Gargantext.API.Admin.EnvTypes (
   , DevJobHandle(..)
   ) where
 
-import Control.Lens hiding (Level, (:<), (.=))
-import Control.Monad.Except
-import Control.Monad.Reader
+import Control.Lens (to, view)
 import Data.List ((\\))
 import Data.Pool (Pool)
 import Data.Text qualified as T
 import Database.PostgreSQL.Simple (Connection)
-import Gargantext.API.Admin.Orchestrator.Types
-import Gargantext.API.Errors.Types
+import Gargantext.API.Admin.Orchestrator.Types (JobLog, noJobLog)
+import Gargantext.API.Errors.Types (BackendInternalError)
 import Gargantext.API.Prelude (GargM, IsGargServer)
 import Gargantext.Core.Notifications.CentralExchange qualified as CE
 import Gargantext.Core.Notifications.CentralExchange.Types qualified as CET
@@ -51,6 +59,7 @@ import Network.HTTP.Client (Manager)
 import Servant.Auth.Server (JWTSettings)
 import System.Log.FastLogger qualified as FL
 
+
 data Mode = Dev | Mock | Prod
   deriving (Show, Read, Generic)
 

src/Gargantext/API/Admin/Orchestrator/Types.hs

+{-|
+Module      : Gargantext.API.Admin.Orchestrator.Types
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE TemplateHaskell    #-}
 {-# LANGUAGE TypeOperators      #-}
@@ -5,17 +17,12 @@
 module Gargantext.API.Admin.Orchestrator.Types
   where
 
-import Control.Lens hiding (elements)
-import Data.Aeson
+import Data.Aeson (genericParseJSON, genericToJSON)
 import Data.Morpheus.Types ( GQLType, typeOptions )
-import Data.Proxy
-import Data.Swagger hiding (URL, url, port)
-import GHC.Generics hiding (to)
+import Data.Swagger (ToParamSchema, ToSchema, declareNamedSchema, defaultSchemaOptions, genericDeclareNamedSchemaUnrestricted)
 import Gargantext.API.GraphQL.UnPrefix qualified as GQLU
 import Gargantext.Core.Types (TODO(..))
 import Gargantext.Prelude
-import Servant
-import Servant.Job.Async
 import Servant.Job.Types
 import Servant.Job.Utils (jsonOptions)
 import Test.QuickCheck (elements)
@@ -51,24 +58,6 @@ instance ToSchema ExternalAPIs where
 instance ToSchema URL where
   declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy TODO)
 
-data ScraperInput = ScraperInput
-  { _scin_spider       :: !Text
-  , _scin_query        :: !(Maybe Text)
-  , _scin_user         :: !Text
-  , _scin_corpus       :: !Int
-  , _scin_report_every :: !(Maybe Int)
-  , _scin_limit        :: !(Maybe Int)
-  , _scin_local_file   :: !(Maybe Text)
-  , _scin_count_only   :: !(Maybe Bool)
-  }
-  deriving Generic
-
-makeLenses ''ScraperInput
-
-instance FromJSON ScraperInput where
-  parseJSON = genericParseJSON $ jsonOptions "_scin_"
-
--- Proposal to replace the Corpus.API.Query type which seems to generically named.
 
 data ScraperEvent = ScraperEvent
   { _scev_message :: !(Maybe Text)
@@ -117,19 +106,9 @@ instance ToSchema JobLog -- TODO _scst_ prefix
 instance GQLType JobLog where
   typeOptions _ = GQLU.unPrefix "_scst_"
 
-instance ToSchema ScraperInput  -- TODO _scin_ prefix
-
 instance ToParamSchema Offset -- where
   -- toParamSchema = panic "TODO"
 
 instance ToParamSchema Limit -- where
   -- toParamSchema = panic "TODO"
 
-type ScrapersEnv = JobEnv JobLog JobLog
-
-type ScraperAPI  = AsyncJobsAPI JobLog ScraperInput  JobLog
-
-------------------------------------------------------------------------
-data AsyncJobs event ctI input output mode = AsyncJobs
-  { asyncJobsAPI' :: mode :- AsyncJobsAPI' 'Unsafe 'Safe ctI '[JSON] Maybe event input output }
-  deriving Generic

src/Gargantext/API/Admin/Settings.hs

@@ -16,7 +16,7 @@ TODO-SECURITY: Critical
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Gargantext.API.Admin.Settings
-    where
+where
 
 
 import Codec.Serialise (Serialise(), serialise)
@@ -24,15 +24,15 @@ import Data.ByteString.Lazy qualified as L
 import Data.Pool (Pool)
 import Data.Pool qualified as Pool
 import Database.PostgreSQL.Simple (Connection, connect, close, ConnectInfo)
-import Gargantext.API.Admin.EnvTypes
-import Gargantext.API.Errors.Types
-import Gargantext.API.Prelude
+import Gargantext.API.Admin.EnvTypes (Env(..))
+import Gargantext.API.Errors.Types (BackendInternalError)
+import Gargantext.API.Prelude (GargM)
 import Gargantext.Core.Notifications.Dispatcher qualified as D
 import Gargantext.Core.Config (GargConfig(..))
 import Gargantext.Core.Config.Types (jwtSettings)
-import Gargantext.Core.NodeStory
+import Gargantext.Core.NodeStory (fromDBNodeStoryEnv)
 import Gargantext.Prelude
-import Gargantext.System.Logging
+import Gargantext.System.Logging (Logger)
 import Network.HTTP.Client.TLS (newTlsManager)
 import System.Directory (renameFile)
 import System.IO (hClose)

src/Gargantext/API/Admin/Settings/TOML.hs

-{-# LANGUAGE TemplateHaskell #-}
-module Gargantext.API.Admin.Settings.TOML where
-
-import Control.Lens hiding ((.=))
-import Data.Text qualified as T
-import Gargantext.API.Admin.Settings.CORS
-import Gargantext.API.Admin.Settings.MicroServices
-import Gargantext.Core.Worker.TOML
-import Gargantext.Prelude (panicTrace)
-import Gargantext.System.Logging
-import Prelude
-import Toml
-import Servant.Client.Core.BaseUrl
-
--- | Compatibility bridge until we fix #304 (move to Toml)
-data GargTomlSettings = GargTomlSettings
-  { _gargCorsSettings          :: !CORSSettings
-  , _gargMicroServicesSettings :: !MicroServicesSettings
-  , _gargWorkerSettings        :: !WorkerSettings
-  }
-
-makeLenses ''GargTomlSettings
-
-settingsCodec :: TomlCodec GargTomlSettings
-settingsCodec = GargTomlSettings
-  <$> (Toml.table corsSettingsCodec "cors" .= _gargCorsSettings)
-  <*> (Toml.table  microServicesSettingsCodec "microservices.proxy" .= _gargMicroServicesSettings)
-  <*> (Toml.table workerSettingsCodec "worker" .= _gargWorkerSettings)
-
--- | Extends the 'allowed-origins' in the CORSettings with the URLs embellished
--- with the proxy port.
-addProxyToAllowedOrigins :: GargTomlSettings -> GargTomlSettings
-addProxyToAllowedOrigins stgs =
-  stgs & over gargCorsSettings (addProxies $ stgs ^. gargMicroServicesSettings . msProxyPort)
-  where
-    addProxies :: Int -> CORSSettings -> CORSSettings
-    addProxies port cors =
-      let origins = _corsAllowedOrigins cors
-          mkUrl (CORSOrigin bh) = CORSOrigin $ bh { baseUrlPort = port }
-      in cors { _corsAllowedOrigins = origins <> Prelude.map mkUrl origins }
-
--- | Loads the 'CORSSettings' from the 'toml' file.
-loadGargTomlSettings :: FilePath -> IO GargTomlSettings
-loadGargTomlSettings tomlFile = do
-  tomlRes <- Toml.decodeFileEither settingsCodec tomlFile
-  case tomlRes of
-      Left errs      -> do
-        withLogger () $ \ioLogger -> do
-          logMsg ioLogger ERROR $ T.unpack $ "Error, gargantext-settings.toml parsing failed: " <> Toml.prettyTomlDecodeErrors errs
-          panicTrace "Please fix the errors in your gargantext-settings.toml file."
-      Right settings0 -> case settings0 ^. gargCorsSettings . corsUseOriginsForHosts of
-        True  -> pure $ addProxyToAllowedOrigins $
-                   settings0 & over (gargCorsSettings . corsAllowedHosts)
-                     (\_ -> (settings0 ^. gargCorsSettings . corsAllowedOrigins))
-        False -> pure $ addProxyToAllowedOrigins settings0

src/Gargantext/API/Auth/PolicyCheck.hs

+{-|
+Module      : Gargantext.API.Auth.PolicyCheck
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+
 {-# LANGUAGE LambdaCase          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies        #-}

src/Gargantext/API/Context.hs

@@ -16,19 +16,15 @@ Portability : POSIX
 module Gargantext.API.Context
   where
 
-import Prelude
-
-import Data.Aeson (FromJSON, ToJSON)
-import Servant
-
 import Gargantext.API.Admin.Auth (withNamedAccess)
 import Gargantext.API.Admin.Auth.Types (PathId(..), AuthenticatedUser)
-import Gargantext.API.Prelude
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.API.Prelude (IsGargServer)
+import Gargantext.API.Routes.Named.Context qualified as Named
+import Gargantext.Database.Admin.Types.Node (ContextId, contextId2NodeId)
 import Gargantext.Database.Prelude (JSONB)
-import Gargantext.Database.Query.Table.Context
+import Gargantext.Database.Query.Table.Context (getContextWith)
+import Gargantext.Prelude 
 import Servant.Server.Generic (AsServerT)
-import Gargantext.API.Routes.Named.Context qualified as Named
 
 -------------------------------------------------------------------
 -- TODO use Context instead of Node

src/Gargantext/API/Count/Types.hs

+{-|
+Module      : Gargantext.API.Count.Types
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
 {-# LANGUAGE TemplateHaskell    #-}
+
 module Gargantext.API.Count.Types (
     Scraper(..)
   , QueryBool(..)

src/Gargantext/API/EKG.hs

+{-|
+Module      : Gargantext.API.EKG
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeOperators #-}
+
 module Gargantext.API.EKG where
 
 import Data.HashMap.Strict as HM
 import Data.Text as T
 import Data.Text.IO as T
 import Data.Time.Clock.POSIX (getPOSIXTime)
-import Network.Wai
+import Network.Wai (Middleware)
 import Protolude
 import Servant
-import Servant.Auth
-import Servant.Ekg
+import Servant.Auth (Auth)
+import Servant.Ekg (HasEndpoint, getEndpoint, enumerateEndpoints, monitorEndpoints)
 import System.Metrics
-import qualified System.Metrics.Json as J
+import System.Metrics.Json qualified as J
 
 -- Mimics https://github.com/tibbe/ekg/blob/master/System/Remote/Snap.hs#L98
 type EkgAPI =

src/Gargantext/API/Errors.hs

@@ -21,13 +21,13 @@ module Gargantext.API.Errors (
 
 import Prelude
 
-import Control.Exception.Safe
+import Control.Exception.Safe (displayException)
 import Data.Aeson qualified as JSON
 import Data.Text qualified as T
 import Data.Text.Lazy qualified as TL
 import Data.Text.Lazy.Encoding qualified as TE
 import Data.Validity ( prettyValidation )
-import Gargantext.API.Admin.Auth.Types
+import Gargantext.API.Admin.Auth.Types (AuthenticationError(..))
 import Gargantext.API.Errors.Class as Class
 import Gargantext.API.Errors.TH (deriveHttpStatusCode)
 import Gargantext.API.Errors.Types as Types
@@ -35,7 +35,7 @@ import Gargantext.Database.Query.Table.Node.Error hiding (nodeError)
 import Gargantext.Database.Query.Tree hiding (treeError)
 import Gargantext.Utils.Jobs.Monad (JobError(..))
 import Network.HTTP.Types.Status qualified as HTTP
-import Servant.Server
+import Servant.Server (ServerError(..), err404, err500)
 
 $(deriveHttpStatusCode ''BackendErrorCode)
 

src/Gargantext/API/Errors/Class.hs

+{-|
+Module      : Gargantext.API.Errors.Class
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+-}
 
 module Gargantext.API.Errors.Class where
 
-import Control.Lens
+import Control.Lens (Prism')
 import Gargantext.API.Admin.Auth.Types (AuthenticationError)
 
+
 class HasAuthenticationError e where
   _AuthenticationError :: Prism' e AuthenticationError

src/Gargantext/API/Errors/TH.hs

+{-|
+Module      : Gargantext.API.Errors.TH
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+
 {-# LANGUAGE LambdaCase        #-}
 {-# LANGUAGE TemplateHaskell   #-}
 

src/Gargantext/API/GraphQL.hs

@@ -39,7 +39,7 @@ import Gargantext.API.GraphQL.TreeFirstLevel qualified as GQLTree
 import Gargantext.API.GraphQL.User qualified as GQLUser
 import Gargantext.API.GraphQL.UserInfo qualified as GQLUserInfo
 import Gargantext.API.Prelude (GargM)
-import Gargantext.API.Types
+import Gargantext.API.Types (HTML)
 import Gargantext.Core.Config (HasJWTSettings)
 import Gargantext.Core.NLP (HasNLPServer)
 import Gargantext.Database.Prelude (CmdCommon)
@@ -47,7 +47,7 @@ import Gargantext.Prelude hiding (ByteString)
 import Servant
 import Servant.Auth qualified as SA
 import Servant.Auth.Server qualified as SAS
-import Servant.Server.Generic
+import Servant.Server.Generic (AsServerT)
 
 
 -- | Represents possible GraphQL queries.

src/Gargantext/API/GraphQL/Annuaire.hs

+{-|
+Module      : Gargantext.API.GraphQL.Annuaire
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+-}
+
+
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 
 module Gargantext.API.GraphQL.Annuaire where
 
-import Control.Lens
+import Control.Lens (Traversal', _Just, ix)
 import Data.Morpheus.Types ( GQLType )
-import Data.Proxy
 import Gargantext.Database.Admin.Types.Hyperdata.Contact
   ( HyperdataContact
   , ContactWho
@@ -17,7 +27,7 @@ import Gargantext.Database.Prelude (CmdCommon)
 import Gargantext.Database.Query.Table.Context (getContextWith)
 import Gargantext.Database.Schema.Node (node_hyperdata)
 import Gargantext.Prelude
-import Gargantext.API.GraphQL.Types
+import Gargantext.API.GraphQL.Types (GqlM)
 
 data AnnuaireContact = AnnuaireContact
   { ac_title        :: !(Maybe Text)

src/Gargantext/API/GraphQL/IMT.hs

+{-|
+Module      : Gargantext.API.GraphQL.IMT
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+-}
+
+
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DerivingStrategies #-}
 

src/Gargantext/API/GraphQL/NLP.hs

+{-|
+Module      : Gargantext.API.GraphQL.NLP
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+-}
+
+
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DerivingStrategies #-}
 
@@ -11,13 +22,13 @@ module Gargantext.API.GraphQL.NLP
   where
 
 import Control.Lens (view)
+import Data.Map.Strict qualified as Map
 import Data.Morpheus.Types (GQLType)
 import Gargantext.API.GraphQL.Types
 import Gargantext.Core (Lang(..), NLPServerConfig(..), PosTagAlgo)  -- , allLangs)
 import Gargantext.Core.NLP (HasNLPServer(..))
 import Gargantext.Prelude
-import Protolude
-import qualified Data.Map.Strict as Map
+import Protolude qualified
 
 newtype LanguagesArgs
   = LanguagesArgs ()

src/Gargantext/API/GraphQL/PolicyCheck.hs

+{-|
+Module      : Gargantext.API.GraphQL.PolicyCheck
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
 
 module Gargantext.API.GraphQL.PolicyCheck where
 

src/Gargantext/API/GraphQL/User.hs

@@ -15,17 +15,17 @@ Portability : POSIX
 module Gargantext.API.GraphQL.User where
 
 import Data.Morpheus.Types ( GQLType )
-import Gargantext.API.Admin.Auth.Types
-import Gargantext.API.Auth.PolicyCheck
-import Gargantext.API.GraphQL.PolicyCheck
-import Gargantext.API.GraphQL.Types
+import Gargantext.API.Admin.Auth.Types (AuthenticatedUser)
+import Gargantext.API.Auth.PolicyCheck (AccessPolicyManager, nodeReadChecks)
+import Gargantext.API.GraphQL.PolicyCheck (withPolicy)
+import Gargantext.API.GraphQL.Types (GqlM, GqlM')
+import Gargantext.Core.Types (NodeId(..), UserId)
 import Gargantext.Core.Types.Individu qualified as Individu
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataUser(..))
 import Gargantext.Database.Prelude (CmdCommon)
 import Gargantext.Database.Query.Table.User qualified as DBUser
 import Gargantext.Database.Schema.User (UserLight(..))
 import Gargantext.Prelude
-import Gargantext.Core.Types
 
 data User m = User
   { u_email     :: Text

src/Gargantext/API/GraphQL/UserInfo.hs

@@ -40,12 +40,14 @@ import Gargantext.Database.Admin.Types.Hyperdata.Contact
   , ct_phone
   , hc_who
   , hc_where)
-import Gargantext.API.Admin.Auth.Types hiding (Valid)
-import Gargantext.API.Auth.PolicyCheck
-import Gargantext.API.GraphQL.PolicyCheck
-import Gargantext.API.GraphQL.Types
+  
+import Gargantext.API.Admin.Auth.Types (AuthenticatedUser)
+import Gargantext.API.Auth.PolicyCheck (AccessPolicyManager, userMe)
+import Gargantext.API.GraphQL.PolicyCheck (withPolicy)
+import Gargantext.API.GraphQL.Types (GqlM, GqlM')
 import Gargantext.API.GraphQL.Utils (AuthStatus(Invalid, Valid), authUser)
 import Gargantext.Core.Config (HasJWTSettings)
+import Gargantext.Core.Types (UserId(..))
 import Gargantext.Core.Types.Individu qualified as Individu
 import Gargantext.Database.Prelude (CmdCommon)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
@@ -53,7 +55,6 @@ import Gargantext.Database.Query.Table.User (getUsersWithHyperdata, getUsersWith
 import Gargantext.Database.Schema.Node (node_id, node_hyperdata, NodePoly (Node, _node_id))
 import Gargantext.Database.Schema.User (UserLight(..))
 import Gargantext.Prelude
-import Gargantext.Core.Types
 
 data UserInfo = UserInfo
   { ui_id             :: Int

src/Gargantext/API/HashedResponse.hs

@@ -12,7 +12,7 @@ Portability : POSIX
 module Gargantext.API.HashedResponse where
 
 import Data.Aeson
-import Data.Swagger
+import Data.Swagger (ToSchema)
 import Gargantext.Prelude
 import Gargantext.Prelude.Crypto.Hash qualified as Crypto (hash)
 

src/Gargantext/API/Job.hs

@@ -26,7 +26,7 @@ import Control.Lens (over, _Just)
 import Data.Text qualified as T
 import Gargantext.API.Admin.Orchestrator.Types
 import Gargantext.Prelude
-import Gargantext.Utils.Jobs.Error
+import Gargantext.Utils.Jobs.Error (ToHumanFriendlyError, mkHumanFriendly)
 
 newtype RemainingSteps = RemainingSteps { _RemainingSteps :: Int }
   deriving (Show, Eq, Num)

src/Gargantext/API/Members.hs

@@ -10,7 +10,7 @@ Portability : POSIX
 
 module Gargantext.API.Members where
 
-import Gargantext.API.Prelude
+import Gargantext.API.Prelude (IsGargServer)
 import Gargantext.API.Routes.Named.Private qualified as Named
 import Gargantext.Database.Action.Share (membersOf)
 import Gargantext.Database.Admin.Types.Node (NodeType(NodeTeam))

src/Gargantext/API/Metrics.hs

@@ -16,21 +16,20 @@ Metrics API
 module Gargantext.API.Metrics
     where
 
-import Control.Lens
 import Data.HashMap.Strict qualified as HashMap
 import Data.Time (UTCTime)
 import Data.Vector (Vector)
-import Gargantext.API.HashedResponse
-import Gargantext.API.Ngrams.NgramsTree
-import Gargantext.API.Ngrams.Types
+import Gargantext.API.HashedResponse (HashedResponse, constructHashedResponse, hash)
+import Gargantext.API.Ngrams.NgramsTree (NgramsTree)
+import Gargantext.API.Ngrams.Types (QueryParamR, TabType, ngramsTypeFromTabType, unNgramsTerm)
 import Gargantext.API.Prelude (IsGargServer)
 import Gargantext.API.Routes.Named.Metrics qualified as Named
 import Gargantext.Core.NodeStory (HasNodeStory)
 import Gargantext.Core.Text.Metrics (Scored(..), {-normalizeGlobal,-} normalizeLocal)
 import Gargantext.Core.Types (CorpusId, ListId, ListType(..))
 import Gargantext.Core.Types.Query (Limit)
-import Gargantext.Core.Viz.Chart
-import Gargantext.Core.Viz.Types
+import Gargantext.Core.Viz.Chart (chartData, histoData, treeData)
+import Gargantext.Core.Viz.Types (Histo)
 import Gargantext.Database.Action.Metrics qualified as Metrics
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataList(..), hl_chart, hl_pie, hl_scatter, hl_tree)
 import Gargantext.Database.Admin.Types.Metrics (ChartMetrics(..), Metric(..), Metrics(..))

src/Gargantext/API/Middleware.hs

+{-|
+Module      : Gargantext.API.Middleware
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+
 {-# LANGUAGE ViewPatterns      #-}
 
 {-| Edit 'sensitiveKeywords' to extend the list of redacted fields. -}
@@ -5,8 +17,8 @@ module Gargantext.API.Middleware (
   logStdoutDevSanitised
   ) where
 
-import Control.Lens
-import Control.Monad.Logger
+import Control.Lens (Traversal', at, over)
+import Control.Monad.Logger (LogStr, toLogStr)
 import Data.Aeson qualified as A
 import Data.Aeson.Lens qualified as L
 import Data.ByteString (ByteString)
@@ -16,15 +28,15 @@ import Data.ByteString.Char8 qualified as C8
 import Data.ByteString.Lazy qualified as B
 import Data.CaseInsensitive qualified as CI
 import Data.List qualified as L
-import Data.String
+import Data.String (fromString)
 import Data.Text qualified as T
 import Data.Text.Encoding qualified as TE
-import Network.HTTP.Types
-import Network.HTTP.Types.Header
-import Network.Wai
+import Network.HTTP.Types (QueryItem, Status(..))
+import Network.HTTP.Types.Header (Header, hAuthorization, hCookie, hSetCookie)
+import Network.Wai (Middleware, queryString, requestMethod, rawPathInfo)
 import Network.Wai.Middleware.RequestLogger
 import Prelude
-import System.Console.ANSI
+import System.Console.ANSI (Color(..), setSGRCode, SGR(..), ConsoleLayer(..), ColorIntensity(..))
 
 -- | Like 'logStdoutDev' from \"wai-extra\", but redacts (or omits altogether) payloads which might have
 -- sensitive information

src/Gargantext/API/Ngrams/List.hs

@@ -29,7 +29,7 @@ import Data.Vector qualified as Vec
 import Gargantext.API.Admin.EnvTypes (Env)
 import Gargantext.API.Errors.Types (BackendInternalError(InternalServerError))
 import Gargantext.API.Ngrams (setListNgrams)
-import Gargantext.API.Ngrams.List.Types
+import Gargantext.API.Ngrams.List.Types (_wjf_data, _wtf_data)
 import Gargantext.API.Ngrams.Prelude (getNgramsList)
 import Gargantext.API.Ngrams.Types
 import Gargantext.API.Prelude (GargM, serverError, HasServerError)

src/Gargantext/API/Ngrams/List/Types.hs

@@ -13,20 +13,17 @@ Portability : POSIX
 
 module Gargantext.API.Ngrams.List.Types where
 
---import Control.Lens hiding (elements, Indexed)
 import Data.Aeson
-import qualified Data.ByteString.Lazy as BSL
+import Data.ByteString.Lazy qualified as BSL
 import Data.Swagger (ToSchema, declareNamedSchema, genericDeclareNamedSchema)
 import Data.Text
-import qualified Data.Text.Encoding as E
-import Servant.Job.Utils (jsonOptions)
-import Web.FormUrlEncoded (FromForm(..), ToForm, parseUnique)
-
-import Protolude
-
+import Data.Text.Encoding qualified as E
 import Gargantext.API.Ngrams.Types (NgramsList)
 import Gargantext.API.Node.Corpus.New.Types (FileType(..))
 import Gargantext.Core.Utils.Prefix (unPrefixSwagger)
+import Protolude
+import Servant.Job.Utils (jsonOptions)
+import Web.FormUrlEncoded (FromForm(..), ToForm, parseUnique)
 
 
 

src/Gargantext/API/Prelude.hs

@@ -20,20 +20,19 @@ module Gargantext.API.Prelude
   where
 
 import Control.Lens ((#))
-import Data.Aeson.Types
 import Gargantext.API.Admin.Auth.Types (AuthenticationError)
-import Gargantext.API.Errors.Class
+import Gargantext.API.Errors.Class (HasAuthenticationError, _AuthenticationError)
 import Gargantext.Core.Notifications.CentralExchange.Types (HasCentralExchangeNotification)
 import Gargantext.Core.Config (HasConfig)
 import Gargantext.Core.Mail.Types (HasMail)
 import Gargantext.Core.NLP (HasNLPServer)
-import Gargantext.Core.NodeStory
-import Gargantext.Core.Types
+import Gargantext.Core.NodeStory (HasNodeStory, HasNodeStoryEnv)
+import Gargantext.Core.Types (HasValidationError)
 import Gargantext.Database.Prelude (CmdM, CmdRandom, HasConnectionPool)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
-import Gargantext.Database.Query.Tree
+import Gargantext.Database.Query.Tree (HasTreeError)
 import Gargantext.Prelude
-import Gargantext.System.Logging
+import Gargantext.System.Logging (MonadLogger)
 import Gargantext.Utils.Jobs.Monad (MonadJobStatus(..), JobHandle)
 import Servant
 import Servant.Job.Core (HasServerError(..), serverError)

src/Gargantext/API/Public/Types.hs

+{-|
+Module      : Gargantext.API.Public.Types
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+-}
+
 
 module Gargantext.API.Public.Types (
     PublicData(..)
-  , defaultPublicData
   ) where
 
 import Data.Aeson
-import Data.Swagger
+import Data.Swagger (ToSchema)
 import Data.Text (Text)
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.Utils.Aeson qualified as GUA
-import Prelude
-import Test.QuickCheck
 
 data PublicData = PublicData
   { title    :: Text
@@ -31,16 +38,3 @@ instance ToJSON    PublicData where
   toJSON = genericToJSON (defaultOptions { sumEncoding = GUA.defaultTaggedObject })
 
 instance ToSchema  PublicData
-instance Arbitrary PublicData where
-  arbitrary = elements
-            $ replicate 6 defaultPublicData
-
-defaultPublicData :: PublicData
-defaultPublicData =
-  PublicData { title = "Title"
-             , abstract = foldl (<>) "" $ replicate 100 "abstract "
-             , img = "images/Gargantextuel-212x300.jpg"
-             , url = "https://.."
-             , date = "YY/MM/DD"
-             , database = "database"
-             , author = "Author" }

src/Gargantext/API/Routes.hs

@@ -17,18 +17,16 @@ Portability : POSIX
 module Gargantext.API.Routes
       where
 
-import Data.Validity
 import Gargantext.API.Admin.EnvTypes (Env)
-import Gargantext.API.Errors.Types
-import Gargantext.API.Prelude
+import Gargantext.API.Errors.Types (BackendInternalError)
+import Gargantext.API.Prelude (GargServer, GargM)
 import Gargantext.API.Routes.Named.Annuaire qualified as Named
 import Gargantext.API.Routes.Named.Corpus qualified as Named
 import Gargantext.API.Worker (serveWorkerAPI)
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Core.Worker.Jobs.Types qualified as Jobs
 import Gargantext.Prelude
-import Servant
-import Servant.Auth.Swagger ()
+import Servant (Get, JSON)
 import Servant.Server.Generic (AsServerT)
 
 ----------------------------------------------------------------------

src/Gargantext/API/Routes/Named.hs

@@ -18,20 +18,20 @@ module Gargantext.API.Routes.Named (
   ) where
 
 import Data.Text (Text)
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.API.Admin.Auth.Types
 import Gargantext.API.Admin.FrontEnd (FrontEndAPI)
-import Gargantext.API.GraphQL
-import Gargantext.API.Routes.Named.Private
-import Gargantext.API.Routes.Named.Public
-import Gargantext.API.Routes.Types
+import Gargantext.API.GraphQL (GraphQLAPI)
+import Gargantext.API.Routes.Named.Private (GargPrivateAPI)
+import Gargantext.API.Routes.Named.Public (GargPublicAPI)
+import Gargantext.API.Routes.Types (WithCustomErrorScheme)
 import Gargantext.API.Worker (WorkerAPI)
 import Gargantext.Core.Notifications.Dispatcher.WebSocket qualified as Dispatcher
 import Servant.API ((:>), (:-), JSON, ReqBody, Post, Get, QueryParam)
 import Servant.API.Description (Summary)
-import Servant.API.NamedRoutes
-import Servant.Auth.Swagger ()
-import Servant.Swagger.UI
+import Servant.API.NamedRoutes (NamedRoutes)
+import Servant.Auth.Swagger ()  -- toSwagger instance
+import Servant.Swagger.UI (SwaggerSchemaUI)
 
 
 newtype API mode = API

src/Gargantext/API/Routes/Named/Node.hs

@@ -28,24 +28,24 @@ module Gargantext.API.Routes.Named.Node (
   , UpdateNodeParams(..)
   ) where
 
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.API.Auth.PolicyCheck ( PolicyChecked )
 import Gargantext.API.Ngrams.Types (TabType(..))
 import Gargantext.API.Node.New.Types ( PostNode(..) )
 import Gargantext.API.Node.Types ( RenameNode(..), NodesToScore(..), NodesToCategory(..) )
 import Gargantext.API.Node.Update.Types ( UpdateNodeParams(..), Charts(..), Granularity(..), Method(..) )
-import Gargantext.API.Routes.Named.Document
-import Gargantext.API.Routes.Named.File
-import Gargantext.API.Routes.Named.FrameCalc
-import Gargantext.API.Routes.Named.Metrics
+import Gargantext.API.Routes.Named.Document (DocumentsFromWriteNodesAPI, DocumentUploadAPI)
+import Gargantext.API.Routes.Named.File (FileAsyncAPI, FileAPI)
+import Gargantext.API.Routes.Named.FrameCalc (FrameCalcAPI)
+import Gargantext.API.Routes.Named.Metrics (ChartAPI, PieAPI, ScatterAPI, TreeAPI)
 import Gargantext.API.Routes.Named.Publish (PublishAPI)
-import Gargantext.API.Routes.Named.Search
-import Gargantext.API.Routes.Named.Share as Share
-import Gargantext.API.Routes.Named.Table
-import Gargantext.API.Routes.Named.Viz
+import Gargantext.API.Routes.Named.Search (SearchAPI, SearchResult)
+import Gargantext.API.Routes.Named.Share (ShareNode, UnshareNode)
+import Gargantext.API.Routes.Named.Table (TableAPI, TableNgramsAPI)
+import Gargantext.API.Routes.Named.Viz (PhyloAPI)
 import Gargantext.API.Worker (WorkerAPI)
 import Gargantext.Core.Types
-import Gargantext.Core.Types.Query
+import Gargantext.Core.Types.Query (Limit, Offset)
 import Gargantext.Database.Admin.Types.Hyperdata.User ( HyperdataUser )
 import Gargantext.Database.Query.Facet.Types ( FacetDoc, OrderBy(..) )
 import Prelude
@@ -82,7 +82,7 @@ data NodeAPI a mode = NodeAPI
   , scoreAPI           :: mode :- "score" :> NamedRoutes ScoreAPI
   , searchAPI          :: mode :- "search" :> NamedRoutes (SearchAPI SearchResult)
   , shareAPI           :: mode :- "share" :> NamedRoutes ShareNode
-  , unshareEp          :: mode :- "unshare" :> NamedRoutes Share.UnshareNode
+  , unshareEp          :: mode :- "unshare" :> NamedRoutes UnshareNode
   , publishAPI         :: mode :- "publish" :> (PolicyChecked (NamedRoutes PublishAPI))
   ---- Pairing utilities
   , pairWithEp         :: mode :- "pairwith" :> NamedRoutes PairWith

src/Gargantext/API/Routes/Named/Private.hs

@@ -26,23 +26,23 @@ module Gargantext.API.Routes.Named.Private (
 
 
 import Data.Text (Text)
-import GHC.Generics
-import Gargantext.API.Admin.Auth.Types
-import Gargantext.API.Auth.PolicyCheck
-import Gargantext.API.Routes.Named.Contact
-import Gargantext.API.Routes.Named.Context
-import Gargantext.API.Routes.Named.Corpus
-import Gargantext.API.Routes.Named.Count
-import Gargantext.API.Routes.Named.Document
-import Gargantext.API.Routes.Named.List qualified as List
-import Gargantext.API.Routes.Named.Node
-import Gargantext.API.Routes.Named.Share
-import Gargantext.API.Routes.Named.Table
-import Gargantext.API.Routes.Named.Tree
-import Gargantext.API.Routes.Named.Viz
-import Gargantext.Database.Admin.Types.Hyperdata.Any
-import Gargantext.Database.Admin.Types.Hyperdata.Corpus
-import Gargantext.Database.Admin.Types.Node
+import GHC.Generics (Generic)
+import Gargantext.API.Admin.Auth.Types (AuthenticatedUser)
+import Gargantext.API.Auth.PolicyCheck (PolicyChecked)
+import Gargantext.API.Routes.Named.Contact (ContactAPI)
+import Gargantext.API.Routes.Named.Context (ContextAPI)
+import Gargantext.API.Routes.Named.Corpus (AddWithForm, AddWithQuery, CorpusExportAPI, MakeSubcorpusAPI)
+import Gargantext.API.Routes.Named.Count (CountAPI, Query)
+import Gargantext.API.Routes.Named.Document (DocumentExportAPI)
+import Gargantext.API.Routes.Named.List (GETAPI, JSONAPI, TSVAPI)
+import Gargantext.API.Routes.Named.Node (NodeAPI, NodesAPI, NodeNodeAPI, Roots)
+import Gargantext.API.Routes.Named.Share (ShareURL)
+import Gargantext.API.Routes.Named.Table (TableNgramsAPI)
+import Gargantext.API.Routes.Named.Tree (NodeTreeAPI, TreeFlatAPI)
+import Gargantext.API.Routes.Named.Viz (GraphAPI, PhyloExportAPI)
+import Gargantext.Database.Admin.Types.Hyperdata.Any (HyperdataAny)
+import Gargantext.Database.Admin.Types.Hyperdata.Corpus (HyperdataAnnuaire, HyperdataCorpus)
+import Gargantext.Database.Admin.Types.Node (ContextId, CorpusId, DocId, NodeId)
 import Servant.API
 import Servant.Auth qualified as SA
 
@@ -97,9 +97,9 @@ data GargPrivateAPI' mode = GargPrivateAPI'
   , addWithFormAPI   :: mode :- NamedRoutes AddWithForm
   , addWithQueryEp   :: mode :- NamedRoutes AddWithQuery
   , makeSubcorpusAPI :: mode :- NamedRoutes MakeSubcorpusAPI
-  , listGetAPI       :: mode :- NamedRoutes List.GETAPI
-  , listJsonAPI      :: mode :- NamedRoutes List.JSONAPI
-  , listTsvAPI       :: mode :- NamedRoutes List.TSVAPI
+  , listGetAPI       :: mode :- NamedRoutes GETAPI
+  , listJsonAPI      :: mode :- NamedRoutes JSONAPI
+  , listTsvAPI       :: mode :- NamedRoutes TSVAPI
   , shareUrlAPI      :: mode :- "shareurl" :> NamedRoutes ShareURL
   } deriving Generic
 

src/Gargantext/API/Routes/Named/Publish.hs

+{-|
+Module      : Gargantext.API.Routes.Named.Publish
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+-}
+
 {-# LANGUAGE TypeOperators #-}
 
 module Gargantext.API.Routes.Named.Publish (
@@ -6,12 +16,11 @@ module Gargantext.API.Routes.Named.Publish (
   ) where
 
 import Data.Aeson as JS
-import Data.Swagger
+import Data.Swagger (ToSchema)
 import Gargantext.Database.Query.Table.NodeNode (NodePublishPolicy)
 import GHC.Generics (Generic)
 import Prelude
 import Servant
-import Test.QuickCheck
 
 newtype PublishRequest = PublishRequest
   { pubrq_policy :: NodePublishPolicy
@@ -28,9 +37,6 @@ instance FromJSON PublishRequest where
     pubrq_policy <- o JS..: "policy"
     pure $ PublishRequest{..}
 
-instance Arbitrary PublishRequest where
-  arbitrary = PublishRequest <$> arbitraryBoundedEnum
-
 newtype PublishAPI mode = PublishAPI
   { publishEp :: mode :- Summary "Publish a Corpus Node"
                       :> ReqBody '[JSON] PublishRequest

src/Gargantext/API/Routes/Named/Search.hs

@@ -12,10 +12,10 @@ module Gargantext.API.Routes.Named.Search (
   ) where
 
 
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.API.Search.Types ( SearchQuery(..), SearchType(..), SearchResult(..), SearchResultTypes(..) )
 import Gargantext.Core.Types.Query (Limit, Offset)
-import Gargantext.Database.Query.Facet
+import Gargantext.Database.Query.Facet (OrderBy)
 import Servant
 
 

src/Gargantext/API/Routes/Named/Share.hs

@@ -13,12 +13,12 @@ module Gargantext.API.Routes.Named.Share (
   , ShareNodeParams(..)
   ) where
 
-import Data.Aeson
-import Data.Swagger
+import Data.Aeson (FromJSON(..), ToJSON(..), withText)
+import Data.Swagger (ToSchema, declareNamedSchema)
 import Data.Text qualified as T
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.API.Node.Share.Types ( ShareNodeParams (..) )
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node (NodeId, NodeType)
 import Network.URI (parseURI)
 import Prelude
 import Servant

src/Gargantext/API/Routes/Named/Table.hs

@@ -17,15 +17,15 @@ module Gargantext.API.Routes.Named.Table (
   ) where
 
 import Data.Text (Text)
-import GHC.Generics
-import Gargantext.API.HashedResponse
+import GHC.Generics (Generic)
+import Gargantext.API.HashedResponse (HashedResponse)
 import Gargantext.API.Ngrams.Types (TabType(..), UpdateTableNgramsCharts, Version, QueryParamR, Versioned, VersionedWithCount, NgramsTable, NgramsTablePatch)
 import Gargantext.API.Ngrams.Types qualified as Ngrams
 import Gargantext.API.Worker (WorkerAPI)
 import Gargantext.API.Table.Types ( TableQuery(..), FacetTableResult )
 import Gargantext.Core.Text.Corpus.Query (RawQuery)
 import Gargantext.Core.Types.Main (ListType)
-import Gargantext.Core.Types.Query
+import Gargantext.Core.Types.Query (Limit, MinSize, MaxSize, Offset)
 import Gargantext.Database.Admin.Types.Node (ListId)
 import Gargantext.Database.Query.Facet.Types qualified as Facet
 import Prelude

src/Gargantext/API/Routes/Named/Tree.hs

@@ -7,9 +7,9 @@ module Gargantext.API.Routes.Named.Tree (
   ) where
 
 import Data.Text (Text)
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.Core.Types.Main
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node (NodeType)
 import Servant
 
 data NodeTreeAPI mode = NodeTreeAPI

src/Gargantext/API/Routes/Named/Viz.hs

@@ -18,11 +18,11 @@ module Gargantext.API.Routes.Named.Viz (
 
 import Data.Aeson ( Value )
 import Data.Text (Text)
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.API.Viz.Types (PhyloData(..))
 import Gargantext.API.Worker (WorkerAPI)
-import Gargantext.Core.Types
-import Gargantext.Core.Viz.Graph.Types
+import Gargantext.Core.Types (ListId, NodeId)
+import Gargantext.Core.Viz.Graph.Types (Graph, GraphLegendAPI, GraphVersions(..), HyperdataGraphAPI)
 import Gargantext.Core.Viz.LegacyPhylo (Level)
 import Gargantext.Core.Viz.Phylo.Legacy.LegacyMain (MinSizeBranch)
 import Servant

src/Gargantext/API/Routes/Types.hs

 {-# LANGUAGE TypeFamilies         #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TypeApplications     #-}
+
 module Gargantext.API.Routes.Types where
 
-import Control.Lens
+import Control.Lens ((&), (%~), traversed)
 import Data.ByteString (ByteString)
 import Data.CaseInsensitive qualified as CI
 import Data.List qualified as L
-import Data.Proxy
+import Data.Proxy (Proxy(..))
 import Data.Set qualified as Set
-import Gargantext.API.Errors
-import Network.Wai hiding (responseHeaders)
+import Gargantext.API.Errors (GargErrorScheme(..), renderGargErrorScheme)
+import Network.HTTP.Types (HeaderName)
+import Network.Wai (requestHeaders)
 import Prelude
-import Servant.API.Routes
+import Servant.API.Routes (HasRoutes, getRoutes, mkHeaderRep, responseHeaders)
 import Servant.API.Routes.Internal.Response (unResponses)
-import Servant.API.Routes.Route
-import Servant.Client hiding (responseHeaders)
+import Servant.API.Routes.Route (routeResponse)
+import Servant.Client (HasClient, Client, clientWithRoute, hoistClientMonad)
 import Servant.Client.Core.Request (addHeader)
-import Servant.Ekg
-import Servant.Server
-import Servant.Server.Internal.Delayed
-import Servant.Server.Internal.DelayedIO
-import Network.HTTP.Types (HeaderName)
+import Servant.Ekg (HasEndpoint, enumerateEndpoints, getEndpoint)
+import Servant.Server (HasServer, ServerT, hoistServerWithContext, route)
+import Servant.Server.Internal.Delayed (addHeaderCheck)
+import Servant.Server.Internal.DelayedIO (DelayedIO, withRequest)
 
 data WithCustomErrorScheme a
 

src/Gargantext/API/Search.hs

@@ -22,14 +22,14 @@ module Gargantext.API.Search
 import Data.Text qualified as T
 import Gargantext.API.Prelude (IsGargServer)
 import Gargantext.API.Routes.Named.Search qualified as Named
-import Gargantext.API.Search.Types
+import Gargantext.API.Search.Types (SearchQuery(..), SearchResult(..), SearchResultTypes(..), SearchType(..))
 import Gargantext.Core.Text.Corpus.Query (RawQuery (..), parseQuery)
-import Gargantext.Core.Types.Search
+import Gargantext.Core.Types.Search (toRow)
 import Gargantext.Database.Action.Flow.Pairing (isPairedWith)
-import Gargantext.Database.Action.Search
-import Gargantext.Database.Admin.Types.Node hiding (DEBUG)
+import Gargantext.Database.Action.Search (searchInCorpus, searchInCorpusWithContacts)
+import Gargantext.Database.Admin.Types.Node (NodeId, NodeType(..))
 import Gargantext.Prelude
-import Gargantext.System.Logging
+import Gargantext.System.Logging (logLocM, LogLevel(..))
 import Servant.Server.Generic (AsServerT)
 
 -----------------------------------------------------------------------

src/Gargantext/API/Search/Types.hs

 
 module Gargantext.API.Search.Types where
 
-import GHC.Generics
-import Data.Aeson hiding (defaultTaggedObject)
-import Data.Swagger hiding (fieldLabelModifier, Contact)
+import Data.Aeson (defaultOptions, genericParseJSON, genericToJSON, sumEncoding, SumEncoding(..))
+import Data.Swagger (ToSchema, declareNamedSchema, genericDeclareNamedSchema)
 import Gargantext.Core.Text.Corpus.Query (RawQuery (..))
-import Gargantext.Core.Types.Search
+import Gargantext.Core.Types.Search (Row)
 import Gargantext.Core.Utils.Prefix (unPrefixSwagger)
 import Gargantext.Prelude
 import Gargantext.Utils.Aeson (defaultTaggedObject)
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary
 
 -----------------------------------------------------------------------
 -----------------------------------------------------------------------
@@ -23,8 +20,6 @@ instance FromJSON SearchType where
 instance ToJSON SearchType where
   toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
 instance ToSchema SearchType
-instance Arbitrary SearchType where
-  arbitrary = elements [SearchDoc, SearchContact]
 
 -----------------------------------------------------------------------
 data SearchQuery =
@@ -42,9 +37,6 @@ instance ToSchema SearchQuery
     declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "")
 -}
 
-instance Arbitrary SearchQuery where
-  arbitrary = elements [SearchQuery (RawQuery "electrodes") SearchDoc]
-  -- arbitrary = elements [SearchQuery "electrodes" 1 ] --SearchDoc]
 -----------------------------------------------------------------------
 data SearchResult =
   SearchResult { result :: !SearchResultTypes}
@@ -62,9 +54,6 @@ instance ToSchema SearchResult
     declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "")
 -}
 
-instance Arbitrary SearchResult where
-  arbitrary = SearchResult <$> arbitrary
-
 
 data SearchResultTypes =
     SearchResultDoc { docs     :: ![Row] }
@@ -76,13 +65,6 @@ instance FromJSON SearchResultTypes where
 instance ToJSON SearchResultTypes where
   toJSON = genericToJSON (defaultOptions { sumEncoding = defaultTaggedObject })
 
-instance Arbitrary SearchResultTypes where
-  arbitrary = do
-    srd <- SearchResultDoc     <$> arbitrary
-    src <- SearchResultContact <$> arbitrary
-    srn <- pure $ SearchNoResult "No result because.."
-    elements [srd, src, srn]
-
 instance ToSchema SearchResultTypes where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "")
 

src/Gargantext/API/Server/Named.hs

@@ -29,7 +29,7 @@ import Gargantext.Prelude hiding (Handler, catch)
 import Gargantext.System.Logging (logLocM, LogLevel(..))
 import Paths_gargantext qualified as PG -- cabal magic build module
 import Servant
-import Servant.Server.Generic
+import Servant.Server.Generic (AsServer, AsServerT)
 import Servant.Swagger.UI (swaggerSchemaUIServer)
 
 serverGargAPI :: Env -> BackEndAPI (AsServerT (GargM Env BackendInternalError))

src/Gargantext/API/Server/Named/EKG.hs

@@ -3,20 +3,21 @@
 {-# LANGUAGE TypeOperators        #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module Gargantext.API.Server.Named.EKG where
 
 import Data.HashMap.Strict as HM
 import Data.Text as T
 import Data.Text.IO as T
 import Data.Time.Clock.POSIX (getPOSIXTime)
-import Gargantext.API.Routes.Named.EKG
-import Network.Wai
+import Gargantext.API.Routes.Named.EKG (EkgAPI(..))
+import Network.Wai (Middleware)
 import Protolude
 import Servant
-import Servant.Auth
-import Servant.Ekg
-import Servant.Server.Generic
-import System.Metrics
+import Servant.Auth (Auth)
+import Servant.Ekg (HasEndpoint, enumerateEndpoints, getEndpoint, monitorEndpoints)
+import Servant.Server.Generic (AsServer)
+import System.Metrics (Store, newStore, registerCounter, registerGcMetrics, sampleAll)
 import System.Metrics.Json qualified as J
 
 

src/Gargantext/API/Server/Named/Ngrams.hs

@@ -11,16 +11,16 @@ import Data.Map.Strict qualified as Map
 import Data.Set qualified as Set
 import Gargantext.API.Admin.Auth (withNamedAccess)
 import Gargantext.API.Admin.Auth.Types (AuthenticatedUser, PathId (..))
-import Gargantext.API.Admin.EnvTypes
+import Gargantext.API.Admin.EnvTypes (Env)
 import Gargantext.API.Errors.Types (BackendInternalError)
 import Gargantext.API.Metrics qualified as Metrics
 import Gargantext.API.Ngrams
 import Gargantext.API.Ngrams.Types
-import Gargantext.API.Prelude
+import Gargantext.API.Prelude (GargM)
 import Gargantext.API.Routes.Named.Table qualified as Named
 import Gargantext.API.Worker (serveWorkerAPI)
 import Gargantext.Core.NodeStory.Types (HasNodeStory)
-import Gargantext.Core.Types hiding (Terms)
+import Gargantext.Core.Types (DocId, ListId, ListType(..), NodeId, NodeType(..))
 import Gargantext.Core.Types.Query (Limit(..), Offset(..))
 import Gargantext.Core.Worker.Jobs.Types qualified as Jobs
 import Gargantext.Database.Admin.Config (userMaster)
@@ -30,7 +30,7 @@ import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Table.Node.Select ( selectNodesWithUsername )
 import Gargantext.Database.Schema.Node (node_id, node_parent_id, node_user_id)
 import Gargantext.Prelude
-import Gargantext.Utils.Jobs.Monad
+import Gargantext.Utils.Jobs.Monad (JobHandle, MonadJobStatus(..), markFailedNoErr)
 import Servant.Server.Generic (AsServerT)
 
 

src/Gargantext/API/Server/Named/Private.hs

 {-# OPTIONS_GHC -Wno-deprecations #-}
+
 module Gargantext.API.Server.Named.Private where
 
 import Gargantext.API.Admin.Auth.Types (AuthenticatedUser(..))
 import Gargantext.API.Admin.EnvTypes (Env)
-import Gargantext.API.Context
+import Gargantext.API.Context (contextAPI)
 import Gargantext.API.Count qualified as Count
-import Gargantext.API.Errors.Types
+import Gargantext.API.Errors.Types (BackendInternalError)
 import Gargantext.API.Members (members)
 import Gargantext.API.Ngrams.List qualified as List
-import Gargantext.API.Node
+import Gargantext.API.Node (annuaireNodeAPI, corpusNodeAPI, nodeAPI, nodeNodeAPI, nodesAPI, roots)
 import Gargantext.API.Node qualified as Tree
 import Gargantext.API.Node.Contact as Contact
 import Gargantext.API.Node.Corpus.Export qualified as CorpusExport
@@ -16,15 +17,14 @@ import Gargantext.API.Node.Corpus.Subcorpus qualified as Subcorpus
 import Gargantext.API.Node.Document.Export (documentExportAPI)
 import Gargantext.API.Node.Phylo.Export qualified as PhyloExport
 import Gargantext.API.Node.ShareURL ( shareURL )
-import Gargantext.API.Prelude
+import Gargantext.API.Prelude (GargM)
 import Gargantext.API.Routes (addCorpusWithForm, addCorpusWithQuery)
 import Gargantext.API.Routes.Named.Private qualified as Named
-import Gargantext.API.Server.Named.Ngrams
+import Gargantext.API.Server.Named.Ngrams (apiNgramsTableDoc)
 import Gargantext.API.Server.Named.Viz qualified as Viz
 import Gargantext.Core.Types.Individu (User(..))
-import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataAny)
 import Gargantext.Prelude
-import Servant.Auth.Swagger ()
 import Servant.Server.Generic (AsServerT)
 
 ---------------------------------------------------------------------

src/Gargantext/API/Server/Named/Public.hs

@@ -9,7 +9,9 @@ import Data.Map.Strict qualified as Map
 import Data.Set qualified as Set
 import Gargantext.API.Node.File (fileApi)
 import Gargantext.API.Prelude (serverError, IsGargServer)
-import Gargantext.API.Public.Types
+import Gargantext.API.Public.Types (PublicData(..))
+import Gargantext.API.Routes.Named.File qualified as Named
+import Gargantext.API.Routes.Named.Public qualified as Named
 import Gargantext.Core.Utils.DateUtils (utc2year)
 import Gargantext.Database.Admin.Types.Hyperdata.Corpus ( hc_fields )
 import Gargantext.Database.Admin.Types.Hyperdata.CorpusField
@@ -22,8 +24,6 @@ import Gargantext.Database.Schema.Node ( NodePoly(..), node_date, node_hyperdata
 import Gargantext.Prelude
 import Servant
 import Servant.Server.Generic (AsServerT)
-import qualified Gargantext.API.Routes.Named.File as Named
-import qualified Gargantext.API.Routes.Named.Public as Named
 
 serverPublicGargAPI :: IsGargServer env err m => Text -> Named.GargPublicAPI (AsServerT m)
 serverPublicGargAPI baseUrl =

src/Gargantext/API/Server/Named/Viz.hs

@@ -4,15 +4,14 @@ module Gargantext.API.Server.Named.Viz (
   ) where
 
 import Gargantext.API.Admin.Auth (withNamedAccess)
-import Gargantext.API.Admin.Auth.Types
+import Gargantext.API.Admin.Auth.Types (AuthenticatedUser, PathId(..))
 import Gargantext.API.Admin.EnvTypes (Env)
 import Gargantext.API.Errors.Types ( BackendInternalError )
 import Gargantext.API.Prelude (GargM)
 import Gargantext.API.Routes.Named.Viz qualified as Named
 import Gargantext.Core.Viz.Graph.API
-import Gargantext.Core.Viz.Graph.GEXF ()
  -- (cooc2graph)
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node (NodeId, UserId)
 import Gargantext.Prelude
 import Servant.Server.Generic (AsServerT)
 

src/Gargantext/API/Swagger.hs

@@ -14,15 +14,14 @@ Portability : POSIX
 ---------------------------------------------------------------------
 module Gargantext.API.Swagger where
 ---------------------------------------------------------------------
-import Control.Lens
+import Control.Lens ((?~))
 import Data.Swagger
 import Data.Version (showVersion)
-import Servant
-import Servant.Swagger
-import qualified Paths_gargantext as PG -- cabal magic build module
-
 import Gargantext.API.Routes.Named qualified as Named
 import Gargantext.Prelude
+import Paths_gargantext qualified as PG -- cabal magic build module
+import Servant
+import Servant.Swagger (toSwagger, subOperations)
 
 backendApiProxy :: Proxy (ToServantApi Named.BackEndAPI)
 backendApiProxy = Proxy

src/Gargantext/API/Table.hs

@@ -30,23 +30,23 @@ module Gargantext.API.Table
   where
 
 import Data.Text qualified as T
-import Gargantext.API.HashedResponse
+import Gargantext.API.HashedResponse (HashedResponse(..), constructHashedResponse)
 import Gargantext.API.Ngrams.Types (TabType(..))
 import Gargantext.API.Prelude (IsGargServer)
 import Gargantext.API.Routes.Named.Table qualified as Named
-import Gargantext.API.Table.Types
+import Gargantext.API.Table.Types (FacetTableResult, TableQuery(..))
 import Gargantext.Core.Text.Corpus.Query (RawQuery, parseQuery, getRawQuery)
 import Gargantext.Core.Types (TableResult(..))
 import Gargantext.Core.Types.Query (Offset, Limit)
 import Gargantext.Database.Action.Learn (FavOrTrash(..), moreLike)
-import Gargantext.Database.Action.Search
-import Gargantext.Database.Admin.Types.Node hiding (ERROR, DEBUG)
+import Gargantext.Database.Action.Search (searchCountInCorpus, searchInCorpus)
+import Gargantext.Database.Admin.Types.Node (ContactId, CorpusId, NodeId)
 import Gargantext.Database.Prelude (CmdM, DbCmd', DBCmd)
 import Gargantext.Database.Query.Facet (FacetDoc , runViewDocuments, runCountDocuments, OrderBy(..), runViewAuthorsDoc)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Prelude
 import Gargantext.System.Logging
-import Servant.Server.Generic
+import Servant.Server.Generic (AsServerT)
 
 tableApi :: IsGargServer env err m => NodeId -> Named.TableAPI (AsServerT m)
 tableApi id' = Named.TableAPI

src/Gargantext/API/Table/Types.hs

@@ -12,8 +12,6 @@ import Gargantext.Core.Types.Query (Offset, Limit)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
 import Gargantext.Database.Query.Facet (FacetDoc , OrderBy(..))
 import Gargantext.Prelude
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
 
 data TableQuery = TableQuery
   { tq_offset       :: Offset
@@ -29,12 +27,3 @@ $(deriveJSON (unPrefix "tq_") ''TableQuery)
 
 instance ToSchema TableQuery where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "tq_")
-
-instance Arbitrary TableQuery where
-  arbitrary = elements [TableQuery { tq_offset = 0
-                                   , tq_limit = 10
-                                   , tq_orderBy = DateAsc
-                                   , tq_view = Docs
-                                   , tq_query = "electrodes" }]
-
-

src/Gargantext/API/ThrowAll.hs

@@ -25,10 +25,10 @@ module Gargantext.API.ThrowAll (
 
 import Control.Lens ((#))
 import Data.ByteString.Char8 qualified as C8
-import Gargantext.API.Admin.Auth.Types
+import Gargantext.API.Admin.Auth.Types (AuthenticatedUser(..))
 import Gargantext.API.Admin.EnvTypes (Env)
-import Gargantext.API.Errors.Types
-import Gargantext.API.Prelude
+import Gargantext.API.Errors.Types (BackendInternalError)
+import Gargantext.API.Prelude (GargM, _ServerError)
 import Gargantext.API.Routes.Named.Private qualified as Named
 import Gargantext.API.Server.Named.Private qualified as Named
 import Gargantext.Database.Admin.Types.Node (UserId (..))
@@ -36,7 +36,6 @@ import Gargantext.Prelude hiding (Handler)
 import Network.HTTP.Types.Status (Status(..))
 import Network.Wai (responseLBS)
 import Servant
-import Servant.API.Generic ()
 import Servant.Auth.Server (AuthResult(..))
 import Servant.Server.Generic (AsServerT)
 

test/Test/Instances.hs

@@ -38,10 +38,15 @@ import Gargantext.API.Node.New.Types (PostNode(..))
 import Gargantext.API.Node.Share.Types (ShareNodeParams(..))
 import Gargantext.API.Node.Update.Types qualified as NU
 import Gargantext.API.Node.Types (NewWithForm, RenameNode(..), WithQuery)
+import Gargantext.API.Public.Types (PublicData(..))
+import Gargantext.API.Routes.Named.Publish (PublishRequest(..))
+import Gargantext.API.Search.Types (SearchQuery(..), SearchResult(..), SearchResultTypes(..), SearchType(..))
+import Gargantext.API.Table.Types (TableQuery(..))
 import Gargantext.API.Viz.Types (PhyloData)
 import Gargantext.Core (Lang)
 import Gargantext.Core.Notifications.CentralExchange.Types qualified as CET
 import Gargantext.Core.Notifications.Dispatcher.Types qualified as DET
+import Gargantext.Core.Text.Corpus.Query (RawQuery(..))
 import Gargantext.Core.Types (TableResult)
 import Gargantext.Core.Types.Individu qualified as Individu
 import Gargantext.Core.Types.Main (ListType(CandidateTerm, StopTerm, MapTerm))
@@ -49,6 +54,7 @@ import Gargantext.Core.Viz.Phylo qualified as Phylo
 import Gargantext.Core.Worker.Jobs.Types (Job(..))
 import Gargantext.Database.Admin.Types.Hyperdata qualified as Hyperdata
 import Gargantext.Database.Admin.Types.Node (NodeId(..), UserId(..), NodeType(..))
+import Gargantext.Database.Query.Facet (OrderBy(..))
 import Gargantext.Prelude hiding (replace, Location)
 import Servant.Job.Core qualified as SJ
 import Servant.Job.Types qualified as SJ
@@ -129,6 +135,40 @@ instance Arbitrary Datafield where arbitrary = genericArbitrary
 instance Arbitrary WithQuery where arbitrary = genericArbitrary
 
 
+instance Arbitrary PublicData where
+  arbitrary = elements
+            $ replicate 6 defaultPublicData
+
+defaultPublicData :: PublicData
+defaultPublicData =
+  PublicData { title = "Title"
+             , abstract = foldl (<>) "" $ replicate 100 "abstract "
+             , img = "images/Gargantextuel-212x300.jpg"
+             , url = "https://.."
+             , date = "YY/MM/DD"
+             , database = "database"
+             , author = "Author" }
+
+
+instance Arbitrary PublishRequest where
+  arbitrary = PublishRequest <$> arbitraryBoundedEnum
+
+instance Arbitrary SearchQuery where
+  arbitrary = elements [SearchQuery (RawQuery "electrodes") SearchDoc]
+  -- arbitrary = elements [SearchQuery "electrodes" 1 ] --SearchDoc]
+instance Arbitrary SearchResult where
+  arbitrary = SearchResult <$> arbitrary
+instance Arbitrary SearchResultTypes where
+  arbitrary = do
+    srd <- SearchResultDoc     <$> arbitrary
+    src <- SearchResultContact <$> arbitrary
+    srn <- pure $ SearchNoResult "No result because.."
+    elements [srd, src, srn]
+instance Arbitrary SearchType where
+  arbitrary = elements [SearchDoc, SearchContact]
+
+
+
 -- The endpoint does nothing currently, but if it will, we need to provide some valid _wf_data
 instance Arbitrary AnnuaireWithForm where arbitrary = genericArbitrary
 
@@ -150,6 +190,19 @@ instance Arbitrary ShareNodeParams where
                        , SharePublicParams (UnsafeMkNodeId 1)
                        ]
 
+
+
+instance Arbitrary TableQuery where
+  arbitrary = elements [TableQuery { tq_offset = 0
+                                   , tq_limit = 10
+                                   , tq_orderBy = DateAsc
+                                   , tq_view = Docs
+                                   , tq_query = "electrodes" }]
+
+
+
+
+
 -- phylo
 
 instance Arbitrary Phylo.PhyloSubConfigAPI where arbitrary = genericArbitrary