Merge branch 'dev-list-charts' of...

Merge branch 'dev-list-charts' of ssh://gitlab.iscpif.fr:20022/gargantext/haskell-gargantext into dev

bin/gargantext-adaptative-phylo/Main.hs

@@ -24,7 +24,7 @@ import Data.String (String)
 import Data.Text  (Text, unwords, unpack)
 
 import Gargantext.Prelude
-import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 import Gargantext.Text.Context (TermList)
 import Gargantext.Text.Corpus.Parsers.CSV (csv_title, csv_abstract, csv_publication_year)
 import Gargantext.Text.Corpus.Parsers (FileFormat(..),parseFile)

bin/gargantext-import/Main.hs

@@ -25,7 +25,8 @@ import Gargantext.Core (Lang(..))
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Action.Flow (FlowCmdM, flowCorpusFile, flowAnnuaire, TermType(..))
 import Gargantext.Database.Query.Table.User (insertUsersDemo)
-import Gargantext.Database.Admin.Types.Node (CorpusId, toHyperdataDocument)
+import Gargantext.Database.Admin.Types.Hyperdata (toHyperdataDocument)
+import Gargantext.Database.Admin.Types.Node (CorpusId)
 import Gargantext.Database.Prelude (Cmd, )
 import Gargantext.Prelude
 import Gargantext.Text.Corpus.Parsers (FileFormat(..))

bin/gargantext-init/Main.hs

@@ -27,7 +27,8 @@ import Gargantext.Database.Query.Table.User (insertUsersDemo)
 import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Admin.Trigger.Init (initTriggers)
-import Gargantext.Database.Admin.Types.Node (CorpusId, RootId, HyperdataCorpus, ListId)
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataCorpus)
+import Gargantext.Database.Admin.Types.Node (CorpusId, RootId, ListId)
 import Gargantext.Database.Prelude (Cmd, )
 import Gargantext.Prelude
 import System.Environment (getArgs)

bin/gargantext-phylo/Main.hs

@@ -25,6 +25,7 @@ import Data.Maybe
 import Data.Text (Text, unwords, unlines)
 import GHC.Generics
 import GHC.IO (FilePath)
+import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Prelude
 import Gargantext.Text.Context (TermList)

devops/docker/docker-compose.yaml

@@ -16,6 +16,17 @@ services:
       - ../dbs:/dbs
       - ../postgres/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
 
+  pgadmin:
+    image: 'dpage/pgadmin4'
+    ports:
+      - 8081:80
+    environment:
+      PGADMIN_DEFAULT_EMAIL: admin
+      PGADMIN_DEFAULT_PASSWORD: admin
+
+    depends_on:
+      - postgres
+
   corenlp:
     image: 'cgenie/corenlp-garg'
     ports:

package.yaml

@@ -51,6 +51,7 @@ library:
   - Gargantext.Database.Prelude
   - Gargantext.Database.Admin.Trigger.Init
   - Gargantext.Database.Admin.Config
+  - Gargantext.Database.Admin.Types.Hyperdata
   - Gargantext.Database.Admin.Types.Node
   - Gargantext.Prelude
   - Gargantext.Text
@@ -86,6 +87,7 @@ library:
   - Gargantext.Viz.Phylo.LevelMaker
   - Gargantext.Viz.Phylo.View.Export
   - Gargantext.Viz.Phylo.View.ViewMaker
+  - Gargantext.Viz.Types
   dependencies:
   - HSvm
   - KMP

src/Gargantext/API/Node.hs

@@ -34,13 +34,15 @@ import Data.Aeson (FromJSON, ToJSON)
 import Data.Maybe
 import Data.Swagger
 import Data.Text (Text())
-import Data.Time (UTCTime)
 import GHC.Generics (Generic)
+import Servant
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
+
 import Gargantext.API.Admin.Auth (withAccess, PathId(..))
 import Gargantext.API.Prelude
 import Gargantext.API.Metrics
-import Gargantext.API.Ngrams (TabType(..), TableNgramsApi, apiNgramsTableCorpus, QueryParamR)
-import Gargantext.API.Ngrams.NTree (MyTree)
+import Gargantext.API.Ngrams (TabType(..), TableNgramsApi, apiNgramsTableCorpus)
 import Gargantext.API.Node.New
 import qualified Gargantext.API.Node.Share  as Share
 import qualified Gargantext.API.Node.Update as Update
@@ -48,7 +50,7 @@ import qualified Gargantext.API.Node.Update as Update
 import Gargantext.API.Search (SearchDocsAPI, searchDocs, SearchPairsAPI, searchPairs)
 import Gargantext.API.Table
 import Gargantext.Core.Types (NodeTableResult)
-import Gargantext.Core.Types.Main (Tree, NodeTree, ListType)
+import Gargantext.Core.Types.Main (Tree, NodeTree)
 import Gargantext.Database.Action.Flow.Pairing (pairing)
 import Gargantext.Database.Query.Facet (FacetDoc, OrderBy(..))
 import Gargantext.Core.Types.Individu (User(..))
@@ -62,11 +64,7 @@ import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude -- (Cmd, CmdM)
 import Gargantext.Database.Query.Table.NodeNode
 import Gargantext.Prelude
