[API] some refactoring

src/Gargantext/API/Node.hs

@@ -32,7 +32,7 @@ import Gargantext.API.Admin.Auth (withNamedAccess, withNamedPolicyT, withPolicy,
 import Gargantext.API.Admin.EnvTypes (Env)
 import Gargantext.API.Auth.PolicyCheck ( nodeReadChecks, nodeWriteChecks, moveChecks, AccessPolicyManager, publishChecks )
 import Gargantext.API.Errors.Types (BackendInternalError)
-import Gargantext.API.Metrics
+import Gargantext.API.Metrics (chartApi, pieApi, scatterApi, treeApi, updateChart)
 import Gargantext.API.Ngrams.Types (TabType(..))
 import Gargantext.API.Node.DocumentsFromWriteNodes qualified as DFWN
 import Gargantext.API.Node.DocumentUpload qualified as DocumentUpload
@@ -40,7 +40,7 @@ import Gargantext.API.Node.File ( fileApi, fileAsyncApi )
 import Gargantext.API.Node.FrameCalcUpload qualified as FrameCalcUpload
 import Gargantext.API.Node.New ( postNode, postNodeAsyncAPI )
 import Gargantext.API.Node.Share qualified as Share
-import Gargantext.API.Node.Types
+import Gargantext.API.Node.Types (NodesToCategory(..), NodesToScore(..), RenameNode(..))
 import Gargantext.API.Node.Update qualified as Update
 import Gargantext.API.Prelude ( GargM, GargServer, IsGargServer )
 import Gargantext.API.Routes.Named.File qualified as Named
@@ -60,13 +60,13 @@ import Gargantext.Database.Action.Delete qualified as Action (deleteNode)
 import Gargantext.Database.Action.Flow.Pairing (pairing)
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataAny, HyperdataCorpus, HyperdataAnnuaire)
 import Gargantext.Database.Admin.Types.Hyperdata.Prelude ( HyperdataC )
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node (CorpusId, NodeId, ParentId, RootId, UserId)
 import Gargantext.Database.Prelude (DBCmdExtra, JSONB)
-import Gargantext.Database.Query.Table.Node
+import Gargantext.Database.Query.Table.Node (defaultList, deleteNodes, getNodeWith, getNodesWithParentId)
 import Gargantext.Database.Query.Table.Node.Children (getChildren)
 import Gargantext.Database.Query.Table.NodeContext (nodeContextsCategory, nodeContextsScore)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
-import Gargantext.Database.Query.Table.NodeNode
+import Gargantext.Database.Query.Table.NodeNode (SourceId(..), TargetId(..), pairCorpusWithAnnuaire, _nn_node2_id, getNodeNode)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Query.Table.Node.Update qualified as U (update, Update(..), publish)
 import Gargantext.Database.Query.Table.Node.Update (Update(..), update)

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

