[FEAT] runCmdDev help for the REPL

src/Gargantext/API/Settings.hs

@@ -249,6 +249,10 @@ newDevEnvWith file = do
     , _dev_env_repo_saver = repo_saver
     }
 
+-- | Run Cmd Sugar for the Repl (GHCI)
+runCmdRepl :: Show err => Cmd' DevEnv err a -> IO a
+runCmdRepl f = newDevEnv >>= \env -> runCmdDev env f
+
 newDevEnv :: IO DevEnv
 newDevEnv = newDevEnvWith "gargantext.ini"
 

src/Gargantext/Database/Facet.hs

@@ -229,17 +229,17 @@ queryAuthorsDoc = leftJoin5 queryNodeTable queryNodeNgramTable queryNgramsTable
     where
          cond12 :: (NodeNgramRead, NodeRead) -> Column PGBool
          cond12 (nodeNgram, doc) =  _node_id                  doc
-                                .== _nn_node_id nodeNgram
+                                .== nng_node_id nodeNgram
 
          cond23 :: (NgramsRead, (NodeNgramRead, NodeReadNull)) -> Column PGBool
          cond23 (ngrams, (nodeNgram, _)) =  ngrams_id                  ngrams
-                                        .== _nn_ngrams_id nodeNgram
+                                        .== nng_ngrams_id nodeNgram
          
          cond34 :: (NodeNgramRead, (NgramsRead, (NodeNgramReadNull, NodeReadNull))) -> Column PGBool
-         cond34 (nodeNgram2, (ngrams, (_,_)))= ngrams_id ngrams     .== _nn_ngrams_id       nodeNgram2
+         cond34 (nodeNgram2, (ngrams, (_,_)))= ngrams_id ngrams     .== nng_ngrams_id       nodeNgram2
          
          cond45 :: (NodeRead, (NodeNgramRead, (NgramsReadNull, (NodeNgramReadNull, NodeReadNull)))) -> Column PGBool
-         cond45 (contact, (nodeNgram2, (_, (_,_)))) = _node_id  contact    .== _nn_node_id         nodeNgram2
+         cond45 (contact, (nodeNgram2, (_, (_,_)))) = _node_id  contact    .== nng_node_id         nodeNgram2
 
 
 ------------------------------------------------------------------------

src/Gargantext/Database/Metrics/Count.hs

@@ -89,8 +89,8 @@ getNgramsByNodeIndexed nId nt = runOpaQuery (select' nId)
     select' nId' = proc () -> do
       (ng,(nng,(_,n))) <- getNgramsByNodeIndexedJoin -< ()
       restrict          -< _node_id n         .== toNullable (pgNodeId nId')
-      restrict          -< _nn_ngramsType nng .== toNullable (pgNgramsTypeId $ ngramsTypeId nt)
-      returnA           -< (_nn_node_id nng, ngrams_terms ng)
+      restrict          -< nng_ngramsType nng .== toNullable (pgNgramsTypeId $ ngramsTypeId nt)
+      returnA           -< (nng_node_id nng, ngrams_terms ng)
 
 --}
 getNgramsByNodeIndexedJoin :: Query ( NgramsRead
@@ -114,7 +114,7 @@ getNgramsByNodeIndexedJoin = leftJoin4 queryNodeTable
             , NodeReadNull
             )
           ) -> Column PGBool