-import Gargantext.Viz.Chart
 import Gargantext.Viz.Phylo.API (PhyloAPI, phyloAPI)
-import Servant
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
 import qualified Gargantext.Database.Query.Table.Node.Update as U (update, Update(..))
 import qualified Gargantext.Database.Action.Delete as Action (deleteNode)
 
@@ -213,14 +211,30 @@ nodeAPI p uId id' = withAccess (Proxy :: Proxy (NodeAPI a)) Proxy uId (PathNode
            :<|> getPair     id'
            :<|> searchPairs id'
 
-           :<|> getScatter id'
-           :<|> getChart   id'
-           :<|> getPie     id'
-           :<|> getTree    id'
+           :<|> scatterApi id'
+           :<|> chartApi   id'
+           :<|> pieApi     id'
+           :<|> treeApi    id'
            :<|> phyloAPI   id' uId
            -- :<|> nodeAddAPI id'
            -- :<|> postUpload id'
 
+scatterApi :: NodeId -> GargServer ScatterAPI
+scatterApi id' = getScatter id'
+            :<|> updateScatter id'
+
+chartApi :: NodeId -> GargServer ChartApi
+chartApi id' = getChart id'
+          :<|> updateChart id'
+
+pieApi :: NodeId -> GargServer PieApi
+pieApi id' = getPie id'
+        :<|> updatePie id'
+
+treeApi :: NodeId -> GargServer TreeApi
+treeApi id' = getTree id'
+         :<|> updateTree id'
+
 ------------------------------------------------------------------------
 data RenameNode = RenameNode { r_name :: Text }
   deriving (Generic)
@@ -284,28 +298,6 @@ pairWith cId aId lId = do
   pure r
 
 ------------------------------------------------------------------------
-type ChartApi = Summary " Chart API"
-              :> QueryParam "from" UTCTime
-              :> QueryParam "to"   UTCTime
-              :> Get '[JSON] (ChartMetrics Histo)
-
-type PieApi = Summary " Chart API"
-           :> QueryParam "from" UTCTime
-           :> QueryParam "to"   UTCTime
-           :> QueryParamR "ngramsType" TabType
-           :> Get '[JSON] (ChartMetrics Histo)
-
-type TreeApi = Summary " Tree API"
-           :> QueryParam "from" UTCTime
-           :> QueryParam "to"   UTCTime
-           :> QueryParamR "ngramsType" TabType
-           :> QueryParamR "listType"   ListType
-           :> Get '[JSON] (ChartMetrics [MyTree])
-
-                -- Depending on the Type of the Node, we could post
-                -- New documents for a corpus
-                -- New map list terms
-             -- :<|> "process"  :> MultipartForm MultipartData :> Post '[JSON] Text
 
 ------------------------------------------------------------------------
 type TreeAPI   = QueryParams "type" NodeType :> Get '[JSON] (Tree NodeTree)

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

@@ -20,33 +20,35 @@ module Gargantext.API.Node.Corpus.Export
   where
 
 import Data.Aeson.TH (deriveJSON)
+import qualified Data.List as List
+import qualified Data.Map as Map
 import Data.Map (Map)
 import Data.Maybe (fromMaybe)
 import Data.Set (Set)
+import qualified Data.Set as Set
 import Data.Swagger
 import Data.Text (Text)
 import GHC.Generics (Generic)
+import Servant
+
 import Gargantext.API.Ngrams
 import Gargantext.API.Ngrams.Tools (filterListWithRoot, mapTermListRoot, getRepo)
 import Gargantext.API.Prelude (GargNoServer)
 import Gargantext.Core.Types --
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
 import Gargantext.Database.Action.Metrics.NgramsByNode (getNgramsByNodeOnlyUser)
+import Gargantext.Database.Admin.Config (userMaster)
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Node (Node, NodeId, ListId, CorpusId)
+import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.Select (selectNodesWithUsername)
-import Gargantext.Database.Admin.Config (userMaster)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
-import Gargantext.Database.Admin.Types.Node (Node, HyperdataDocument(..), NodeId, ListId, CorpusId)
-import Gargantext.Database.Prelude (Cmd)
+import Gargantext.Database.Query.Table.NodeNode (selectDocNodes)
 import Gargantext.Database.Schema.Node (_node_id, _node_hyperdata)
 import Gargantext.Database.Schema.Ngrams (NgramsType(..))
-import Gargantext.Database.Query.Table.NodeNode (selectDocNodes)
 import Gargantext.Prelude
 import Gargantext.Prelude.Utils (sha)
-import Servant
-import qualified Data.List as List
-import qualified Data.Map as Map
-import qualified Data.Set as Set
 
 
 -- Corpus Export

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

@@ -27,15 +27,6 @@ import Data.Maybe (fromMaybe)
 import Data.Swagger
 import Data.Text (Text)
 import GHC.Generics (Generic)
