[Database][Schema] Node Table and types without TSVector.

package.yaml

@@ -36,6 +36,7 @@ library:
   - Gargantext.Core.Types.Main
   - Gargantext.Core.Utils.Prefix
   - Gargantext.Database
+  - Gargantext.Database.Flow
   - Gargantext.Database.Schema.Node
   - Gargantext.Database.Cooc
   - Gargantext.Database.Tree

src/Gargantext/Core/Types/Main.hs

@@ -21,7 +21,6 @@ Portability : POSIX
 module Gargantext.Core.Types.Main where
 ------------------------------------------------------------------------
 
-
 import Prelude (Enum, Bounded, minBound, maxBound)
 import Data.Aeson (FromJSON, ToJSON, toJSON)
 import Data.Aeson as A

src/Gargantext/Database/Flow/Utils.hs

@@ -26,7 +26,7 @@ import Gargantext.Database.Schema.NodeNgram
 toMaps :: Hyperdata a => (a -> Map (NgramsT Ngrams) Int) -> [Node a] -> Map (NgramsT Ngrams) (Map NodeId Int)
 toMaps fun ns = mapNodeIdNgrams $ documentIdWithNgrams fun ns'
   where
-    ns' = map (\(Node nId _ _ _ _ _ json _) -> DocumentWithId nId json) ns
+    ns' = map (\(Node nId _ _ _ _ _ json) -> DocumentWithId nId json) ns
 
 mapNodeIdNgrams :: Hyperdata a => [DocumentIdWithNgrams a] -> Map (NgramsT Ngrams) (Map NodeId Int)
 mapNodeIdNgrams ds = DM.map (DM.fromListWith (+)) $ DM.fromListWith (<>) xs

src/Gargantext/Database/Node/Children.hs

@@ -41,7 +41,7 @@ getChildren c pId _ maybeNodeType maybeOffset maybeLimit = runQuery c
 
 selectChildren :: ParentId -> Maybe NodeType -> Query NodeRead
 selectChildren parentId maybeNodeType = proc () -> do
-    row@(Node nId typeName _ parent_id _ _ _ _) <- queryNodeTable -< ()
+    row@(Node nId typeName _ parent_id _ _ _) <- queryNodeTable -< ()
     (NodeNode n1id n2id _ _ _) <- queryNodeNodeTable -< ()
     
     let nodeType = maybe 0 nodeTypeId maybeNodeType

src/Gargantext/Database/Types/Node.hs

@@ -322,8 +322,7 @@ instance Hyperdata HyperdataNotebook
 
 
 -- | NodePoly indicates that Node has a Polymorphism Type
-type Node json   = NodePoly NodeId NodeTypeId NodeUserId (Maybe NodeParentId) NodeName UTCTime json (Maybe TSVector)
-type NodeSearch json   = NodePoly NodeId NodeTypeId NodeUserId (Maybe NodeParentId) NodeName UTCTime json (Maybe TSVector)
+type Node json   = NodePoly NodeId NodeTypeId NodeUserId (Maybe NodeParentId) NodeName UTCTime json
 
 -- type Node json   = NodePoly NodeId NodeTypeId UserId ParentId NodeName UTCTime json
 type NodeTypeId   = Int
@@ -380,17 +379,17 @@ instance ToSchema      NodeType
 ------------------------------------------------------------------------
 data NodePoly id        typename userId 
               parentId  name     date 
-              hyperdata search = Node { _node_id        :: id
-                                      , _node_typename  :: typename
-                                      , _node_userId    :: userId
-                                                                --   , nodeUniqId    :: hashId
-                                      , _node_parentId  :: parentId
-                                      , _node_name      :: name
-                                      , _node_date      :: date
-                                  
-                                      , _node_hyperdata :: hyperdata
-                                      , _node_search    :: search
-                                      } deriving (Show, Generic)
+              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)
 
@@ -411,6 +410,7 @@ data NodePolySearch id        typename userId
 $(deriveJSON (unPrefix "_ns_") ''NodePolySearch)
 $(makeLenses ''NodePolySearch)
 
+type NodeSearch json   = NodePolySearch NodeId NodeTypeId NodeUserId (Maybe NodeParentId) NodeName UTCTime json (Maybe TSVector)
 ------------------------------------------------------------------------
 
 
@@ -420,11 +420,25 @@ instance (Arbitrary hyperdata
          ,Arbitrary nodeUserId
          ,Arbitrary nodeParentId
          ) => Arbitrary (NodePoly nodeId nodeTypeId nodeUserId nodeParentId
-                                  NodeName UTCTime hyperdata (Maybe TSVector)) where
+                                  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 nodeUserId
+         ,Arbitrary nodeParentId
+         ) => Arbitrary (NodePolySearch nodeId nodeTypeId nodeUserId 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
@@ -466,11 +480,26 @@ instance ToSchema hyperdata =>
          ToSchema (NodePoly NodeId NodeTypeId
                             (Maybe NodeUserId)
                             NodeParentId NodeName
-                            UTCTime hyperdata (Maybe TSVector)
+                            UTCTime hyperdata
                   )
 
 instance ToSchema hyperdata =>
          ToSchema (NodePoly NodeId NodeTypeId
+                            NodeUserId
+                            (Maybe NodeParentId) NodeName
+                            UTCTime hyperdata
+                  )
+
+
+instance ToSchema hyperdata =>
+         ToSchema (NodePolySearch NodeId NodeTypeId
+                            (Maybe NodeUserId)
+                            NodeParentId NodeName
+                            UTCTime hyperdata (Maybe TSVector)
+                  )
+
+instance ToSchema hyperdata =>
+         ToSchema (NodePolySearch NodeId NodeTypeId
                             NodeUserId
                             (Maybe NodeParentId) NodeName
                             UTCTime hyperdata (Maybe TSVector)