Skip to content

haskell-gargantext
haskell-gargantext
Commit 96dfa394 authored by Alexandre Delanoë's avatar Alexandre Delanoë
Browse files
Options

[DB] refactoring

parent 0445a8f9
Pipeline #832 canceled with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 255 additions and 229 deletions
    src/Gargantext/API/Admin/Auth.hs
    View file @ 96dfa394
    ......@@ -46,7 +46,8 @@ import Gargantext.Core.Types.Individu (User(..), Username, Password, arbitraryUs
    import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
    import Gargantext.Database.Action.Query.Tree (isDescendantOf, isIn)
    import Gargantext.Database.Action.Query.Tree.Root (getRoot)
    import Gargantext.Database.Admin.Types.Node (NodePoly(_node_id), NodeId(..), UserId, ListId, DocId)
    import Gargantext.Database.Schema.Node (NodePoly(_node_id))
    import Gargantext.Database.Admin.Types.Node (NodeId(..), UserId, ListId, DocId)
    import Gargantext.Database.Admin.Utils (Cmd', CmdM, HasConnectionPool)
    import Gargantext.Prelude hiding (reverse)
    import Servant
    ......
    src/Gargantext/API/Corpus/Export.hs
    View file @ 96dfa394
    ......@@ -44,6 +44,7 @@ import Gargantext.Database.Admin.Config (userMaster)
    import Gargantext.Database.Admin.Types.Errors (HasNodeError)
    import Gargantext.Database.Admin.Types.Node (Node, HyperdataDocument(..), NodeId, ListId, CorpusId)
    import Gargantext.Database.Admin.Utils (Cmd)
    import Gargantext.Database.Schema.Node (_node_id, _node_hyperdata)
    import Gargantext.Database.Schema.Ngrams (NgramsType(..))
    import Gargantext.Database.Schema.NodeNode (selectDocNodes)
    import Gargantext.Prelude
    ......
    src/Gargantext/API/Node.hs
    View file @ 96dfa394
    ......@@ -65,6 +65,7 @@ import Gargantext.Database.Admin.Config (nodeTypeId)
    import Gargantext.Database.Admin.Types.Errors (HasNodeError(..))
    import Gargantext.Database.Admin.Types.Node
    import Gargantext.Database.Admin.Utils -- (Cmd, CmdM)
    import Gargantext.Database.Schema.Node (node_userId, _node_typename)
    import Gargantext.Database.Schema.NodeNode
    import Gargantext.Prelude
    import Gargantext.Viz.Chart
    ......
    src/Gargantext/Core/Types.hs
    View file @ 96dfa394
    ......@@ -23,8 +23,7 @@ module Gargantext.Core.Types ( module Gargantext.Core.Types.Main
    , Label, Stems
    , HasInvalidError(..), assertValid
    , Name
    , TableResult(..)
    , NodeTableResult
    , TableResult(..), NodeTableResult
    , Ordering(..)
    , TODO(..)
    ) where
    ......@@ -42,8 +41,8 @@ import Data.Text (Text, unpack)
    import Data.Validity
    import GHC.Generics
    import Gargantext.Core.Types.Main
    import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
    import Gargantext.Database.Admin.Types.Node
    import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
    import Gargantext.Prelude
    import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
    ......@@ -143,6 +142,9 @@ assertValid v = when (not $ validationIsValid v) $ throwError $ _InvalidError #
    -- assertValid :: MonadBase IO m => Validation -> m ()
    -- assertValid v = when (not $ validationIsValid v) $ fail $ show v
    -- | NodeTableResult (Table computations)
    type NodeTableResult a = TableResult (Node a)
    data TableResult a = TableResult { tr_count :: Int
    , tr_docs :: [a]
    ......@@ -156,7 +158,6 @@ instance ToSchema a => ToSchema (TableResult a) where
    instance Arbitrary a => Arbitrary (TableResult a) where
    arbitrary = TableResult <$> arbitrary <*> arbitrary
    type NodeTableResult a = TableResult (Node a)
    -- TO BE removed
    data TODO = TODO
    ......
    src/Gargantext/Database/Action/Flow/Utils.hs
    View file @ 96dfa394
    ......@@ -25,6 +25,7 @@ import Gargantext.Database.Admin.Types.Errors
    import Gargantext.Database.Admin.Types.Node
    import Gargantext.Database.Admin.Utils (Cmd)
    import Gargantext.Database.Schema.Ngrams
    import Gargantext.Database.Schema.Node
    import Gargantext.Database.Schema.User
    import Gargantext.Database.Schema.NodeNodeNgrams
    import Gargantext.Prelude
    ......
    src/Gargantext/Database/Action/Query/Node/Contact.hs
    View file @ 96dfa394
    ......@@ -29,7 +29,7 @@ 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 (Node,Hyperdata)
    import Gargantext.Database.Admin.Types.Node (Hyperdata, Node)
    import Gargantext.Database.Admin.Utils (fromField')
    import Gargantext.Prelude
    import Opaleye (QueryRunnerColumnDefault, queryRunnerColumnDefault, PGJsonb, fieldQueryRunnerColumn)
    ......
    src/Gargantext/Database/Action/Query/Tree/Root.hs
    View file @ 96dfa394
    ......@@ -37,12 +37,12 @@ import Gargantext.Database.Admin.Types.Node
    import Gargantext.Database.Action.Query.Node
    import Gargantext.Database.Action.Query.Node.User (HyperdataUser)
    import Gargantext.Database.Action.Flow.Utils (getUserId)
    import Gargantext.Database.Schema.Node (NodeRead)
    import Gargantext.Database.Schema.Node (NodePoly(..), NodeRead)
    import Gargantext.Database.Schema.Node (queryNodeTable)
    import Gargantext.Database.Action.Query
    import Gargantext.Database.Schema.User (UserPoly(..))
    import Gargantext.Database.Action.Query.User (queryUserTable)
    import Gargantext.Database.Admin.Types.Node (Node, NodePoly(..), NodeType(NodeUser), pgNodeId)
    import Gargantext.Database.Admin.Types.Node (Node, NodeType(NodeUser), pgNodeId)
    import Gargantext.Database.Admin.Utils (Cmd, runOpaQuery)
    import Gargantext.Prelude
    import Opaleye (restrict, (.==), Query)
    ......
    src/Gargantext/Database/Admin/Types/Node.hs
    View file @ 96dfa394
    ......@@ -15,10 +15,10 @@ Portability : POSIX
    {-# LANGUAGE DeriveGeneric #-}
    {-# LANGUAGE FlexibleInstances #-}
    {-# LANGUAGE GeneralizedNewtypeDeriving #-}
    {-# LANGUAGE MultiParamTypeClasses #-}
    {-# LANGUAGE NoImplicitPrelude #-}
    {-# LANGUAGE OverloadedStrings #-}
    {-# LANGUAGE TemplateHaskell #-}
    {-# LANGUAGE GeneralizedNewtypeDeriving #-}
    -- {-# LANGUAGE DuplicateRecordFields #-}
    ......@@ -43,10 +43,13 @@ import Database.PostgreSQL.Simple.FromField (FromField, fromField)
    import Database.PostgreSQL.Simple.ToField (ToField, toField, toJSONField)
    import GHC.Generics (Generic)
    import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
    import Gargantext.Database.Admin.Utils (fromField')
    import Gargantext.Database.Schema.Node
    import Gargantext.Prelude
    import Gargantext.Viz.Phylo (Phylo)
    import Prelude (Enum, Bounded, minBound, maxBound)
    import Servant
    import Opaleye (QueryRunnerColumnDefault, queryRunnerColumnDefault, PGInt4, PGJsonb, PGTSVector, Nullable, fieldQueryRunnerColumn)
    import Test.QuickCheck (elements)
    import Test.QuickCheck.Arbitrary
    import Test.QuickCheck.Instances.Text ()
    ......@@ -55,6 +58,77 @@ import Text.Read (read)
    import Text.Show (Show())
    import qualified Opaleye as O
    ------------------------------------------------------------------------
    -- | NodePoly indicates that Node has a Polymorphism Type
    type Node json = NodePoly NodeId NodeTypeId UserId (Maybe ParentId) NodeName UTCTime json
    -- | NodeSearch (queries)
    type NodeSearch json = NodePolySearch NodeId NodeTypeId UserId (Maybe ParentId) NodeName UTCTime json (Maybe TSVector)
    ------------------------------------------------------------------------
    instance ToSchema hyperdata =>
    ToSchema (NodePoly NodeId NodeTypeId
    (Maybe UserId)
    ParentId NodeName
    UTCTime hyperdata
    ) where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_node_")
    instance ToSchema hyperdata =>
    ToSchema (NodePoly NodeId NodeTypeId
    UserId
    (Maybe ParentId) NodeName
    UTCTime hyperdata
    ) where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_node_")
    instance ToSchema hyperdata =>
    ToSchema (NodePolySearch NodeId NodeTypeId
    (Maybe UserId)
    ParentId NodeName
    UTCTime hyperdata (Maybe TSVector)
    ) where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_ns_")
    instance ToSchema hyperdata =>
    ToSchema (NodePolySearch NodeId NodeTypeId
    UserId
    (Maybe ParentId) NodeName
    UTCTime hyperdata (Maybe TSVector)
    ) where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_ns_")
    instance (Arbitrary hyperdata
    ,Arbitrary nodeId
    ,Arbitrary nodeTypeId
    ,Arbitrary userId
    ,Arbitrary nodeParentId
    ) => Arbitrary (NodePoly nodeId nodeTypeId userId nodeParentId
    NodeName UTCTime hyperdata) where
    --arbitrary = Node 1 1 (Just 1) 1 "name" (jour 2018 01 01) (arbitrary) (Just "")
    arbitrary = Node <$> arbitrary <*> arbitrary <*> arbitrary
    <*> arbitrary <*> arbitrary <*> arbitrary
    <*> arbitrary
    instance (Arbitrary hyperdata
    ,Arbitrary nodeId
    ,Arbitrary nodeTypeId
    ,Arbitrary userId
    ,Arbitrary nodeParentId
    ) => Arbitrary (NodePolySearch nodeId nodeTypeId userId nodeParentId
    NodeName UTCTime hyperdata (Maybe TSVector)) where
    --arbitrary = Node 1 1 (Just 1) 1 "name" (jour 2018 01 01) (arbitrary) (Just "")
    arbitrary = NodeSearch <$> arbitrary <*> arbitrary <*> arbitrary
    <*> arbitrary <*> arbitrary <*> arbitrary
    <*> arbitrary <*> arbitrary
    ------------------------------------------------------------------------
    pgNodeId :: NodeId -> O.Column O.PGInt4
    pgNodeId = O.pgInt4 . id2int
    ......@@ -78,32 +152,11 @@ instance FromField NodeId where
    instance ToSchema NodeId
    type NodeTypeId = Int
    type NodeName = Text
    type TSVector = Text
    ------------------------------------------------------------------------
    data NodePoly id typename userId
    parentId name date
    hyperdata = Node { _node_id :: id
    , _node_typename :: typename
    , _node_userId :: userId
    , _node_parentId :: parentId
    , _node_name :: name
    , _node_date :: date
    , _node_hyperdata :: hyperdata
    } deriving (Show, Generic)
    $(deriveJSON (unPrefix "_node_") ''NodePoly)
    $(makeLenses ''NodePoly)
    -- | NodePoly indicates that Node has a Polymorphism Type
    type Node json = NodePoly NodeId NodeTypeId UserId (Maybe ParentId) NodeName UTCTime json
    ------------------------------------------------------------------------
    instance FromHttpApiData NodeId where
    ......@@ -512,51 +565,7 @@ instance ToParamSchema NodeType
    instance ToSchema NodeType
    data NodePolySearch id typename userId
    parentId name date
    hyperdata search = NodeSearch { _ns_id :: id
    , _ns_typename :: typename
    , _ns_userId :: userId
    -- , nodeUniqId :: shaId
    , _ns_parentId :: parentId
    , _ns_name :: name
    , _ns_date :: date
    , _ns_hyperdata :: hyperdata
    , _ns_search :: search
    } deriving (Show, Generic)
    $(deriveJSON (unPrefix "_ns_") ''NodePolySearch)
    $(makeLenses ''NodePolySearch)
    type NodeSearch json = NodePolySearch NodeId NodeTypeId UserId (Maybe ParentId) NodeName UTCTime json (Maybe TSVector)
    ------------------------------------------------------------------------
    instance (Arbitrary hyperdata
    ,Arbitrary nodeId
    ,Arbitrary nodeTypeId
    ,Arbitrary userId
    ,Arbitrary nodeParentId
    ) => Arbitrary (NodePoly nodeId nodeTypeId userId nodeParentId
    NodeName UTCTime hyperdata) where
    --arbitrary = Node 1 1 (Just 1) 1 "name" (jour 2018 01 01) (arbitrary) (Just "")
    arbitrary = Node <$> arbitrary <*> arbitrary <*> arbitrary
    <*> arbitrary <*> arbitrary <*> arbitrary
    <*> arbitrary
    instance (Arbitrary hyperdata
    ,Arbitrary nodeId
    ,Arbitrary nodeTypeId
    ,Arbitrary userId
    ,Arbitrary nodeParentId
    ) => Arbitrary (NodePolySearch nodeId nodeTypeId userId nodeParentId
    NodeName UTCTime hyperdata (Maybe TSVector)) where
    --arbitrary = Node 1 1 (Just 1) 1 "name" (jour 2018 01 01) (arbitrary) (Just "")
    arbitrary = NodeSearch <$> arbitrary <*> arbitrary <*> arbitrary
    <*> arbitrary <*> arbitrary <*> arbitrary
    <*> arbitrary <*> arbitrary
    ------------------------------------------------------------------------
    hyperdataDocument :: HyperdataDocument
    hyperdataDocument = case decode docExample of
    ......@@ -569,6 +578,10 @@ hyperdataDocument = case decode docExample of
    docExample :: ByteString
    docExample = "{\"doi\":\"sdfds\",\"publication_day\":6,\"language_iso2\":\"en\",\"publication_minute\":0,\"publication_month\":7,\"language_iso3\":\"eng\",\"publication_second\":0,\"authors\":\"Nils Hovdenak, Kjell Haram\",\"publication_year\":2012,\"publication_date\":\"2012-07-06 00:00:00+00:00\",\"language_name\":\"English\",\"realdate_full_\":\"2012 01 12\",\"source\":\"European journal of obstetrics, gynecology, and reproductive biology\",\"abstract\":\"The literature was searched for publications on minerals and vitamins during pregnancy and the possible influence of supplements on pregnancy outcome.\",\"title\":\"Influence of mineral and vitamin supplements on pregnancy outcome.\",\"publication_hour\":0}"
    ------------------------------------------------------------------------
    -- Instances
    ------------------------------------------------------------------------
    instance ToSchema HyperdataCorpus where
    declareNamedSchema proxy =
    genericDeclareNamedSchema (unPrefixSwagger "_hc_") proxy
    ......@@ -594,41 +607,103 @@ instance ToSchema HyperdataAny where
    & schema.example ?~ emptyObject -- TODO
    instance ToSchema hyperdata =>
    ToSchema (NodePoly NodeId NodeTypeId
    (Maybe UserId)
    ParentId NodeName
    UTCTime hyperdata
    ) where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_node_")
    instance ToSchema Status where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "status_")
    instance ToSchema hyperdata =>
    ToSchema (NodePoly NodeId NodeTypeId
    UserId
    (Maybe ParentId) NodeName
    UTCTime hyperdata
    ) where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_node_")
    instance ToSchema hyperdata =>
    ToSchema (NodePolySearch NodeId NodeTypeId
    (Maybe UserId)
    ParentId NodeName
    UTCTime hyperdata (Maybe TSVector)
    ) where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_ns_")
    instance FromField HyperdataAny where
    fromField = fromField'
    instance ToSchema hyperdata =>
    ToSchema (NodePolySearch NodeId NodeTypeId
    UserId
    (Maybe ParentId) NodeName
    UTCTime hyperdata (Maybe TSVector)
    ) where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_ns_")
    instance FromField HyperdataCorpus
    where
    fromField = fromField'
    instance FromField HyperdataDocument
    where
    fromField = fromField'
    instance FromField HyperdataDocumentV3
    where
    fromField = fromField'
    instance FromField HyperData
    where
    fromField = fromField'
    instance FromField HyperdataListModel
    where
    fromField = fromField'
    instance FromField HyperdataPhylo
    where
    fromField = fromField'
    instance FromField HyperdataAnnuaire
    where
    fromField = fromField'
    instance FromField HyperdataList
    where
    fromField = fromField'
    instance FromField (NodeId, Text)
    where
    fromField = fromField'
    ------------------------------------------------------------------------
    instance QueryRunnerColumnDefault PGJsonb HyperdataAny
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataList
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperData
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataDocument
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataDocumentV3
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataCorpus
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataListModel
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataPhylo
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataAnnuaire
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGTSVector (Maybe TSVector)
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGInt4 (Maybe NodeId)
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGInt4 NodeId
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault (Nullable PGInt4) NodeId
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance ToSchema Status where
    declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "status_")
    src/Gargantext/Database/Schema/Node.hs
    View file @ 96dfa394
    ......@@ -26,25 +26,43 @@ Portability : POSIX
    module Gargantext.Database.Schema.Node where
    import Control.Lens hiding (elements, (&))
    import Control.Lens.TH (makeLensesWith, abbreviatedFields)
    import Data.Aeson.TH (deriveJSON)
    import Data.Maybe (Maybe(..))
    import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
    import Data.Swagger hiding (required)
    import Data.Text (Text)
    import Database.PostgreSQL.Simple.FromField (FromField, fromField)
    import Gargantext.Core.Types
    import GHC.Generics (Generic)
    import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
    import Gargantext.Database.Admin.Utils
    import Gargantext.Viz.Graph (HyperdataGraph(..))
    import Opaleye hiding (FromField)
    import Opaleye.Internal.QueryArr (Query)
    import Prelude hiding (null, id, map, sum)
    import Test.QuickCheck.Arbitrary
    ------------------------------------------------------------------------
    data NodePoly id typename userId
    parentId name date
    hyperdata = Node { _node_id :: id
    , _node_typename :: typename
    $(makeAdaptorAndInstance "pNode" ''NodePoly)
    $(makeLensesWith abbreviatedFields ''NodePoly)
    , _node_userId :: userId
    , _node_parentId :: parentId
    $(makeAdaptorAndInstance "pNodeSearch" ''NodePolySearch)
    $(makeLensesWith abbreviatedFields ''NodePolySearch)
    , _node_name :: name
    , _node_date :: date
    , _node_hyperdata :: hyperdata
    } deriving (Show, Generic)
    $(deriveJSON (unPrefix "_node_") ''NodePoly)
    $(makeLenses ''NodePoly)
    $(makeAdaptorAndInstance "pNode" ''NodePoly)
    $(makeLensesWith abbreviatedFields ''NodePoly)
    ------------------------------------------------------------------------
    nodeTable :: Table NodeWrite NodeRead
    ......@@ -91,21 +109,6 @@ type NodeReadNull = NodePoly (Column (Nullable PGInt4))
    ------------------------------------------------------------------------
    -- | Node(Read|Write)Search is slower than Node(Write|Read) use it
    -- for full text search only
    nodeTableSearch :: Table NodeSearchWrite NodeSearchRead
    nodeTableSearch = Table "nodes" (pNodeSearch NodeSearch { _ns_id = optional "id"
    , _ns_typename = required "typename"
    , _ns_userId = required "user_id"
    , _ns_parentId = required "parent_id"
    , _ns_name = required "name"
    , _ns_date = optional "date"
    , _ns_hyperdata = required "hyperdata"
    , _ns_search = optional "search"
    }
    )
    type NodeSearchWrite =
    NodePolySearch
    ......@@ -140,110 +143,37 @@ type NodeSearchReadNull =
    (Column (Nullable PGJsonb) )
    (Column (Nullable PGTSVector) )
    ------------------------------------------------------------------------
    ------------------------------------------------------------------------
    -- Instances
    ------------------------------------------------------------------------
    instance FromField HyperdataAny where
    fromField = fromField'
    instance FromField HyperdataCorpus
    where
    fromField = fromField'
    instance FromField HyperdataDocument
    where
    fromField = fromField'
    instance FromField HyperdataDocumentV3
    where
    fromField = fromField'
    instance FromField HyperData
    where
    fromField = fromField'
    instance FromField HyperdataListModel
    where
    fromField = fromField'
    data NodePolySearch id typename userId
    parentId name date
    hyperdata search = NodeSearch { _ns_id :: id
    , _ns_typename :: typename
    , _ns_userId :: userId
    -- , nodeUniqId :: shaId
    , _ns_parentId :: parentId
    , _ns_name :: name
    , _ns_date :: date
    instance FromField HyperdataGraph
    where
    fromField = fromField'
    , _ns_hyperdata :: hyperdata
    , _ns_search :: search
    } deriving (Show, Generic)
    instance FromField HyperdataPhylo
    where
    fromField = fromField'
    $(makeAdaptorAndInstance "pNodeSearch" ''NodePolySearch)
    $(makeLensesWith abbreviatedFields ''NodePolySearch)
    $(deriveJSON (unPrefix "_ns_") ''NodePolySearch)
    $(makeLenses ''NodePolySearch)
    instance FromField HyperdataAnnuaire
    where
    fromField = fromField'
    nodeTableSearch :: Table NodeSearchWrite NodeSearchRead
    nodeTableSearch = Table "nodes" (pNodeSearch NodeSearch { _ns_id = optional "id"
    , _ns_typename = required "typename"
    , _ns_userId = required "user_id"
    instance FromField HyperdataList
    where
    fromField = fromField'
    , _ns_parentId = required "parent_id"
    , _ns_name = required "name"
    , _ns_date = optional "date"
    instance FromField (NodeId, Text)
    where
    fromField = fromField'
    , _ns_hyperdata = required "hyperdata"
    , _ns_search = optional "search"
    }
    )
    ------------------------------------------------------------------------
    instance QueryRunnerColumnDefault PGJsonb HyperdataAny
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataList
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperData
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataDocument
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataDocumentV3
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataCorpus
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataListModel
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataGraph
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataPhylo
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGJsonb HyperdataAnnuaire
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGTSVector (Maybe TSVector)
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGInt4 (Maybe NodeId)
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault PGInt4 NodeId
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    instance QueryRunnerColumnDefault (Nullable PGInt4) NodeId
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    src/Gargantext/Viz/Chart.hs
    View file @ 96dfa394
    ......@@ -29,6 +29,7 @@ import Gargantext.Database.Admin.Config
    import Gargantext.Database.Admin.Types.Node (CorpusId)
    import Gargantext.Database.Admin.Utils
    import Gargantext.Database.Schema.NodeNode (selectDocsDates)
    import Gargantext.Database.Schema.Node
    import Gargantext.Prelude
    import Gargantext.Text.Metrics.Count (occurrencesWith)
    ......
    src/Gargantext/Viz/Graph.hs
    View file @ 96dfa394
    ......@@ -10,10 +10,12 @@ Portability : POSIX
    -}
    {-# OPTIONS_GHC -fno-warn-orphans #-}
    {-# LANGUAGE FlexibleContexts #-}
    {-# LANGUAGE NoImplicitPrelude #-}
    {-# LANGUAGE TemplateHaskell #-}
    {-# LANGUAGE DeriveGeneric #-}
    {-# LANGUAGE DeriveGeneric #-}
    {-# LANGUAGE FlexibleContexts #-}
    {-# LANGUAGE MultiParamTypeClasses #-}
    {-# LANGUAGE NoImplicitPrelude #-}
    {-# LANGUAGE TemplateHaskell #-}
    module Gargantext.Viz.Graph
    where
    ......@@ -30,6 +32,9 @@ 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.Admin.Utils (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
    ......@@ -165,6 +170,14 @@ $(deriveJSON (unPrefix "") ''HyperdataGraph)
    instance Hyperdata HyperdataGraph
    makeLenses ''HyperdataGraph
    instance FromField HyperdataGraph
    where
    fromField = fromField'
    instance QueryRunnerColumnDefault PGJsonb HyperdataGraph
    where
    queryRunnerColumnDefault = fieldQueryRunnerColumn
    -----------------------------------------------------------
    ......
    src/Gargantext/Viz/Graph/API.hs
    View file @ 96dfa394
    ......@@ -46,6 +46,7 @@ import Gargantext.API.Admin.Types
    import Gargantext.Core.Types.Main
    import Gargantext.Database.Admin.Config
    import Gargantext.Database.Action.Metrics.NgramsByNode (getNodesByNgramsOnlyUser)
    import Gargantext.Database.Schema.Node (node_userId, node_parentId, node_hyperdata)
    import Gargantext.Database.Schema.Ngrams
    import Gargantext.Database.Action.Query.Node.Select
    import Gargantext.Database.Action.Query.Node
    ......
    src/Gargantext/Viz/Phylo/API.hs
    View file @ 96dfa394
    ......@@ -30,6 +30,7 @@ import qualified Data.ByteString as DB
    import qualified Data.ByteString.Lazy as DBL
    import Data.Swagger
    import Gargantext.API.Admin.Types
    import Gargantext.Database.Schema.Node (_node_hyperdata)
    import Gargantext.Database.Action.Query.Node (insertNodes, nodePhyloW, getNodePhylo)
    import Gargantext.Database.Admin.Types.Node -- (PhyloId, ListId, CorpusId, UserId, NodeId(..))
    import Gargantext.Prelude
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment