-}
-{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+
{-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE ScopedTypeVariables #-}
import Control.Lens (view)
import Data.Text (Text)
import Data.Validity
-import Gargantext.API.Admin.Auth (AuthRequest, AuthResponse, AuthenticatedUser(..), withAccess, PathId(..))
+import Gargantext.API.Admin.Auth.Types (AuthRequest, AuthResponse, AuthenticatedUser(..), PathId(..))
+import Gargantext.API.Admin.Auth (withAccess)
import Gargantext.API.Admin.FrontEnd (FrontEndAPI)
import Gargantext.API.Count (CountAPI, count, Query)
import Gargantext.API.Ngrams (TableNgramsApi, apiNgramsTableDoc)
import Servant.Auth.Swagger ()
import Servant.Job.Async
import Servant.Swagger.UI
-import qualified Gargantext.API.Ngrams.List as List
-import qualified Gargantext.API.Node.Contact as Contact
-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.Public as Public
+import qualified Gargantext.API.Ngrams.List as List
+import qualified Gargantext.API.Node.Contact as Contact
+import qualified Gargantext.API.Node.Corpus.Annuaire as Annuaire
+import qualified Gargantext.API.Node.Corpus.Export as Export
+import qualified Gargantext.API.Node.Corpus.Export.Types as Export
+import qualified Gargantext.API.Node.Corpus.New as New
+import qualified Gargantext.API.Public as Public
type GargAPI = "api" :> Summary "API " :> GargAPIVersion
-- | TODO :<|> Summary "Latest API" :> GargAPI'
:> Export.API
-- Annuaire endpoint
+{-
+ :<|> "contact" :> Summary "Contact endpoint"
+ :> Capture "contact_id" ContactId
+ :> NodeAPI HyperdataContact
+--}
+
:<|> "annuaire" :> Summary "Annuaire endpoint"
:> Capture "annuaire_id" AnnuaireId
:> NodeAPI HyperdataAnnuaire
:<|> "annuaire" :> Summary "Contact endpoint"
:> Capture "annuaire_id" NodeId
:> Contact.API
-
-- Document endpoint
:<|> "document" :> Summary "Document endpoint"
:> Capture "doc_id" DocId
-- :<|> New.Upload
:<|> New.AddWithForm
- :<|> New.AddWithFile
+-- :<|> New.AddWithFile
:<|> New.AddWithQuery
-- :<|> "annuaire" :> Annuaire.AddWithForm
:<|> "lists" :> Summary "List export API"
:> Capture "listId" ListId
:> List.API
-
+{-
:<|> "wait" :> Summary "Wait test"
:> Capture "x" Int
:> WaitAPI -- Get '[JSON] Int
-
+-}
-- /mv/<id>/<id>
-- /merge/<id>/<id>
-- /rename/<id>
:<|> nodeAPI (Proxy :: Proxy HyperdataCorpus) uid
:<|> nodeNodeAPI (Proxy :: Proxy HyperdataAny) uid
:<|> Export.getCorpus -- uid
+ -- :<|> nodeAPI (Proxy :: Proxy HyperdataContact) uid
:<|> nodeAPI (Proxy :: Proxy HyperdataAnnuaire) uid
:<|> Contact.api uid
<$> PathNode <*> treeAPI
-- TODO access
:<|> addCorpusWithForm (RootId (NodeId uid))
- :<|> addCorpusWithFile (RootId (NodeId uid))
+ -- :<|> addCorpusWithFile (RootId (NodeId uid))
:<|> addCorpusWithQuery (RootId (NodeId uid))
-- :<|> addAnnuaireWithForm
-- :<|> New.api uid -- TODO-SECURITY
-- :<|> New.info uid -- TODO-SECURITY
:<|> List.api
- :<|> waitAPI
+-- :<|> waitAPI
----------------------------------------------------------------------
addCorpusWithQuery :: User -> GargServer New.AddWithQuery
addCorpusWithQuery user cid =
serveJobsAPI $
- JobFunction (\q log -> do
- limit <- view $ config . gc_max_docs_scrapers
- New.addToCorpusWithQuery user cid q (Just limit) (liftBase . log)
+ JobFunction (\q log' -> do
+ limit <- view $ hasConfig . gc_max_docs_scrapers
+ New.addToCorpusWithQuery user cid q (Just limit) (liftBase . log')
{- let log' x = do
printDebug "addToCorpusWithQuery" x
liftBase $ log x
addCorpusWithForm :: User -> GargServer New.AddWithForm
addCorpusWithForm user cid =
serveJobsAPI $
- JobFunction (\i log ->
+ JobFunction (\i log' ->
let
- log' x = do
+ log'' x = do
printDebug "addToCorpusWithForm" x
- liftBase $ log x
- in New.addToCorpusWithForm user cid i log')
+ liftBase $ log' x
+ in New.addToCorpusWithForm user cid i log'')
addCorpusWithFile :: User -> GargServer New.AddWithFile
addCorpusWithFile user cid =
serveJobsAPI $
- JobFunction (\i log ->
+ JobFunction (\i log' ->
let
- log' x = do
+ log'' x = do
printDebug "addToCorpusWithFile" x
- liftBase $ log x
- in New.addToCorpusWithFile user cid i log')
+ liftBase $ log' x
+ in New.addToCorpusWithFile user cid i log'')
addAnnuaireWithForm :: GargServer Annuaire.AddWithForm
addAnnuaireWithForm cid =
serveJobsAPI $
- JobFunction (\i log -> Annuaire.addToAnnuaireWithForm cid i (liftBase . log))
+ JobFunction (\i log' -> Annuaire.addToAnnuaireWithForm cid i (liftBase . log'))