[WRONG] this type of refactoring fails in decodeJson

bin/gargantext-init/Main.hs

@@ -27,7 +27,7 @@ import Gargantext.Database.Query.Table.User (insertUsersDemo)
 import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Admin.Trigger.Init (initTriggers)
-import Gargantext.Database.Admin.Types.Hyperdata (HyperdataCorpus)
+import Gargantext.Database.Admin.Types.Hyperdata (HyperData)
 import Gargantext.Database.Admin.Types.Node (CorpusId, RootId, ListId)
 import Gargantext.Database.Prelude (Cmd, )
 import Gargantext.Prelude
@@ -48,7 +48,7 @@ main = do
   let
     initMaster :: Cmd GargError (UserId, RootId, CorpusId, ListId)
     initMaster = do
-      (masterUserId, masterRootId, masterCorpusId) <- getOrMk_RootWithCorpus (UserName userMaster) (Left corpusMasterName) (Nothing :: Maybe HyperdataCorpus)
+      (masterUserId, masterRootId, masterCorpusId) <- getOrMk_RootWithCorpus (UserName userMaster) (Left corpusMasterName) (Nothing :: Maybe HyperData)
       masterListId <- getOrMkList masterCorpusId masterUserId
       _triggers <- initTriggers masterListId
       pure (masterUserId, masterRootId, masterCorpusId, masterListId)

src/Gargantext/API/Public.hs

@@ -47,13 +47,13 @@ api = catMaybes <$> map toPublicData <$> filterPublicDatas <$> selectPublic
 
 
 selectPublic :: HasNodeError err
-             => Cmd err [( Node HyperdataFolder, Maybe Int)] 
+             => Cmd err [( Node HyperData, Maybe Int)] 
 selectPublic = selectPublicNodes
 
   -- | For tests only
   -- pure $ replicate 6 defaultPublicData
 