@@ -24,7 +24,7 @@ module Gargantext.API.Routes.Named.Corpus (
 import Data.Aeson.TH (deriveJSON)
 import Data.Swagger (ToSchema(..), genericDeclareNamedSchema)
 import Data.Text (Text)
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.API.Node.Corpus.Export.Types (Corpus, CorpusSQLite)
 import Gargantext.API.Node.Types (NewWithForm, WithQuery)
 import Gargantext.API.Worker (WorkerAPI)

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

@@ -32,16 +32,16 @@ import Gargantext.API.Routes.Named.Context (ContextAPI)
 import Gargantext.API.Routes.Named.Corpus (AddWithTempFile, AddWithQuery, CorpusExportAPI, MakeSubcorpusAPI)
 import Gargantext.API.Routes.Named.Document (DocumentExportAPI)
 import Gargantext.API.Routes.Named.List (GETAPI, JSONAPI, TSVAPI)
-import Gargantext.API.Routes.Named.Node
-import Gargantext.API.Routes.Named.Remote
-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
+import Gargantext.API.Routes.Named.Node (NodeAPI, NodesAPI, NodeNodeAPI, Roots)
+import Gargantext.API.Routes.Named.Remote (RemoteImportAPI)
+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 GHC.Generics (Generic)
 import Servant.API
 import Servant.Auth qualified as SA
 

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

+{-|
+Module      : Gargantext.API.Routes.Named.Remote
+Description : Server API
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
 
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE TypeOperators #-}
+
 module Gargantext.API.Routes.Named.Remote (
   -- * Routes types
     RemoteExportAPI(..)
@@ -13,16 +25,15 @@ import Conduit qualified as C
 import Data.Aeson as JSON
 import Data.ByteString.Lazy qualified as BL
 import Data.ByteString qualified as BS
-import Data.Proxy
-import Data.Swagger hiding (Http)
+import Data.Proxy (Proxy(Proxy))
+import Data.Swagger (NamedSchema(..), ToSchema, declareNamedSchema, binarySchema, sketchStrictSchema)
 import Gargantext.API.Admin.Auth.Types (Token)
 import Gargantext.API.Auth.PolicyCheck (PolicyChecked)
 import Gargantext.Database.Admin.Types.Node ( NodeId (..) )
-import GHC.Generics
+import GHC.Generics (Generic)
 import Prelude
 import Servant.API
-import Servant.Client.Core.BaseUrl
-import Test.QuickCheck
+import Servant.Client.Core.BaseUrl (BaseUrl(..), parseBaseUrl, Scheme(Http))
 
 
 data RemoteExportAPI mode = RemoteExportAPI
@@ -42,9 +53,6 @@ data RemoteExportRequest =
   , _rer_instance_auth :: Token
   } deriving (Show, Eq, Generic)
 
-instance Arbitrary RemoteExportRequest where
-  arbitrary = RemoteExportRequest <$> (pure (BaseUrl Http "dev.sub.gargantext.org" 8008 "")) <*> arbitrary
-
 instance ToJSON RemoteExportRequest where
   toJSON RemoteExportRequest{..}
     = JSON.object [ "instance_url"  .= toJSON _rer_instance_url

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

@@ -17,7 +17,7 @@ import Data.Aeson (withText)
 import Data.Swagger (ToSchema, declareNamedSchema)
 import Data.Text qualified as T
 import Gargantext.API.Node.Share.Types ( ShareNodeParams (..) )
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node (NodeId, NodeType)
 import Gargantext.Prelude
 import Network.URI (parseURI)
 import Prelude (fail)

test/Test/Instances.hs

@@ -42,6 +42,7 @@ import Gargantext.API.Node.Update.Types qualified as NU
 import Gargantext.API.Node.Types (NewWithForm, NewWithTempFile(..), RenameNode(..), WithQuery)
 import Gargantext.API.Public.Types (PublicData(..))
 import Gargantext.API.Routes.Named.Publish (PublishRequest(..))
+import Gargantext.API.Routes.Named.Remote (RemoteExportRequest(..))
 import Gargantext.API.Search.Types (SearchQuery(..), SearchResult(..), SearchResultTypes(..), SearchType(..))
 import Gargantext.API.Table.Types (TableQuery(..))
 import Gargantext.API.Viz.Types (PhyloData)
@@ -58,6 +59,7 @@ 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.Client.Core.BaseUrl (BaseUrl(..), Scheme(Http))
 import Text.Parsec.Error (ParseError, Message(..), newErrorMessage)
 import Text.Parsec.Pos
 import Test.QuickCheck
@@ -155,6 +157,11 @@ defaultPublicData =
 instance Arbitrary PublishRequest where
   arbitrary = PublishRequest <$> arbitraryBoundedEnum
 
+
+instance Arbitrary RemoteExportRequest where
+  arbitrary = RemoteExportRequest <$> (pure (BaseUrl Http "dev.sub.gargantext.org" 8008 "")) <*> arbitrary
+
+
 instance Arbitrary SearchQuery where
   arbitrary = elements [SearchQuery (RawQuery "electrodes") SearchDoc]
   -- arbitrary = elements [SearchQuery "electrodes" 1 ] --SearchDoc]