-import Gargantext.API.Admin.Orchestrator.Types (JobLog(..))
-import qualified Gargantext.API.Admin.Orchestrator.Types as T
-import Gargantext.API.Node.Corpus.New.File
-import Gargantext.Core (Lang(..){-, allLangs-})
-import Gargantext.Core.Types.Individu (User(..))
-import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Database.Action.Flow (FlowCmdM, flowCorpus, getDataText, flowDataText, TermType(..), DataOrigin(..){-, allDataOrigins-})
-import Gargantext.Database.Admin.Types.Node (CorpusId, ToHyperdataDocument(..), UserId)
-import Gargantext.Prelude
 import Servant
 import Servant.Job.Core
 import Servant.Job.Types
@@ -44,6 +35,17 @@ import Servant.Job.Utils (jsonOptions)
 -- import Test.QuickCheck (elements)
 import Test.QuickCheck.Arbitrary
 import Web.FormUrlEncoded          (FromForm)
+
+import Gargantext.API.Admin.Orchestrator.Types (JobLog(..))
+import qualified Gargantext.API.Admin.Orchestrator.Types as T
+import Gargantext.API.Node.Corpus.New.File
+import Gargantext.Core (Lang(..){-, allLangs-})
+import Gargantext.Core.Types.Individu (User(..))
+import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
+import Gargantext.Database.Action.Flow (FlowCmdM, flowCorpus, getDataText, flowDataText, TermType(..), DataOrigin(..){-, allDataOrigins-})
+import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Node (CorpusId, UserId)
+import Gargantext.Prelude
 import qualified Gargantext.Text.Corpus.API as API
 import qualified Gargantext.Text.Corpus.Parsers as Parser (FileFormat(..), parseFormat)
 

src/Gargantext/API/Routes.hs

@@ -27,6 +27,12 @@ module Gargantext.API.Routes
 import Control.Concurrent (threadDelay)
 import Data.Text (Text)
 import Data.Validity
+import Servant
+import Servant.Auth as SA
+import Servant.Auth.Swagger ()
+import Servant.Job.Async
+import Servant.Swagger.UI
+
 import Gargantext.API.Admin.Auth (AuthRequest, AuthResponse, AuthenticatedUser(..), withAccess, PathId(..))
 import Gargantext.API.Admin.FrontEnd (FrontEndAPI)
 import Gargantext.API.Prelude
@@ -36,15 +42,11 @@ import Gargantext.API.Node
 import Gargantext.API.Search (SearchPairsAPI, searchPairs)
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Query.Table.Node.Contact (HyperdataContact)
+import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Admin.Types.Node (NodeId, CorpusId, AnnuaireId)
 import Gargantext.Prelude
 import Gargantext.Viz.Graph.API
-import Servant
-import Servant.Auth as SA
-import Servant.Auth.Swagger ()
-import Servant.Job.Async
-import Servant.Swagger.UI
 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

src/Gargantext/API/Search.hs

@@ -28,6 +28,7 @@ import Gargantext.API.Prelude (GargServer)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
 import Gargantext.Database.Query.Facet
 import Gargantext.Database.Action.Search
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument)
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Prelude
 import Servant

src/Gargantext/Core/Flow/Types.hs