-    c2 (nng,(nn',_)) = (_nn_node_id nng)   .== nn_node2_id nn'
+    c2 (nng,(nn',_)) = (nng_node_id nng)   .== nn_node2_id nn'
 
     c3 :: ( NgramsRead
           , ( NodeNgramRead
@@ -123,7 +123,7 @@ getNgramsByNodeIndexedJoin = leftJoin4 queryNodeTable
               )
             )
           ) -> Column PGBool
-    c3 (ng,(nng',(_,_))) = (ngrams_id ng)   .== _nn_ngrams_id nng'
+    c3 (ng,(nng',(_,_))) = (ngrams_id ng)   .== nng_ngrams_id nng'
 
 
 getNgramsByNodeIndexedJoin' :: Query ( NodeNodeNgramsRead
@@ -150,7 +150,7 @@ getNgramsByNodeIndexedJoin' = leftJoin5 queryNodeTable
             , NodeReadNull
             )
           ) -> Column PGBool
-    c2 (nng,(nn',_)) = (_nn_node_id nng)   .== nn_node2_id nn'
+    c2 (nng,(nn',_)) = (nng_node_id nng)   .== nn_node2_id nn'
 
     c3 :: ( NgramsRead
           , ( NodeNgramRead
@@ -159,7 +159,7 @@ getNgramsByNodeIndexedJoin' = leftJoin5 queryNodeTable
               )
             )
           ) -> Column PGBool
-    c3 (ng,(nng',(_,_))) = (ngrams_id ng)   .== _nn_ngrams_id nng'
+    c3 (ng,(nng',(_,_))) = (ngrams_id ng)   .== nng_ngrams_id nng'
 
 
     c4 :: ( NodeNodeNgramsRead

src/Gargantext/Database/Schema/NodeNgram.hs

@@ -52,13 +52,13 @@ import qualified Database.PostgreSQL.Simple as DPS
 
 -- | TODO : remove id
 data NodeNgramPoly node_id ngrams_id parent_id ngrams_type list_type weight
-   = NodeNgram { _nn_node_id    :: node_id
-               , _nn_ngrams_id  :: ngrams_id
-               , _nn_parent_id  :: parent_id
-               
-               , _nn_ngramsType :: ngrams_type
-               , _nn_listType   :: list_type
-               , _nn_weight     :: weight
+   = NodeNgram { nng_node_id    :: node_id
+               , nng_ngrams_id  :: ngrams_id
+               , nng_parent_id  :: parent_id
+              
+               , nng_ngramsType :: ngrams_type
+               , nng_listType   :: list_type
+               , nng_weight     :: weight
                } deriving (Show)
 
 type NodeNgramWrite =
@@ -106,12 +106,12 @@ makeLenses ''NodeNgramPoly
 nodeNgramTable :: Table NodeNgramWrite NodeNgramRead
 nodeNgramTable  = Table "nodes_ngrams"
   ( pNodeNgram NodeNgram
-    { _nn_node_id    = required "node_id"
-    , _nn_ngrams_id  = required "ngrams_id"
-    , _nn_parent_id  = optional "parent_id"
-    , _nn_ngramsType = required "ngrams_type"
-    , _nn_listType   = required "list_type"
-    , _nn_weight     = required "weight"
+    { nng_node_id    = required "node_id"
+    , nng_ngrams_id  = required "ngrams_id"
+    , nng_parent_id  = optional "parent_id"
+    , nng_ngramsType = required "ngrams_type"
+    , nng_listType   = required "list_type"
+    , nng_weight     = required "weight"
     }
   )
 

src/Gargantext/Database/TextSearch.hs

@@ -104,7 +104,7 @@ queryInCorpusWithContacts cId q _ _ _ = proc () -> do
   restrict -< (_ns_search docs)              @@ (pgTSQuery  $ unpack q  )
   restrict -< (_ns_typename docs)           .== (pgInt4 $ nodeTypeId NodeDocument)
   restrict -< (nn_node1_id corpusDoc) .== (toNullable $ pgNodeId cId)
-  restrict -< (_nn_listType docNgrams)      .== (toNullable $ pgNgramsType Authors)
+  restrict -< (nng_listType docNgrams)      .== (toNullable $ pgNgramsType Authors)
   restrict -< (_node_typename contacts)     .== (toNullable $ pgInt4 $ nodeTypeId NodeContact)
   -- let contact_id    = ifThenElse (isNull $ _node_id contacts) (toNullable $ pgInt4 0) (_node_id contacts)
   returnA  -< FacetPaired (_ns_id docs) (_ns_date docs) (_ns_hyperdata docs) (pgInt4 0) (Pair (_node_id contacts) (ngrams_terms ngrams'))
@@ -113,16 +113,16 @@ joinInCorpusWithContacts :: O.Query (NodeSearchRead, (NodeNodeReadNull, (NodeNgr
 joinInCorpusWithContacts = leftJoin6 queryNodeTable queryNodeNgramTable queryNgramsTable queryNodeNgramTable queryNodeNodeTable queryNodeSearchTable cond12 cond23 cond34 cond45 cond56
     where
          cond12 :: (NodeNgramRead, NodeRead) -> Column PGBool
-         cond12 (ng3, n2) = _node_id n2 .== _nn_node_id ng3
+         cond12 (ng3, n2) = _node_id n2 .== nng_node_id ng3
 ---------
          cond23 :: (NgramsRead, (NodeNgramRead, NodeReadNull)) -> Column PGBool
-         cond23 (ng2, (nng2, _)) = _nn_ngrams_id nng2 .== ngrams_id ng2
+         cond23 (ng2, (nng2, _)) = nng_ngrams_id nng2 .== ngrams_id ng2
          
          cond34 :: (NodeNgramRead, (NgramsRead, (NodeNgramReadNull, NodeReadNull))) -> Column PGBool
-         cond34 (nng, (ng, (_,_))) = ngrams_id ng .== _nn_ngrams_id nng
+         cond34 (nng, (ng, (_,_))) = ngrams_id ng .== nng_ngrams_id nng
          
          cond45 :: (NodeNodeRead, (NodeNgramRead, (NgramsReadNull, (NodeNgramReadNull, NodeReadNull)))) -> Column PGBool
-         cond45 (nn, (nng, (_,(_,_)))) = _nn_node_id nng .== nn_node2_id nn
+         cond45 (nn, (nng, (_,(_,_)))) = nng_node_id nng .== nn_node2_id nn
          
          cond56 :: (NodeSearchRead, (NodeNodeRead, (NodeNgramReadNull, (NgramsReadNull, (NodeNgramReadNull, NodeReadNull))))) -> Column PGBool
          cond56 (n, (nn, (_,(_,(_,_))))) = _ns_id n .== nn_node2_id nn