[DB/FACTO/WIP] G.D.S.Prelude

src/Gargantext/Database/Schema/Ngrams.hs

@@ -35,20 +35,14 @@ import Data.Map (Map, fromList, lookup)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Data.Swagger (ToParamSchema, toParamSchema, ToSchema)
 import Data.Text (Text, splitOn, pack)
-import Database.PostgreSQL.Simple.FromField (FromField, fromField)
-import Database.PostgreSQL.Simple.FromRow (fromRow, field)
-import Database.PostgreSQL.Simple.SqlQQ (sql)
-import Database.PostgreSQL.Simple.ToField (toField, ToField)
-import Database.PostgreSQL.Simple.ToRow   (toRow)
-import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import GHC.Generics (Generic)
 import Gargantext.Core.Types (TODO(..))
 import Gargantext.Database.Admin.Utils (Cmd, runPGSQuery, runOpaQuery, formatPGSQuery)
 import Gargantext.Prelude
-import Opaleye hiding (FromField)
 import Prelude (Enum, Bounded, minBound, maxBound, Functor)
 import Servant (FromHttpApiData, parseUrlPiece, Proxy(..))
 import Text.Read (read)
+import Gargantext.Database.Schema.Prelude
 import qualified Database.PostgreSQL.Simple as PGS
 
 

src/Gargantext/Database/Schema/Node.hs

@@ -27,21 +27,10 @@ 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 GHC.Generics (Generic)
-import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
 import Gargantext.Database.Admin.Utils
-import Opaleye hiding (FromField)
-import Opaleye.Internal.QueryArr (Query)
+import Gargantext.Database.Schema.Prelude
 import Prelude hiding (null, id, map, sum)
-import Test.QuickCheck.Arbitrary
-
 
 ------------------------------------------------------------------------
 -- Main polymorphic Node definition

src/Gargantext/Database/Schema/NodeNgrams.hs

@@ -30,18 +30,13 @@ import Data.List.Extra (nubOrd)
 import Data.Map (Map)
 import Data.Maybe (Maybe, fromMaybe)
 import Data.Text (Text)
-import Database.PostgreSQL.Simple (FromRow)
-import Database.PostgreSQL.Simple.FromRow (fromRow, field)
-import Database.PostgreSQL.Simple.SqlQQ (sql)
-import Database.PostgreSQL.Simple.ToField (toField)
-import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
+import Gargantext.Database.Schema.Prelude
 import Gargantext.Core.Types
 import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Schema.Ngrams (NgramsType, ngramsTypeId, fromNgramsTypeId)
 import Gargantext.Prelude
 import qualified Data.List as List
 import qualified Data.Map as Map
-import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))
 
 
 data NodeNgramsPoly id

src/Gargantext/Database/Schema/NodeNode.hs

@@ -30,16 +30,14 @@ import Control.Arrow (returnA)
 import Control.Lens (view, (^.))
 import Control.Lens.TH (makeLenses)
 import Data.Maybe (Maybe, catMaybes)
-import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Data.Text (Text, splitOn)
-import Database.PostgreSQL.Simple.SqlQQ (sql)
-import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import Gargantext.Core.Types
 import Gargantext.Database.Admin.Types.Node (pgNodeId)
 import Gargantext.Database.Admin.Config (nodeTypeId)
 import Gargantext.Database.Admin.Types.Node (CorpusId, DocId)
 import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Schema.Node
+import Gargantext.Database.Schema.Prelude
 import Gargantext.Prelude
 import Opaleye
 import qualified Database.PostgreSQL.Simple as PGS (Query, Only(..))

src/Gargantext/Database/Schema/NodeNodeNgrams.hs

@@ -24,7 +24,6 @@ module Gargantext.Database.Schema.NodeNodeNgrams
   where
 
 import Prelude
-import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Control.Lens.TH (makeLenses)
 import Gargantext.Database.Admin.Utils (Cmd, mkCmd)
 import Gargantext.Database.Schema.Ngrams (NgramsTypeId, pgNgramsTypeId, NgramsId)

src/Gargantext/Database/Schema/Node_NodeNgramsNodeNgrams.hs

@@ -38,7 +38,7 @@ module Gargantext.Database.Schema.Node_NodeNgramsNodeNgrams
 
 import Control.Lens.TH (makeLensesWith, abbreviatedFields)
 import Data.Maybe (Maybe)
-import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
+import Gargantext.Database.Schema.Prelude
 import Gargantext.Database.Admin.Utils (Cmd, runOpaQuery, mkCmd)
 import Gargantext.Database.Admin.Types.Node (CorpusId, pgNodeId)
 import Gargantext.Database.Schema.Node()