@@ -17,10 +17,12 @@ module Gargantext.Core.Flow.Types where
 import Control.Lens (Lens')
 import Data.Map (Map)
 import Data.Maybe (Maybe)
+
 import Gargantext.Text (HasText(..))
 import Gargantext.Core.Types.Main (HashId)
+import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Query.Table.Node.Contact -- (HyperdataContact(..))
-import Gargantext.Database.Admin.Types.Node -- (HyperdataDocument(..))
 import Gargantext.Database.Schema.Ngrams (Ngrams, NgramsType)
 import Gargantext.Prelude
 

src/Gargantext/Database/Action/Flow.hs

@@ -46,6 +46,7 @@ import Control.Lens ((^.), view, _Just, makeLenses)
 import Data.Aeson.TH (deriveJSON)
 import Data.Either
 import Data.List (concat)
+import qualified Data.Map  as Map
 import Data.Map (Map, lookup)
 import Data.Maybe (Maybe(..), catMaybes)
 import Data.Monoid
@@ -53,6 +54,9 @@ import Data.Swagger
 import Data.Text (splitOn, intercalate)
 import Data.Traversable (traverse)
 import Data.Tuple.Extra (first, second)
+import GHC.Generics (Generic)
+import System.FilePath (FilePath)
+
 import Gargantext.Core (Lang(..))
 import Gargantext.Core.Flow.Types
 import Gargantext.Core.Types (Terms(..))
@@ -68,6 +72,7 @@ import Gargantext.Database.Query.Tree.Root (getOrMkRoot, getOrMk_RootWithCorpus)
 import Gargantext.Database.Action.Search (searchInDatabase)
 import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
+import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
 import Gargantext.Database.Prelude
 import Gargantext.Database.Query.Table.Ngrams
@@ -82,9 +87,6 @@ import Gargantext.Text.Corpus.Parsers (parseFile, FileFormat)
 import Gargantext.Text.List (buildNgramsLists,StopSize(..))
 import Gargantext.Text.Terms.Mono.Stem.En (stemIt)
 import Gargantext.Text.Terms
-import GHC.Generics (Generic)
-import System.FilePath (FilePath)
-import qualified Data.Map  as Map
 import qualified Gargantext.Database.Query.Table.Node.Document.Add  as Doc  (add)
 import qualified Gargantext.Text.Corpus.API as API
 

src/Gargantext/Database/Action/Flow/List.hs

@@ -20,20 +20,21 @@ module Gargantext.Database.Action.Flow.List
     where
 
 import Control.Monad (mapM_)
+import qualified Data.List as List
+import qualified Data.Map  as Map
 import Data.Map (Map, toList)
 import Data.Maybe (Maybe(..), catMaybes)
 import Data.Text (Text)
+
 import Gargantext.API.Ngrams (NgramsElement(..), putListNgrams)
 import Gargantext.Core.Flow.Types
 import Gargantext.Core.Types.Main (ListType(CandidateTerm))
-import Gargantext.Database.Admin.Types.Node -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
+import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Query.Table.NodeNgrams (NodeNgramsPoly(..), NodeNgramsW, listInsertDb, getCgramsId)
 import Gargantext.Database.Schema.Ngrams -- (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams,  NgramsType(..), text2ngrams, ngramsTypeId)
 import Gargantext.Database.Action.Flow.Types
 import Gargantext.Database.Query.Table.Node_NodeNgramsNodeNgrams
 import Gargantext.Prelude
-import qualified Data.List as List
-import qualified Data.Map  as Map
 
 -- FLOW LIST
 -- 1. select specific terms of the corpus when compared with others langs

src/Gargantext/Database/Action/Flow/Utils.hs

@@ -14,17 +14,19 @@ module Gargantext.Database.Action.Flow.Utils
     where
 
 import Data.Map (Map)
+import qualified Data.Map as DM
+
 import Gargantext.Core.Types.Individu (User(..))
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Hyperdata (Hyperdata)
+import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.User
 import Gargantext.Database.Query.Table.Node.Error
-import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Prelude (Cmd)
+import Gargantext.Database.Query.Table.NodeNodeNgrams
 import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Schema.Node
-import Gargantext.Database.Query.Table.NodeNodeNgrams
 import Gargantext.Prelude
-import qualified Data.Map as DM
 
 getUserId :: HasNodeError err
           => User

src/Gargantext/Database/Action/Learn.hs

@@ -20,6 +20,7 @@ import Data.Text (Text)
 import Data.Tuple (snd)
 import Gargantext.Core.Types (Offset, Limit)
 import Gargantext.Database.Query.Facet
+import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Prelude

src/Gargantext/Database/Action/Metrics.hs

@@ -23,7 +23,7 @@ import Gargantext.Core.Types (ListType(..), Limit, NodeType(..))
 import Gargantext.Database.Action.Flow (FlowCmdM)
 import Gargantext.Database.Action.Metrics.NgramsByNode (getNodesByNgramsOnlyUser{-, getTficfWith-})
 import Gargantext.Database.Admin.Config (userMaster)
-import Gargantext.Database.Admin.Types.Node (ListId, CorpusId{-, HyperdataCorpus-})
+import Gargantext.Database.Admin.Types.Node (ListId, CorpusId)
 import Gargantext.Database.Query.Table.Node (defaultList)
 import Gargantext.Database.Query.Table.Node.Select
 import Gargantext.Prelude

src/Gargantext/Database/Action/Node.hs

@@ -20,13 +20,15 @@ Portability : POSIX
 module Gargantext.Database.Action.Node
   where
 
+import Protolude
+
 import Gargantext.Core.Types (Name)
+import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.User
 import Gargantext.Database.Query.Table.Node.Error
-import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude (Cmd)
-import Prelude hiding (null, id, map, sum)
 
 ------------------------------------------------------------------------
 -- | TODO mk all others nodes

src/Gargantext/Database/Action/Search.hs

@@ -23,21 +23,23 @@ import Data.Text (Text, words, unpack, intercalate)
 import Data.Time (UTCTime)
 import Database.PostgreSQL.Simple (Query)
 import Database.PostgreSQL.Simple.ToField
+import Opaleye hiding (Query, Order)
+import qualified Opaleye as O hiding (Order)
+
 import Gargantext.Core.Types
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Node (NodeType(..))
 import Gargantext.Database.Query.Facet
 import Gargantext.Database.Query.Join (leftJoin6)
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.NodeNode
 import Gargantext.Database.Query.Table.NodeNodeNgrams
 import Gargantext.Database.Query.Table.Ngrams
-import Gargantext.Database.Admin.Config (nodeTypeId)
-import Gargantext.Database.Admin.Types.Node (NodeType(..))
 import Gargantext.Database.Prelude (Cmd, runPGSQuery, runOpaQuery, runCountOpaQuery)
 import Gargantext.Database.Schema.Node
 import Gargantext.Prelude
 import Gargantext.Text.Terms.Mono.Stem.En (stemIt)
-import Opaleye hiding (Query, Order)
-import qualified Opaleye as O hiding (Order)
 
 ------------------------------------------------------------------------
 searchInDatabase :: ParentId

src/Gargantext/Database/Action/Share.hs

@@ -16,6 +16,7 @@ import Control.Lens (view)
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Action.Flow.Utils (getUserId)
 import Gargantext.Database.Admin.Config (hasNodeType)
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataAny(..))
 import Gargantext.Database.Admin.Types.Node (NodeId)
 import Gargantext.Database.Admin.Types.Node -- (NodeType(..))
 import Gargantext.Database.Prelude (Cmd)

