[API/FACTO] Node.Corpus

src/Gargantext/API.hs

@@ -94,9 +94,9 @@ import Servant.Swagger.UI
 import System.IO (FilePath)
 import qualified Data.ByteString.Lazy.Char8 as BL8
 import qualified Data.Text.IO               as T
-import qualified Gargantext.API.Corpus.Annuaire  as Annuaire
-import qualified Gargantext.API.Corpus.Export    as Export
-import qualified Gargantext.API.Corpus.New       as New
+import qualified Gargantext.API.Node.Corpus.Annuaire  as Annuaire
+import qualified Gargantext.API.Node.Corpus.Export    as Export
+import qualified Gargantext.API.Node.Corpus.New       as New
 import qualified Gargantext.API.Ngrams.List      as List
 import qualified Paths_gargantext                as PG -- cabal magic build module
 
@@ -109,11 +109,8 @@ fireWall req fw = do
     let origin = lookup "Origin" (requestHeaders req)
     let host   = lookup "Host"   (requestHeaders req)
 
-    let hostOk   = Just (encodeUtf8 "localhost:3000")
-    let originOk = Just (encodeUtf8 "http://localhost:8008")
-
-    if  origin == originOk
-       && host == hostOk
+    if  origin == Just (encodeUtf8 "http://localhost:8008")
+       && host == Just (encodeUtf8 "localhost:3000")
        || (not $ unFireWall fw)
 
        then pure True

src/Gargantext/API/Ngrams/List.hs

@@ -30,8 +30,8 @@ import Data.Map (Map, toList, fromList)
 import Data.Swagger (ToSchema, declareNamedSchema, genericDeclareNamedSchema)
 import Data.Text (Text, concat, pack)
 import GHC.Generics (Generic)
-import Gargantext.API.Corpus.New
-import Gargantext.API.Corpus.New.File (FileType(..))
+import Gargantext.API.Node.Corpus.New
+import Gargantext.API.Node.Corpus.New.File (FileType(..))
 import Gargantext.API.Ngrams
 import Gargantext.API.Admin.Orchestrator.Types
 import Gargantext.API.Admin.Types (GargServer)

src/Gargantext/API/Node.hs

@@ -180,7 +180,14 @@ nodeNodeAPI p uId cId nId = withAccess (Proxy :: Proxy (NodeNodeAPI a)) Proxy uI
 
 ------------------------------------------------------------------------
 -- TODO: make the NodeId type indexed by `a`, then we no longer need the proxy.
-nodeAPI :: forall proxy a. (JSONB a, FromJSON a, ToJSON a) => proxy a -> UserId -> NodeId -> GargServer (NodeAPI a)
+nodeAPI :: forall proxy a.
+       ( JSONB a
+       , FromJSON a
+       , ToJSON a
+       ) => proxy a
+         -> UserId
+         -> NodeId
+         -> GargServer (NodeAPI a)
 nodeAPI p uId id' = withAccess (Proxy :: Proxy (NodeAPI a)) Proxy uId (PathNode id') nodeAPI'
   where
     nodeAPI' :: GargServer (NodeAPI a)

