[DB/FACT] Schema NodeNodeNgrams -> Query (with warnings)

src/Gargantext/Database/Action/Flow.hs

@@ -77,7 +77,7 @@ import Gargantext.Database.Admin.Types.Node -- (HyperdataDocument(..), NodeType(
 import Gargantext.Database.Admin.Utils (Cmd)
 import Gargantext.Database.Query.Table.Ngrams
 import Gargantext.Database.Query.Table.NodeNgrams (listInsertDb , getCgramsId)
-import Gargantext.Database.Schema.NodeNodeNgrams2 -- (NodeNodeNgrams2, insertNodeNodeNgrams2)
+import Gargantext.Database.Query.Table.NodeNodeNgrams2
 import Gargantext.Ext.IMT (toSchoolName)
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
 import Gargantext.Ext.IMTUser (deserialiseImtUsersFromFile)

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

@@ -26,7 +26,7 @@ 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.NodeNodeNgrams
+import Gargantext.Database.Query.Table.NodeNodeNgrams
 import Gargantext.Prelude
 import qualified Data.Map as DM
 

src/Gargantext/Database/Action/Search.hs

@@ -32,12 +32,12 @@ 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.Admin.Utils (Cmd, runPGSQuery, runOpaQuery, runCountOpaQuery)
 import Gargantext.Database.Schema.Node
-import Gargantext.Database.Schema.NodeNodeNgrams
 import Gargantext.Prelude
 import Gargantext.Text.Terms.Mono.Stem.En (stemIt)
 import Opaleye hiding (Query, Order)

src/Gargantext/Database/Query/Facet.hs

@@ -62,7 +62,7 @@ import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Schema.Node
 import Gargantext.Database.Query.Table.NodeNode
-import Gargantext.Database.Schema.NodeNodeNgrams
+import Gargantext.Database.Query.Table.NodeNodeNgrams
 import Opaleye
 import Prelude hiding (null, id, map, sum, not, read)
 import Servant.API

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

@@ -33,7 +33,7 @@ import Gargantext.Database.Admin.Types.Node (pgNodeId)
 import Gargantext.Database.Admin.Utils (runOpaQuery, Cmd)
 import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery, runOpaQuery, formatPGSQuery)
-import Gargantext.Database.Schema.NodeNodeNgrams
+import Gargantext.Database.Query.Table.NodeNodeNgrams
 import Gargantext.Prelude
 import Gargantext.Database.Schema.Prelude
 import Data.ByteString.Internal (ByteString)

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

+{-|
+Module      : Gargantext.Database.Schema.NodeNodeNgrams
+Description : TODO: remove this module and table in database
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+{-#  OPTIONS_GHC -fno-warn-orphans  #-}
+
+{-# LANGUAGE Arrows                 #-}
+{-# LANGUAGE FlexibleContexts       #-}
+{-# LANGUAGE FlexibleInstances      #-}
+{-# LANGUAGE FunctionalDependencies #-}
+{-# LANGUAGE MultiParamTypeClasses  #-}
+{-# LANGUAGE NoImplicitPrelude      #-}
+{-# LANGUAGE RankNTypes             #-}
+{-# LANGUAGE TemplateHaskell        #-}
+
+module Gargantext.Database.Query.Table.NodeNodeNgrams
+  ( module Gargantext.Database.Schema.NodeNodeNgrams
+  , queryNodeNodeNgramsTable
+  , insertNodeNodeNgrams
+  )
+  where
+
+import Prelude
+import Gargantext.Database.Admin.Utils (Cmd, mkCmd)
+import Gargantext.Database.Schema.Prelude
+import Gargantext.Database.Schema.Ngrams (NgramsTypeId, pgNgramsTypeId, NgramsId)
+import Gargantext.Database.Schema.NodeNodeNgrams
+import Gargantext.Database.Admin.Types.Node (pgNodeId)
+import Gargantext.Database.Admin.Types.Node
+
+
+queryNodeNodeNgramsTable :: Query NodeNodeNgramsRead
+queryNodeNodeNgramsTable = queryTable nodeNodeNgramsTable
+
+-- | Insert utils
+insertNodeNodeNgrams :: [NodeNodeNgrams] -> Cmd err Int
+insertNodeNodeNgrams = insertNodeNodeNgramsW
+                     . map (\(NodeNodeNgrams n1 n2 ng nt w) ->
+                              NodeNodeNgrams (pgNodeId n1)
+                                             (pgNodeId n2)
+                                             (pgInt4   ng)
+                                             (pgNgramsTypeId nt)
+                                             (pgDouble w)
+                                                  )
+
+insertNodeNodeNgramsW :: [NodeNodeNgramsWrite] -> Cmd err Int
+insertNodeNodeNgramsW nnnw =
+  mkCmd $ \c -> fromIntegral <$> runInsert_ c insertNothing
+    where
+      insertNothing = (Insert { iTable = nodeNodeNgramsTable
+                              , iRows  = nnnw
+                              , iReturning = rCount
+                              , iOnConflict = (Just DoNothing)
+      })
+

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

+{-|
+Module      : Gargantext.Database.Schema.NodeNodeNgrams
+Description : TODO: remove this module and table in database
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+{-# LANGUAGE Arrows                 #-}
+{-# LANGUAGE FlexibleContexts       #-}
+{-# LANGUAGE FlexibleInstances      #-}
+{-# LANGUAGE FunctionalDependencies #-}
+{-# LANGUAGE MultiParamTypeClasses  #-}
+{-# LANGUAGE NoImplicitPrelude      #-}
+{-# LANGUAGE RankNTypes             #-}
+{-# LANGUAGE TemplateHaskell        #-}
+
+module Gargantext.Database.Query.Table.NodeNodeNgrams2
+  ( module Gargantext.Database.Schema.NodeNodeNgrams2
+  , insertNodeNodeNgrams2
+  )
+  where
+
+import Gargantext.Database.Schema.Prelude
+import Gargantext.Database.Schema.NodeNodeNgrams2
+import Gargantext.Database.Admin.Types.Node (pgNodeId)
+import Gargantext.Database.Admin.Utils (Cmd, mkCmd)
+import Prelude
+
+
+queryNodeNodeNgrams2Table :: Query NodeNodeNgrams2Read
+queryNodeNodeNgrams2Table = queryTable nodeNodeNgrams2Table
+
+-- | Insert utils
+insertNodeNodeNgrams2 :: [NodeNodeNgrams2] -> Cmd err Int
+insertNodeNodeNgrams2 = insertNodeNodeNgrams2W
+                     . map (\(NodeNodeNgrams2 n1 n2 w) ->
+                              NodeNodeNgrams2 (pgNodeId n1)
+                                              (pgInt4   n2)
+                                              (pgDouble w)
+                           )
+
+insertNodeNodeNgrams2W :: [NodeNodeNgrams2Write] -> Cmd err Int
+insertNodeNodeNgrams2W nnnw =
+  mkCmd $ \c -> fromIntegral <$> runInsert_ c insertNothing
+    where
+      insertNothing = Insert { iTable = nodeNodeNgrams2Table
+                              , iRows  = nnnw
+                              , iReturning = rCount
+                              , iOnConflict = (Just DoNothing)
+                              }

src/Gargantext/Database/Schema/NodeNodeNgrams.hs

@@ -24,10 +24,8 @@ module Gargantext.Database.Schema.NodeNodeNgrams
   where
 
 import Prelude
-import Gargantext.Database.Admin.Utils (Cmd, mkCmd)
 import Gargantext.Database.Schema.Prelude
 import Gargantext.Database.Schema.Ngrams (NgramsTypeId, pgNgramsTypeId, NgramsId)
-import Gargantext.Database.Admin.Types.Node (pgNodeId)
 import Gargantext.Database.Admin.Types.Node
 
 data NodeNodeNgramsPoly n1 n2 ngrams_id ngt w
@@ -77,29 +75,3 @@ nodeNodeNgramsTable  = Table "node_node_ngrams"
                                }
                           )
 
-------------------------------------------------
-
-queryNodeNodeNgramsTable :: Query NodeNodeNgramsRead
-queryNodeNodeNgramsTable = queryTable nodeNodeNgramsTable
-
--- | Insert utils
-insertNodeNodeNgrams :: [NodeNodeNgrams] -> Cmd err Int
-insertNodeNodeNgrams = insertNodeNodeNgramsW
-                     . map (\(NodeNodeNgrams n1 n2 ng nt w) ->
-                              NodeNodeNgrams (pgNodeId n1)
-                                             (pgNodeId n2)
-                                             (pgInt4   ng)
-                                             (pgNgramsTypeId nt)
-                                             (pgDouble w)
-                                                  )
-
-insertNodeNodeNgramsW :: [NodeNodeNgramsWrite] -> Cmd err Int
-insertNodeNodeNgramsW nnnw =
-  mkCmd $ \c -> fromIntegral <$> runInsert_ c insertNothing
-    where
-      insertNothing = (Insert { iTable = nodeNodeNgramsTable
-                              , iRows  = nnnw
-                              , iReturning = rCount
-                              , iOnConflict = (Just DoNothing)
-      })
-

src/Gargantext/Database/Schema/NodeNodeNgrams2.hs

@@ -27,7 +27,6 @@ import Gargantext.Database.Schema.Prelude
 import Gargantext.Database.Schema.NodeNgrams (NodeNgramsId)
 import Gargantext.Database.Admin.Types.Node (pgNodeId)
 import Gargantext.Database.Admin.Types.Node
-import Gargantext.Database.Admin.Utils (Cmd, mkCmd)
 import Prelude
 
 data NodeNodeNgrams2Poly node_id nodengrams_id w
@@ -57,7 +56,6 @@ type NodeNodeNgrams2 =
 $(makeAdaptorAndInstance "pNodeNodeNgrams2" ''NodeNodeNgrams2Poly)
 makeLenses ''NodeNodeNgrams2Poly
 
-
 nodeNodeNgrams2Table :: Table NodeNodeNgrams2Write NodeNodeNgrams2Read
 nodeNodeNgrams2Table  = Table "node_node_ngrams2"
                           ( pNodeNodeNgrams2 NodeNodeNgrams2
@@ -67,24 +65,3 @@ nodeNodeNgrams2Table  = Table "node_node_ngrams2"
                                }
                           )
 
-queryNodeNodeNgrams2Table :: Query NodeNodeNgrams2Read
-queryNodeNodeNgrams2Table = queryTable nodeNodeNgrams2Table
-
--- | Insert utils
-insertNodeNodeNgrams2 :: [NodeNodeNgrams2] -> Cmd err Int
-insertNodeNodeNgrams2 = insertNodeNodeNgrams2W
-                     . map (\(NodeNodeNgrams2 n1 n2 w) ->
-                              NodeNodeNgrams2 (pgNodeId n1)
-                                              (pgInt4   n2)
-                                              (pgDouble w)
-                           )
-
-insertNodeNodeNgrams2W :: [NodeNodeNgrams2Write] -> Cmd err Int
-insertNodeNodeNgrams2W nnnw =
-  mkCmd $ \c -> fromIntegral <$> runInsert_ c insertNothing
-    where
-      insertNothing = Insert { iTable = nodeNodeNgrams2Table
-                              , iRows  = nnnw
-                              , iReturning = rCount
-                              , iOnConflict = (Just DoNothing)
-                              }