src/Gargantext/Database/Admin/Bashql.hs

@@ -77,11 +77,13 @@ module Gargantext.Database.Admin.Bashql () {-( get
 import Control.Monad.Reader -- (Reader, ask)
 import Data.Text (Text)
 import Data.List (concat, last)
+
 import Gargantext.Core.Types
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataAny)
 import Gargantext.Database.Prelude (runOpaQuery, Cmd)
-import Gargantext.Database.Schema.Node
 import Gargantext.Database.Query.Table.Node
 import qualified Gargantext.Database.Query.Table.Node.Update as U (Update(..), update)
+import Gargantext.Database.Schema.Node
 import Gargantext.Prelude
 
 

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

+{-# LANGUAGE DeriveGeneric              #-}
+{-# LANGUAGE TemplateHaskell            #-}
+
+module Gargantext.Database.Admin.Types.Metrics where
+
+import Data.Aeson.TH (deriveJSON)
+import Data.Swagger
+import GHC.Generics (Generic)
+import Data.Text (Text)
+import Protolude
+import Test.QuickCheck.Arbitrary
+
+import Gargantext.Core.Types (ListType(..))
+import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
+
+----------------------------------------------------------------------------
+
+data Metrics = Metrics
+  { metrics_data :: [Metric]}
+  deriving (Generic, Show)
+
+instance ToSchema Metrics where
+  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "metrics_")
+instance Arbitrary Metrics
+  where
+    arbitrary = Metrics <$> arbitrary
+
+data Metric = Metric
+  { m_label :: !Text
+  , m_x     :: !Double
+  , m_y     :: !Double
+  , m_cat   :: !ListType
+  } deriving (Generic, Show)
+
+instance ToSchema Metric where
+  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "m_")
+instance Arbitrary Metric
+  where
+    arbitrary = Metric <$> arbitrary
+                       <*> arbitrary
+                       <*> arbitrary
+                       <*> arbitrary
+
+deriveJSON (unPrefix "metrics_") ''Metrics
+deriveJSON (unPrefix "m_") ''Metric
+
+
+data ChartMetrics a = ChartMetrics { chartMetrics_data :: a }
+  deriving (Generic, Show)
+
+instance (ToSchema a) => ToSchema (ChartMetrics a) where
+  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "chartMetrics_")
+instance (Arbitrary a) => Arbitrary (ChartMetrics a)
+  where
+    arbitrary = ChartMetrics <$> arbitrary
+
+deriveJSON (unPrefix "chartMetrics_") ''ChartMetrics

src/Gargantext/Database/Query/Facet.hs

@@ -45,22 +45,24 @@ import Data.Text (Text)
 import Data.Time (UTCTime)
 import Data.Time.Segment (jour)
 import GHC.Generics (Generic)
+import Opaleye
+import Prelude hiding (null, id, map, sum, not, read)
+import Servant.API
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary
+import qualified Opaleye.Internal.Unpackspec()
+
 import Gargantext.Core.Types
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Query.Filter
 import Gargantext.Database.Query.Join (leftJoin5)
 import Gargantext.Database.Query.Table.Ngrams
-import Gargantext.Database.Admin.Config (nodeTypeId)
-import Gargantext.Database.Prelude
-import Gargantext.Database.Schema.Node
 import Gargantext.Database.Query.Table.NodeNode
 import Gargantext.Database.Query.Table.NodeNodeNgrams
-import Opaleye
-import Prelude hiding (null, id, map, sum, not, read)
-import Servant.API
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary
-import qualified Opaleye.Internal.Unpackspec()
+import Gargantext.Database.Prelude
+import Gargantext.Database.Schema.Node
 
 ------------------------------------------------------------------------
 -- | DocFacet

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

@@ -27,19 +27,21 @@ import Data.Aeson
 import Data.Maybe (Maybe(..))
 import Data.Text (Text)
 import GHC.Int (Int64)
+import Opaleye hiding (FromField)
+import Opaleye.Internal.QueryArr (Query)
+import Prelude hiding (null, id, map, sum)
+
 import Gargantext.Core.Types
 import Gargantext.Database.Query.Filter (limit', offset')
 import Gargantext.Database.Admin.Config (nodeTypeId)
 import Gargantext.Database.Query.Table.Node.Error
-import Gargantext.Database.Admin.Types.Node (NodeType(..), defaultCorpus, Hyperdata, HyperData(..))
+import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Node (NodeType(..))
 import Gargantext.Database.Prelude
 import Gargantext.Database.Query.Table.Node.Contact (HyperdataContact(..), arbitraryHyperdataContact)
 import Gargantext.Database.Schema.Node
 import Gargantext.Prelude hiding (sum, head)
 import Gargantext.Viz.Graph (HyperdataGraph(..))
-import Opaleye hiding (FromField)
-import Opaleye.Internal.QueryArr (Query)
-import Prelude hiding (null, id, map, sum)
 
 
 queryNodeSearchTable :: Query NodeSearchRead

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

@@ -22,12 +22,13 @@ import Opaleye
 import Protolude
 
 import Gargantext.Core.Types