src/Gargantext/API/Corpus/Annuaire.hs → src/Gargantext/API/Node/Corpus/Annuaire.hs

 {-|
-Module      : Gargantext.API.Corpus.Annuaire
+Module      : Gargantext.API.Node.Corpus.Annuaire
 Description : New annuaire API
 Copyright   : (c) CNRS, 2017-Present
 License     : AGPL + CECILL v3
@@ -17,7 +17,7 @@ Portability : POSIX
 {-# LANGUAGE FlexibleContexts   #-}
 {-# LANGUAGE RankNTypes         #-}
 
-module Gargantext.API.Corpus.Annuaire
+module Gargantext.API.Node.Corpus.Annuaire
       where
 
 import Control.Lens hiding (elements)
@@ -37,7 +37,7 @@ import Servant.Job.Core
 import Servant.Job.Types
 import Servant.Job.Utils (jsonOptions)
 import Web.FormUrlEncoded (FromForm)
-import qualified Gargantext.API.Corpus.New.File as NewFile
+import qualified Gargantext.API.Node.Corpus.New.File as NewFile
 
 
 type Api = Summary "New Annuaire endpoint"

src/Gargantext/API/Corpus/Export.hs → src/Gargantext/API/Node/Corpus/Export.hs

 {-|
-Module      : Gargantext.API.Corpus.Export
+Module      : Gargantext.API.Node.Corpus.Export
 Description : Get Metrics from Storage (Database like)
 Copyright   : (c) CNRS, 2017-Present
 License     : AGPL + CECILL v3
@@ -22,7 +22,7 @@ Main exports of Gargantext:
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE TypeOperators     #-}
 
-module Gargantext.API.Corpus.Export
+module Gargantext.API.Node.Corpus.Export
   where
 
 import Data.Aeson.TH (deriveJSON)

src/Gargantext/API/Corpus/New.hs → src/Gargantext/API/Node/Corpus/New.hs

 {-|
-Module      : Gargantext.API.Corpus.New
+Module      : Gargantext.API.Node.Corpus.New
 Description : New corpus API
 Copyright   : (c) CNRS, 2017-Present
 License     : AGPL + CECILL v3
@@ -22,7 +22,7 @@ New corpus means either:
 {-# LANGUAGE RankNTypes         #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-module Gargantext.API.Corpus.New
+module Gargantext.API.Node.Corpus.New
       where
 
 import Control.Lens hiding (elements, Empty)
@@ -35,7 +35,7 @@ import Data.Text (Text)
 import GHC.Generics (Generic)
 import Gargantext.API.Admin.Orchestrator.Types (ScraperStatus(..))
 import qualified Gargantext.API.Admin.Orchestrator.Types as T
-import Gargantext.API.Corpus.New.File
+import Gargantext.API.Node.Corpus.New.File
 import Gargantext.Core (Lang(..){-, allLangs-})
 import Gargantext.Core.Types.Individu (UserId, User(..))
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)

src/Gargantext/API/Corpus/New/File.hs → src/Gargantext/API/Node/Corpus/New/File.hs

 {-|
-Module      : Gargantext.API.Corpus.New.File
+Module      : Gargantext.API.Node.Corpus.New.File
 Description : Server API
 Copyright   : (c) CNRS, 2017-Present
 License     : AGPL + CECILL v3
@@ -22,7 +22,7 @@ Portability : POSIX
 {-# LANGUAGE TemplateHaskell      #-}
 {-# LANGUAGE TypeOperators        #-}
 
-module Gargantext.API.Corpus.New.File
+module Gargantext.API.Node.Corpus.New.File
   where
 
 import Control.Lens ((.~), (?~))

src/Gargantext/Database/Admin/Types/Node.hs

@@ -85,7 +85,6 @@ instance ToSchema hyperdata =>
                   ) where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_node_")
 
-
 instance ToSchema hyperdata =>
          ToSchema (NodePolySearch NodeId NodeTypeId
                             (Maybe UserId)
@@ -102,7 +101,6 @@ instance ToSchema hyperdata =>
                   ) where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_ns_")
 
-
 instance (Arbitrary hyperdata
          ,Arbitrary nodeId
          ,Arbitrary nodeTypeId
@@ -127,8 +125,6 @@ instance (Arbitrary hyperdata
                      <*> arbitrary <*> arbitrary <*> arbitrary
                      <*> arbitrary <*> arbitrary
 
-
-
 ------------------------------------------------------------------------
 pgNodeId :: NodeId -> O.Column O.PGInt4
 pgNodeId = O.pgInt4 . id2int
@@ -158,7 +154,6 @@ type TSVector     = Text
 
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
-
 instance FromHttpApiData NodeId where
   parseUrlPiece n = pure $ NodeId $ (read . cs) n
 
@@ -306,7 +301,6 @@ instance ToSchema EventLevel where
   declareNamedSchema proxy = genericDeclareNamedSchema defaultSchemaOptions proxy
 
 ------------------------------------------------------------------------
-
 data Event = Event { event_level   :: !EventLevel
                    , event_message :: !Text
                    , event_date    :: !UTCTime
@@ -320,7 +314,6 @@ instance ToSchema Event where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "event_")
 
 ------------------------------------------------------------------------
-
 data Resource = Resource { resource_path    :: !(Maybe Text)
                          , resource_scraper :: !(Maybe Text)
                          , resource_query   :: !(Maybe Text)
@@ -428,7 +421,6 @@ instance Arbitrary HyperdataCorpus where
     arbitrary = pure hyperdataCorpus -- TODO
 
 ------------------------------------------------------------------------
-
 data HyperdataList =
   HyperdataList { hd_list :: !(Maybe Text)
                 } deriving (Show, Generic)
@@ -564,7 +556,6 @@ instance FromHttpApiData NodeType
 instance ToParamSchema NodeType
 instance ToSchema      NodeType
 
-
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
 hyperdataDocument :: HyperdataDocument
@@ -606,11 +597,10 @@ instance ToSchema HyperdataAny where
              & schema.description ?~ "a node"
              & schema.example ?~ emptyObject -- TODO
 
-
 instance ToSchema Status where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "status_")
 
-
+------------------------------------------------------------------------
 
 instance FromField HyperdataAny where
     fromField = fromField'
@@ -663,7 +653,6 @@ instance QueryRunnerColumnDefault PGJsonb HyperData
   where
     queryRunnerColumnDefault = fieldQueryRunnerColumn
 
-
 instance QueryRunnerColumnDefault PGJsonb HyperdataDocument
   where
     queryRunnerColumnDefault = fieldQueryRunnerColumn

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

@@ -31,7 +31,6 @@ module Gargantext.Database.Query.Table.Node
 import Control.Arrow (returnA)
 import Control.Lens (set, view)
 import Data.Aeson
-import Data.Proxy (Proxy(..))
 import Data.Maybe (Maybe(..))
 import Data.Text (Text)
 import GHC.Int (Int64)
@@ -244,7 +243,6 @@ instance HasDefault NodeType where
       _         -> undefined
 
 ------------------------------------------------------------------------
-
 nodeDefault :: NodeType -> ParentId -> UserId -> NodeWrite
 nodeDefault nt parent = node nt name hyper (Just parent)
   where