[FACET] Corpus ok.

src/Gargantext/Core/Types/Main.hs

@@ -70,8 +70,9 @@ corpusTree = NodeT Corpus (  [ leafT Document ]
 -- * why NodeUser and not just User ?
 -- * is this supposed to hold data ?
 
+data Parent = NodeType NodeId
 
-data Classification = Favorites | MyClassifcation
+--data Classification = Favorites | MyClassifcation
 
 data Lists  =  StopList    | MainList | MapList | GroupList
 
@@ -144,7 +145,7 @@ nodeTypes = [ (NodeUser      ,  1)
 --            , (TirankGlobal , 17)
 --
 ----  Node management
---            , (Favorites     , 15)
+            , (Favorites     , 15)
 --
             ]
 --

src/Gargantext/Core/Types/Node.hs

@@ -236,7 +236,7 @@ type Corpus   = Node HyperdataCorpus
 type Document = Node HyperdataDocument
 
 ------------------------------------------------------------------------
-data NodeType = NodeUser | Project | Folder | Corpus | Annuaire | Document | UserPage | DocumentCopy
+data NodeType = NodeUser | Project | Folder | Corpus | Annuaire | Document | UserPage | DocumentCopy | Favorites
               | Classification
               | Lists
               | Metrics | Occurrences

src/Gargantext/Database/Facet.hs

@@ -125,19 +125,19 @@ instance Arbitrary FacetChart where
 -----------------------------------------------------------------------
 
 
-getDocFacet :: Connection -> Int -> Maybe NodeType 
-            -> Maybe Offset -> Maybe Limit 
+getDocFacet :: Connection -> NodeType -> Int -> Maybe NodeType 
+            -> Maybe Offset -> Maybe Limit
             -> IO [FacetDoc]
-getDocFacet conn parentId nodeType maybeOffset maybeLimit = 
-    runQuery conn $ selectDocFacet parentId nodeType maybeOffset maybeLimit
+getDocFacet conn parentType parentId nodeType maybeOffset maybeLimit =
+    runQuery conn $ selectDocFacet parentType parentId nodeType maybeOffset maybeLimit
 
-selectDocFacet :: ParentId -> Maybe NodeType 
-               -> Maybe Offset -> Maybe Limit 
+selectDocFacet :: NodeType -> ParentId -> Maybe NodeType
+               -> Maybe Offset -> Maybe Limit
                -> Query FacetDocRead
-selectDocFacet parentId maybeNodeType maybeOffset maybeLimit =
-        limit' maybeLimit $ offset' maybeOffset 
-                          $ orderBy (asc facetDoc_created) 
-                          $ selectDocFacet' parentId maybeNodeType
+selectDocFacet pType parentId maybeNodeType maybeOffset maybeLimit =
+        limit' maybeLimit $ offset' maybeOffset
+                          $ orderBy (asc facetDoc_created)
+                          $ selectDocFacet' pType parentId maybeNodeType
 
 
 -- | Left join to the favorites
@@ -215,25 +215,21 @@ leftJoin3''' = leftJoin3 queryNodeNodeTable queryNodeTable queryNodeTable cond12
                 = ((.==) (nId) (nId'))
 
 
--- getDocTest :: Connection -> IO [FacetDoc]
--- getDocTest conn = runQuery conn selectDocFacet
-
 -- | Building the facet
--- selectDocFacet' :: ParentId -> Maybe NodeType -> Query FacetDocRead
-selectDocFacet' :: ParentId -> Maybe NodeType -> Query FacetDocRead
-selectDocFacet' _ _ = proc () -> do
+selectDocFacet' :: NodeType -> ParentId -> Maybe NodeType -> Query FacetDocRead
+selectDocFacet' pt pId _ = proc () -> do
         (n1,(nn,n2)) <- leftJoin3''' -< ()
-        restrict -< (.&&) (node_parentId n1 .== (toNullable $ pgInt4 347476))
-                          (node_typename n1 .== (pgInt4 4))
+        restrict -< (.&&) (node_parentId n1 .== (toNullable $ pgInt4 pId))
+                          (node_typename n1 .== (pgInt4 $ nodeTypeId Document))
 
-        restrict -< (.||) (node_typename n2 .== (toNullable $ pgInt4 15))
+        restrict -< (.||) (node_typename n2 .== (toNullable $ pgInt4 $ nodeTypeId Favorites))
                           (isNull $ node_typename n2)
-        
-        restrict -< (.||) (node_parentId n2 .== (toNullable $ pgInt4 347476))
+
+        restrict -< (.||) (node_parentId n2 .== (toNullable $ pgInt4 $ nodeTypeId Favorites))
                           (isNull $ node_parentId n2)
 
         let isFav = ifThenElse (isNull $ nodeNode_score nn) (pgBool False) (pgBool True)
---        
+
         returnA  -< FacetDoc (node_id n1) (node_date n1) (node_hyperdata n1) (isFav) (pgInt4 1)