+import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Node (pgNodeId)
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument)
 import Gargantext.Database.Query.Filter
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.NodeNode
 import Gargantext.Database.Query.Table.Node.Contact (HyperdataContact)
-import Gargantext.Database.Admin.Config (nodeTypeId)
-import Gargantext.Database.Admin.Types.Node (pgNodeId)
 import Gargantext.Database.Prelude
 import Gargantext.Database.Schema.Node
 

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

@@ -24,7 +24,8 @@ import Data.Time (UTCTime)
 import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import GHC.Generics (Generic)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Database.Admin.Types.Node (Hyperdata, Node)
+import Gargantext.Database.Admin.Types.Node ( Node)
+import Gargantext.Database.Admin.Types.Hyperdata (Hyperdata)
 import Gargantext.Database.Prelude (fromField')
 import Gargantext.Prelude
 import Opaleye (QueryRunnerColumnDefault, queryRunnerColumnDefault, PGJsonb, fieldQueryRunnerColumn)

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

@@ -67,15 +67,17 @@ import Database.PostgreSQL.Simple.SqlQQ
 import Database.PostgreSQL.Simple.ToField (toField, Action)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import GHC.Generics (Generic)
+import qualified Data.ByteString.Lazy.Char8  as DC (pack)
+import qualified Data.Digest.Pure.SHA        as SHA (sha256, showDigest)
+import qualified Data.Text                   as DT (pack, unpack, concat, take)
+
 import Gargantext.Database.Query.Table.Node.Contact -- (HyperdataContact(..), ContactWho(..))
 import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude (Cmd, runPGSQuery)
 import Gargantext.Prelude
 import Gargantext.Prelude.Utils (sha)
-import qualified Data.ByteString.Lazy.Char8  as DC (pack)
-import qualified Data.Digest.Pure.SHA        as SHA (sha256, showDigest)
-import qualified Data.Text                   as DT (pack, unpack, concat, take)
 
 -- TODO : the import of Document constructor below does not work
 -- import Gargantext.Database.Types.Node (Document)

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

@@ -25,7 +25,8 @@ import GHC.Generics (Generic)
 import Gargantext.Core (Lang(..))
 import Gargantext.Core.Types (Name)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Database.Admin.Types.Node (Node,Hyperdata, DocumentId, NodeId(..), UserId, NodeType(..), pgNodeId)
+import Gargantext.Database.Admin.Types.Node (Node, DocumentId, NodeId(..), UserId, NodeType(..), pgNodeId)
+import Gargantext.Database.Admin.Types.Hyperdata (Hyperdata)
 import Gargantext.Database.Prelude -- (fromField', Cmd)
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.Contact (HyperdataContact, fake_HyperdataContact)

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

@@ -37,17 +37,18 @@ import Data.Maybe (catMaybes)
 import Data.Text (Text, splitOn)
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
+import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
+import qualified Opaleye as O
+import Opaleye
+
 import Gargantext.Core.Types
 import Gargantext.Database.Schema.NodeNode
-import Gargantext.Database.Admin.Types.Node (pgNodeId)
 import Gargantext.Database.Admin.Config (nodeTypeId)
-import Gargantext.Database.Admin.Types.Node (CorpusId, DocId)
+import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Node (CorpusId, DocId, pgNodeId)
 import Gargantext.Database.Prelude
 import Gargantext.Database.Schema.Node
 import Gargantext.Prelude
-import Opaleye
-import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
-import qualified Opaleye as O
 
 
 queryNodeNodeTable :: Query NodeNodeRead

src/Gargantext/Text/Corpus/API.hs

@@ -23,7 +23,7 @@ module Gargantext.Text.Corpus.API
 import Data.Maybe
 import Gargantext.API.Admin.Orchestrator.Types (ExternalAPIs(..), externalAPIs)
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 import Gargantext.Prelude
 import qualified Gargantext.Text.Corpus.API.Hal     as HAL
 import qualified Gargantext.Text.Corpus.API.Isidore as ISIDORE

src/Gargantext/Text/Corpus/API/Hal.hs

@@ -15,8 +15,9 @@ module Gargantext.Text.Corpus.API.Hal
 
 import Data.Maybe
 import Data.Text (Text, pack, intercalate)
+
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 import Gargantext.Prelude
 import qualified Gargantext.Text.Corpus.Parsers.Date as Date
 import qualified HAL            as HAL

src/Gargantext/Text/Corpus/API/Isidore.hs

@@ -15,12 +15,12 @@ module Gargantext.Text.Corpus.API.Isidore where
 
 import System.FilePath (FilePath())
 import Data.Text (Text)
+import qualified Data.Text as Text
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 import Gargantext.Prelude
 import Isidore.Client
 import Servant.Client
-import qualified Data.Text as Text
 import qualified Gargantext.Text.Corpus.Parsers.Date as Date
 import qualified Isidore as Isidore
 import Gargantext.Text.Corpus.Parsers.CSV (writeDocs2Csv)

src/Gargantext/Text/Corpus/API/Istex.hs

@@ -18,8 +18,9 @@ import Data.List (concat)
 import Data.Maybe
 import Data.Maybe (catMaybes)
 import Data.Text (Text, pack)
+
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 import Gargantext.Prelude
 import qualified Gargantext.Text.Corpus.Parsers.Date as Date
 import qualified ISTEX        as ISTEX

src/Gargantext/Text/Corpus/API/Pubmed.hs

@@ -15,10 +15,11 @@ module Gargantext.Text.Corpus.API.Pubmed
 
 import Data.Maybe
 import Data.Text (Text)
+import qualified Data.Text as Text
+
 import Gargantext.Prelude
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
-import qualified Data.Text as Text
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 
 import qualified PUBMED as PubMed
 import qualified PUBMED.Parser as PubMedDoc

src/Gargantext/Text/Corpus/Parsers.hs

@@ -37,7 +37,7 @@ import Data.Text (Text)
 import Data.Text.Encoding (decodeUtf8)
 import Data.Tuple.Extra (both, first, second)
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 import Gargantext.Prelude
 import Gargantext.Text.Corpus.Parsers.CSV (parseHal, parseHal', parseCsv, parseCsv')
 import Gargantext.Text.Corpus.Parsers.RIS.Presse (presseEnrich)

src/Gargantext/Text/Corpus/Parsers/CSV.hs

@@ -15,22 +15,23 @@ CSV parser for Gargantext corpus files.
 module Gargantext.Text.Corpus.Parsers.CSV where
 
 import Control.Applicative
+import qualified Data.ByteString      as BS
+import qualified Data.ByteString.Lazy as BL
 import Data.Char (ord)
 import Data.Csv
 import Data.Either (Either(Left, Right))
 import Data.Text (Text, pack, length, intercalate)
 import Data.Time.Segment (jour)
+import qualified Data.Vector          as V
 import Data.Vector (Vector)
 import GHC.IO (FilePath)
 import GHC.Real (round)
 import GHC.Word (Word8)
-import Gargantext.Database.Admin.Types.Node -- (HyperdataDocument(..))
+
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 import Gargantext.Prelude hiding (length)
 import Gargantext.Text
 import Gargantext.Text.Context
-import qualified Data.ByteString      as BS
-import qualified Data.ByteString.Lazy as BL
-import qualified Data.Vector          as V
 
 ---------------------------------------------------------------
 headerCsvGargV3 :: Header

src/Gargantext/Text/Corpus/Parsers/GrandDebat.hs

@@ -27,16 +27,17 @@ module Gargantext.Text.Corpus.Parsers.GrandDebat
   where
 
 import Data.Aeson (ToJSON, FromJSON)
+import qualified Data.ByteString.Lazy as DBL
+import qualified Data.JsonStream.Parser as P
 import Data.Maybe (Maybe())
 import Data.Text (Text)
+import qualified Data.Text as Text
 import GHC.Generics (Generic)
+
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..), ToHyperdataDocument, toHyperdataDocument)
 import Gargantext.Prelude
 import Gargantext.Prelude.Utils