-filterPublicDatas :: [( Node HyperdataFolder, Maybe Int)] -> [(Node HyperdataFolder, [NodeId])]
+filterPublicDatas :: [( Node HyperData, Maybe Int)] -> [(Node HyperData, [NodeId])]
 filterPublicDatas datas = map (\(n,mi) -> let mi' = NodeId <$> mi in
                                               ( _node_id n, (n, maybe [] (:[]) mi' ))
                               ) datas
@@ -62,7 +62,7 @@ filterPublicDatas datas = map (\(n,mi) -> let mi' = NodeId <$> mi in
                         & Map.elems
 
 
-toPublicData :: (Node HyperdataFolder, [NodeId]) -> Maybe PublicData
+toPublicData :: (Node HyperData, [NodeId]) -> Maybe PublicData
 toPublicData (n , _mn) = PublicData <$> (hd ^? (_Just . hf_data . cf_title))
                                    <*> (hd ^? (_Just . hf_data . cf_desc))
                                    <*> Just "images/Gargantextuel-212x300.jpg"
@@ -73,7 +73,7 @@ toPublicData (n , _mn) = PublicData <$> (hd ^? (_Just . hf_data . cf_title))
   where
     hd = head
        $ filter (\(HyperdataField cd _ _) -> cd == JSON)
-       $ n^. (node_hyperdata . hc_fields)
+       $ n^. (node_hyperdata . hd_fields)
 
 
 data PublicData = PublicData

src/Gargantext/API/Routes.hs

@@ -99,7 +99,7 @@ type GargPrivateAPI' =
            -- Corpus endpoints
            :<|> "corpus"   :> Summary "Corpus endpoint"
                            :> Capture "corpus_id" CorpusId
-                           :> NodeAPI HyperdataCorpus
+                           :> NodeAPI HyperData
 
            :<|> "corpus"   :> Summary "Corpus endpoint"
                            :> Capture "node1_id" NodeId
@@ -205,7 +205,7 @@ serverPrivateGargAPI' :: AuthenticatedUser -> GargServer GargPrivateAPI'
 serverPrivateGargAPI' (AuthenticatedUser (NodeId uid))
        =  serverGargAdminAPI
      :<|> nodeAPI     (Proxy :: Proxy HyperdataAny)      uid
-     :<|> nodeAPI     (Proxy :: Proxy HyperdataCorpus)   uid
+     :<|> nodeAPI     (Proxy :: Proxy HyperData)   uid
      :<|> nodeNodeAPI (Proxy :: Proxy HyperdataAny)      uid
      :<|> Export.getCorpus   -- uid
      :<|> nodeAPI     (Proxy :: Proxy HyperdataAnnuaire) uid

src/Gargantext/Database/Action/Flow.hs

@@ -126,7 +126,7 @@ getDataText (InternalOrigin _) _la q _li = do
   (_masterUserId, _masterRootId, cId) <- getOrMk_RootWithCorpus
                                            (UserName userMaster)
                                            (Left "")
-                                           (Nothing :: Maybe HyperdataCorpus)
+                                           (Nothing :: Maybe HyperData)
   ids <-  map fst <$> searchInDatabase cId (stemIt q)
   pure $ DataOld ids
 
@@ -139,7 +139,7 @@ flowDataText :: FlowCmdM env err m
              -> m CorpusId
 flowDataText u (DataOld ids) tt cid = flowCorpusUser (_tt_lang tt) u (Right [cid]) corpusType ids
   where
-    corpusType = (Nothing :: Maybe HyperdataCorpus)
+    corpusType = (Nothing :: Maybe HyperData)
 flowDataText u (DataNew txt) tt cid = flowCorpus u (Right [cid]) tt txt
 
 ------------------------------------------------------------------------
@@ -177,7 +177,7 @@ flowCorpus :: (FlowCmdM env err m, FlowCorpus a)
            -> TermType Lang
            -> [[a]]
            -> m CorpusId
-flowCorpus = flow (Nothing :: Maybe HyperdataCorpus)
+flowCorpus = flow (Nothing :: Maybe HyperData)
 
 
 flow :: (FlowCmdM env err m, FlowCorpus a, MkCorpus c)

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

@@ -117,10 +117,10 @@ getDocumentsV3WithParentId n = runOpaQuery $ selectNodesWith' n (Just NodeDocume
 getDocumentsWithParentId :: NodeId -> Cmd err [Node HyperdataDocument]
 getDocumentsWithParentId n = runOpaQuery $ selectNodesWith' n (Just NodeDocument)
 
-getListsModelWithParentId :: NodeId -> Cmd err [Node HyperdataListModel]
+getListsModelWithParentId :: NodeId -> Cmd err [Node HyperData]
 getListsModelWithParentId n = runOpaQuery $ selectNodesWith' n (Just NodeListModel)
 
-getCorporaWithParentId :: NodeId -> Cmd err [Node HyperdataCorpus]
+getCorporaWithParentId :: NodeId -> Cmd err [Node HyperData]
 getCorporaWithParentId n = runOpaQuery $ selectNodesWith' n (Just NodeCorpus)
 
 ------------------------------------------------------------------------
@@ -164,18 +164,18 @@ nodeContactW maybeName maybeContact aId =
       name    = maybe "Contact" identity maybeName
       contact = maybe arbitraryHyperdataContact identity maybeContact
 ------------------------------------------------------------------------
-defaultFolder :: HyperdataCorpus
+defaultFolder :: HyperData
 defaultFolder = defaultCorpus
 
 
 
-nodeFolderW :: Maybe Name -> Maybe HyperdataCorpus -> ParentId -> UserId -> NodeWrite
+nodeFolderW :: Maybe Name -> Maybe HyperData -> ParentId -> UserId -> NodeWrite
 nodeFolderW maybeName maybeFolder pid = node NodeFolder name folder (Just pid)
   where
     name   = maybe "Folder" identity maybeName
     folder = maybe defaultFolder identity maybeFolder
 ------------------------------------------------------------------------
-nodeCorpusW :: Maybe Name -> Maybe HyperdataCorpus -> ParentId -> UserId -> NodeWrite
+nodeCorpusW :: Maybe Name -> Maybe HyperData -> ParentId -> UserId -> NodeWrite
 nodeCorpusW maybeName maybeCorpus pId = node NodeCorpus name corpus (Just pId)
   where
     name   = maybe "Corpus" identity maybeName
@@ -251,6 +251,7 @@ nodeDefault nt parent = node nt name hyper (Just parent)
     hyper = (hasDefaultData nt)
 
 ------------------------------------------------------------------------
+{-
 arbitraryListModel :: HyperdataListModel
 arbitraryListModel = HyperdataListModel (400,500) "data/models/test.model" (Just 0.83)
 
@@ -262,7 +263,7 @@ nodeListModelW maybeName maybeListModel pId = node NodeListModel name list (Just
   where
     name = maybe "List Model" identity maybeName
     list = maybe arbitraryListModel identity maybeListModel
-
+-}
 ------------------------------------------------------------------------
 arbitraryGraph :: HyperdataGraph
 arbitraryGraph = HyperdataGraph Nothing
@@ -403,7 +404,7 @@ class MkCorpus a
   where
     mk :: Maybe Name -> Maybe a -> ParentId -> UserId -> Cmd err [NodeId]
 
-instance MkCorpus HyperdataCorpus
+instance MkCorpus HyperData
   where
     mk n h p u = insertNodesR [nodeCorpusW n h p u]
 

src/Gargantext/Viz/Phylo/API.hs

@@ -17,28 +17,27 @@ Portability : POSIX
 module Gargantext.Viz.Phylo.API
   where
 
-import Data.String.Conversions
---import Control.Monad.Reader (ask)
-import qualified Data.ByteString as DB
-import qualified Data.ByteString.Lazy as DBL
+import Control.Lens ((^?), _Just)
 import Data.Proxy (Proxy(..))
+import Data.String.Conversions
 import Data.Swagger
-import Network.HTTP.Media ((//), (/:))
-import Servant
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
-import Web.HttpApiData (parseUrlPiece, readTextData)
-
 import Gargantext.API.Prelude
+import Gargantext.Core.Types (TODO(..))
 import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node -- (PhyloId, ListId, CorpusId, UserId, NodeId(..))
 import Gargantext.Database.Query.Table.Node (insertNodes, node, getNodeWith)
-import Gargantext.Database.Schema.Node (_node_hyperdata)
+import Gargantext.Database.Schema.Node (node_hyperdata)
 import Gargantext.Prelude
 import Gargantext.Viz.Phylo
-import Gargantext.Viz.Phylo.Main
 import Gargantext.Viz.Phylo.Example
-import Gargantext.Core.Types (TODO(..))
+import Gargantext.Viz.Phylo.Main
+import Network.HTTP.Media ((//), (/:))
+import Servant
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
+import Web.HttpApiData (parseUrlPiece, readTextData)
+import qualified Data.ByteString as DB
+import qualified Data.ByteString.Lazy as DBL
 
 ------------------------------------------------------------------------
 type PhyloAPI = Summary "Phylo API"
@@ -100,7 +99,7 @@ getPhylo phId _lId l msb  = do
   let
     level = maybe 2 identity l
     branc = maybe 2 identity msb
-    maybePhylo = hd_data $ _node_hyperdata phNode
+    maybePhylo = phNode ^? ( node_hyperdata . hd_data . _Just)
 
   p <- liftBase $ viewPhylo2Svg
                 $ viewPhylo level branc