[FIX] API to unpublish: ok

src/Gargantext/API/Node.hs

@@ -46,7 +46,6 @@ import Gargantext.Core.Types (NodeTableResult)
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Core.Types.Main (Tree, NodeTree)
 import Gargantext.Database.Action.Flow.Pairing (pairing)
-import Gargantext.Database.Action.Share (unPublish)
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude -- (Cmd, CmdM)
 import Gargantext.Database.Query.Facet (FacetDoc, OrderBy(..))
@@ -145,7 +144,7 @@ type NodeAPI a = Get '[JSON] (Node a)
              :<|> "phylo"     :> PhyloAPI
              -- :<|> "add"       :> NodeAddAPI
              :<|> "move"      :> MoveAPI
-             :<|> "unpublish" :> Put '[JSON] Int
+             :<|> "unpublish" :> Share.Unpublish
 
 -- TODO-ACCESS: check userId CanRenameNode nodeId
 -- TODO-EVENTS: NodeRenamed RenameNode or re-use some more general NodeEdited...
@@ -221,7 +220,7 @@ nodeAPI p uId id' = withAccess (Proxy :: Proxy (NodeAPI a)) Proxy uId (PathNode
            :<|> moveNode   (RootId $ NodeId uId) id'
            -- :<|> nodeAddAPI id'
            -- :<|> postUpload id'
-           :<|> unPublish (RootId $ NodeId uId) id'
+           :<|> Share.unPublish id'
 
 
 ------------------------------------------------------------------------

src/Gargantext/API/Node/Share.hs

@@ -21,10 +21,12 @@ import Data.Swagger
 import Data.Text (Text)
 import GHC.Generics (Generic)
 import Gargantext.Core.Types.Individu (User(..))
-import Gargantext.Database.Action.Share (shareNodeWith, ShareNodeWith(..))
+import Gargantext.Database.Action.Share (ShareNodeWith(..))
+import Gargantext.Database.Action.Share as DB (shareNodeWith, unPublish)
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
+import Gargantext.API.Prelude
 import Gargantext.Prelude
 import Servant
 import Test.QuickCheck (elements)
@@ -52,16 +54,19 @@ api :: HasNodeError err
     -> ShareNodeParams
     -> Cmd err Int
 api nId (ShareTeamParams user) =
-  fromIntegral <$> shareNodeWith (ShareNodeWith_User NodeFolderShared (UserName user)) nId 
+  fromIntegral <$> DB.shareNodeWith (ShareNodeWith_User NodeFolderShared (UserName user)) nId 
 api nId2 (SharePublicParams nId1) =
-  fromIntegral <$> shareNodeWith (ShareNodeWith_Node NodeFolderPublic nId1) nId2
+  fromIntegral <$> DB.shareNodeWith (ShareNodeWith_Node NodeFolderPublic nId1) nId2
 
 ------------------------------------------------------------------------
 type API = Summary " Share Node with username"
          :> ReqBody '[JSON] ShareNodeParams
          :> Post    '[JSON] Int
 
+------------------------------------------------------------------------
+type Unpublish = Summary " Unpublish Node"
+               :> Capture "node_id" NodeId
+               :> Put '[JSON] Int
 
-
-
-
+unPublish :: NodeId -> GargServer Unpublish
+unPublish n = DB.unPublish n

src/Gargantext/Database/Action/Share.hs

@@ -87,8 +87,9 @@ delFolderTeam u nId = do
   folderSharedId <- getFolderId u NodeFolderShared
   deleteNodeNode folderSharedId nId
 
-unPublish :: HasNodeError err => User -> NodeId -> Cmd err Int
-unPublish  u nId = do
-  folderId <- getFolderId u NodeFolderPublic
-  deleteNodeNode folderId nId
+
+unPublish :: HasNodeError err
+          => ParentId -> NodeId
+          -> Cmd err Int
+unPublish p n = deleteNodeNode p n