-import qualified Data.ByteString.Lazy as DBL
-import qualified Data.JsonStream.Parser as P
-import qualified Data.Text as Text
 
 
 data GrandDebatReference = GrandDebatReference

src/Gargantext/Text/Corpus/Parsers/Isidore.hs

@@ -26,7 +26,7 @@ import Data.Text hiding (groupBy, map)
 import Database.HSparql.Connection
 import Database.HSparql.QueryGenerator
 import Gargantext.Core (Lang)
-import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..))
 import Gargantext.Prelude
 import Network.Wreq (getWith, Response, defaults, header, param, responseStatus, responseBody)
 import Prelude (String)

src/Gargantext/Viz/Chart.hs

@@ -16,8 +16,11 @@ module Gargantext.Viz.Chart
 
 import Data.List (unzip, sortOn)
 import Data.Map (toList)
-import Data.Text (Text)
-import GHC.Generics (Generic)
+import qualified Data.List as List
+import qualified Data.Map as Map
+import Data.Maybe (catMaybes)
+import Servant
+
 import Gargantext.Core.Types.Main
 import Gargantext.Database.Admin.Config
 import Gargantext.Database.Admin.Types.Node (CorpusId)
@@ -30,26 +33,13 @@ import Gargantext.Prelude
 import Gargantext.Text.Metrics.Count (occurrencesWith)
 
 -- Pie Chart
-import Data.Maybe (catMaybes)
 import Gargantext.API.Ngrams.NTree
 import Gargantext.API.Ngrams.Tools
 import Gargantext.Core.Types
 import Gargantext.Database.Action.Flow
 import Gargantext.Database.Action.Metrics.NgramsByNode
 import Gargantext.Database.Schema.Ngrams
-import Servant
-import qualified Data.List as List
-import qualified Data.Map as Map
-
-
-data Chart = ChartHisto | ChartScatter | ChartPie
-  deriving (Generic)
-
--- TODO use UTCTime
-data Histo = Histo { histo_dates :: [Text]
-                   , histo_count :: [Int]
-                   }
-  deriving (Generic)
+import Gargantext.Viz.Types
 
 histoData :: CorpusId -> Cmd err Histo
 histoData cId = do

src/Gargantext/Viz/Graph.hs

@@ -18,24 +18,26 @@ module Gargantext.Viz.Graph
 
 import Control.Lens (makeLenses)
 import Data.Aeson.TH (deriveJSON)
