[API] remove Count API

gargantext.cabal

@@ -120,7 +120,6 @@ library
       Gargantext.API.Admin.Orchestrator.Types
       Gargantext.API.Admin.Settings
       Gargantext.API.Auth.PolicyCheck
-      Gargantext.API.Count.Types
       Gargantext.API.Dev
       Gargantext.API.Errors
       Gargantext.API.Errors.Class
@@ -166,7 +165,6 @@ library
       Gargantext.API.Routes.Named.Contact
       Gargantext.API.Routes.Named.Context
       Gargantext.API.Routes.Named.Corpus
-      Gargantext.API.Routes.Named.Count
       Gargantext.API.Routes.Named.Document
       Gargantext.API.Routes.Named.EKG
       Gargantext.API.Routes.Named.File
@@ -330,7 +328,6 @@ library
       Gargantext.API.Admin.Auth
       Gargantext.API.Admin.FrontEnd
       Gargantext.API.Context
-      Gargantext.API.Count
       Gargantext.API.EKG
       Gargantext.API.GraphQL
       Gargantext.API.GraphQL.Annuaire

src/Gargantext/API/Count.hs

-{-|
-Module      : Gargantext.API.Count
-Description : Server API
-Copyright   : (c) CNRS, 2017-Present
-License     : AGPL + CECILL v3
-Maintainer  : team@gargantext.org
-Stability   : experimental
-Portability : POSIX
-
-Count API part of Gargantext.
--}
-
-{-# OPTIONS_GHC -fno-warn-deprecations #-}
-
-{-# LANGUAGE TemplateHaskell    #-}
-{-# LANGUAGE TypeOperators      #-}
-{-# LANGUAGE DeriveAnyClass     #-}
-
-module Gargantext.API.Count (
-    countAPI
-  ) where
-
-import Gargantext.API.Count.Types
-import Gargantext.API.Routes.Named.Count qualified as Named
-import Gargantext.Prelude
-import Servant.Server.Generic (AsServerT)
-
------------------------------------------------------------------------
--- TODO-ACCESS: CanCount
--- TODO-EVENTS: No events as this is a read only query.
------------------------------------------------------------------------
-countAPI :: Query -> Named.CountAPI (AsServerT m)
-countAPI _ = Named.CountAPI undefined

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(..)
-  , Query(..)
-  , Message(..)
-  , Code
-  , Error
-  , Errors
-  , Counts(..)
-  , Count(..)
-
-  -- * functions
-  , scrapers
-  ) where
-
-import Data.Swagger ( ToSchema(..), genericDeclareNamedSchema )
-import Data.Text (pack)
-import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Prelude
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary (Arbitrary(..))
-
------------------------------------------------------------------------
-data Scraper = Pubmed | Hal | IsTex | Isidore
-  deriving (Eq, Show, Generic, Enum, Bounded)
-
-scrapers :: [Scraper]
-scrapers = [minBound..maxBound]
-
-instance FromJSON Scraper
-instance ToJSON   Scraper
-
-instance Arbitrary Scraper where
-    arbitrary = elements scrapers
-
-instance ToSchema Scraper
-
------------------------------------------------------------------------
-data QueryBool = QueryBool Text
-        deriving (Eq, Show, Generic)
-
-queries :: [QueryBool]
-queries =  [QueryBool (pack "(X OR X') AND (Y OR Y') NOT (Z OR Z')")]
---queries =  [QueryBool (pack "(X + X') * (Y + Y') - (Z + Z')")]
-
-instance Arbitrary QueryBool where
-    arbitrary = elements queries
-
-instance FromJSON QueryBool
-instance ToJSON   QueryBool
-
-instance ToSchema QueryBool
------------------------------------------------------------------------
-
-data Query = Query { query_query :: QueryBool
-                   , query_name  :: Maybe [Scraper]
-                   }
-                   deriving (Eq, Show, Generic)
-instance FromJSON Query
-instance ToJSON   Query
-
-instance Arbitrary Query where
-    arbitrary = elements [ Query q (Just n) 
-                         | q <- queries
-                         , n <- take 10 $ permutations scrapers
-                         ]
-
-instance ToSchema Query where
-  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "query_")
-
------------------------------------------------------------------------
-type Code = Integer
-type Error  = Text
-type Errors = [Error]
-
------------------------------------------------------------------------
-data Message = Message Code Errors
-        deriving (Eq, Show, Generic)
-
-toMessage :: [(Code, Errors)] -> [Message]
-toMessage = map (\(c,err) -> Message c err)
-
-messages :: [Message]
-messages =  toMessage $ [ (400, ["Ill formed query             "])
-                        , (300, ["API connexion error          "])
-                        , (300, ["Internal Gargantext Error    "])
-                        ] <> take 10 ( repeat (200, [""]))
-
-instance Arbitrary Message where
-    arbitrary = elements messages
-
-instance ToSchema Message
------------------------------------------------------------------------
-data Counts = Counts { results :: [Either Message Count]
-                     } deriving (Eq, Show, Generic)
-
-
-instance Arbitrary Counts where
-    arbitrary = elements [Counts [ Right (Count Pubmed (Just 20 ))
-                                 , Right (Count IsTex  (Just 150))
-                                 , Right (Count Hal    (Just 150))
-                                 ]
-                         ]
-
-instance ToSchema Counts
-
------------------------------------------------------------------------
-data Count = Count { count_name    :: Scraper
-                   , count_count   :: Maybe Int
-                   }
-                   deriving (Eq, Show, Generic)
-
-instance ToSchema Count where
-  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "count_")
---instance Arbitrary Count where
---    arbitrary = Count <$> arbitrary <*> arbitrary <*> arbitrary
-
---
--- JSON instances
---
-
-instance FromJSON Message
-instance ToJSON   Message
-
-$(deriveJSON (unPrefix "count_") ''Count)
-
-instance FromJSON Counts
-instance ToJSON   Counts
-

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

-{-# LANGUAGE TypeOperators #-}
-
-module Gargantext.API.Routes.Named.Count (
-  -- * Routes types
-    CountAPI(..)
-
-  -- * Re-exports
-  , module X
-  ) where
-
-import GHC.Generics (Generic)
-import Gargantext.API.Count.Types as X
-import Servant
-
-
-newtype CountAPI mode = CountAPI
-  { postCountsEp :: mode :- Post '[JSON] X.Counts
-  } deriving Generic

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

@@ -30,7 +30,6 @@ 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 (AddWithTempFile, 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
@@ -81,9 +80,6 @@ data GargPrivateAPI' mode = GargPrivateAPI'
                                          :> NamedRoutes DocumentExportAPI
   , phyloExportAPI    :: mode :- "phylo" :> Capture "node_id" DocId
                                          :> NamedRoutes PhyloExportAPI
-  , countAPI :: mode :- "count" :> Summary "Count endpoint"
-                                :> ReqBody '[JSON] Query
-                                :> NamedRoutes CountAPI
   , graphAPI :: mode :- "graph" :> Summary "Graph endpoint"
                                 :> Capture "graph_id" NodeId
                                 :> NamedRoutes GraphAPI

src/Gargantext/API/Search.hs

 {-|
-Module      : Gargantext.API.Count
+Module      : Gargantext.API.Search
 Description : Server API
 Copyright   : (c) CNRS, 2017-Present
 License     : AGPL + CECILL v3

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

@@ -5,7 +5,6 @@ module Gargantext.API.Server.Named.Private where
 import Gargantext.API.Admin.Auth.Types (AuthenticatedUser(..))
 import Gargantext.API.Admin.EnvTypes (Env)
 import Gargantext.API.Context (contextAPI)
-import Gargantext.API.Count qualified as Count
 import Gargantext.API.Errors.Types (BackendInternalError)
 import Gargantext.API.Members (members)
 import Gargantext.API.Ngrams.List qualified as List
@@ -54,7 +53,6 @@ serverPrivateGargAPI' authenticatedUser@(AuthenticatedUser userNodeId userId)
        , tableNgramsAPI    = apiNgramsTableDoc authenticatedUser
        , phyloExportAPI    = PhyloExport.api userNodeId
        , documentExportAPI = documentExportAPI userNodeId
-       , countAPI          = Count.countAPI
        , graphAPI          = Viz.graphAPI authenticatedUser userId
        , treeAPI           = Tree.treeAPI authenticatedUser
        , treeFlatAPI       = Tree.treeFlatAPI authenticatedUser