+import qualified Data.Aeson as DA
 import Data.ByteString.Lazy as DBL (readFile, writeFile)
 import Data.Swagger
 import Data.Text (Text, pack)
+import qualified Data.Text as T
 import GHC.Generics (Generic)
 import GHC.IO (FilePath)
-import Gargantext.Core.Types (ListId)
-import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Database.Admin.Types.Node (NodeId, Hyperdata)
-import Gargantext.Prelude
-import Test.QuickCheck (elements)
 import Database.PostgreSQL.Simple.FromField (FromField, fromField)
-import Gargantext.Database.Prelude (fromField')
 import Opaleye (QueryRunnerColumnDefault, queryRunnerColumnDefault, PGJsonb, fieldQueryRunnerColumn)
 import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
-import qualified Data.Aeson as DA
-import qualified Data.Text as T
+import Test.QuickCheck (elements)
 import qualified Text.Read as T
 
+import Gargantext.Core.Types (ListId)
+import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
+import Gargantext.Database.Admin.Types.Node (NodeId)
+import Gargantext.Database.Admin.Types.Hyperdata (Hyperdata)
+import Gargantext.Database.Prelude (fromField')
+import Gargantext.Prelude
+
 
 data TypeNode = Terms | Unknown
   deriving (Show, Generic)

src/Gargantext/Viz/Phylo/API.hs

@@ -23,20 +23,22 @@ import qualified Data.ByteString as DB
 import qualified Data.ByteString.Lazy as DBL
 import Data.Proxy (Proxy(..))
 import Data.Swagger
+import Network.HTTP.Media ((//), (/:))
+import Servant
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
+import Web.HttpApiData (parseUrlPiece, readTextData)
+
 import Gargantext.API.Prelude
-import Gargantext.Database.Schema.Node (_node_hyperdata)
-import Gargantext.Database.Query.Table.Node (insertNodes, nodePhyloW, getNodeWith)
+import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node -- (PhyloId, ListId, CorpusId, UserId, NodeId(..))
+import Gargantext.Database.Query.Table.Node (insertNodes, nodePhyloW, getNodeWith)
+import Gargantext.Database.Schema.Node (_node_hyperdata)
 import Gargantext.Prelude
 import Gargantext.Viz.Phylo
 import Gargantext.Viz.Phylo.Main
 import Gargantext.Viz.Phylo.Example
 import Gargantext.Core.Types (TODO(..))
-import Servant
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
-import Web.HttpApiData (parseUrlPiece, readTextData)
-import Network.HTTP.Media ((//), (/:))
 
 ------------------------------------------------------------------------
 type PhyloAPI = Summary "Phylo API"

src/Gargantext/Viz/Phylo/Main.hs

@@ -16,16 +16,22 @@ module Gargantext.Viz.Phylo.Main
 
 
 import Data.GraphViz
+import qualified Data.ByteString as DB
+import qualified Data.List as List
+import qualified Data.Map  as Map
 import Data.Maybe
+import qualified Data.Text as Text
 import Data.Text (Text)
 import Debug.Trace (trace)
 import GHC.IO (FilePath)
+
 import Gargantext.API.Ngrams.Tools (getTermsWith)
 import Gargantext.Core.Types
 import Gargantext.Database.Action.Flow
-import Gargantext.Database.Schema.Ngrams (NgramsType(..))
+import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Query.Table.Node(defaultList)
 import Gargantext.Database.Query.Table.NodeNode (selectDocs)
+import Gargantext.Database.Schema.Ngrams (NgramsType(..))
 import Gargantext.Prelude
 import Gargantext.Text.Context (TermList)
 import Gargantext.Text.Terms.WithList
@@ -34,10 +40,6 @@ import Gargantext.Viz.Phylo.LevelMaker
 import Gargantext.Viz.Phylo.Tools
 import Gargantext.Viz.Phylo.View.Export
 import Gargantext.Viz.Phylo.View.ViewMaker    -- TODO Just Maker is fine
-import qualified Data.ByteString as DB
-import qualified Data.List as List
-import qualified Data.Map  as Map
-import qualified Data.Text as Text
 
 type MinSizeBranch = Int
 

src/Gargantext/Viz/Types.hs

+{-# LANGUAGE DeriveGeneric     #-}
+{-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RankNTypes        #-}
+{-# LANGUAGE TemplateHaskell   #-}
+
+module Gargantext.Viz.Types where
+
+import Data.Aeson.TH (deriveJSON)
+import Data.Swagger
+import Data.Text (Text)
+import GHC.Generics (Generic)
+import Protolude
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
+
+import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
+
+---------------
+-- | Chart | --
+---------------
+
+data Chart = ChartHisto | ChartScatter | ChartPie
+  deriving (Generic)
+
+-- TODO use UTCTime
+data Histo = Histo { histo_dates :: [Text]
+                   , histo_count :: [Int]
+                   }
+  deriving (Show, Generic)
+
+instance ToSchema Histo where
+  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "histo_")
+instance Arbitrary Histo
+  where
+    arbitrary = elements [ Histo ["2012"] [1]
+                         , Histo ["2013"] [1]
+                         ]
+deriveJSON (unPrefix "histo_") ''Histo