[Annuanire][Contact] Route + script.

bin/gargantext-import/Main.hs

@@ -23,7 +23,7 @@ import Data.Either
 import Prelude (read)
 import Control.Exception (finally)
 import Gargantext.Prelude
-import Gargantext.Database.Flow (FlowCmdM, flowCorpusFile)
+import Gargantext.Database.Flow (FlowCmdM, flowCorpusFile, flowAnnuaire)
 import Gargantext.Text.Corpus.Parsers (FileFormat(..))
 import Gargantext.Database.Utils (Cmd, )
 import Gargantext.Database.Types.Node (CorpusId, toHyperdataDocument)
@@ -41,9 +41,10 @@ import Control.Monad.IO.Class (liftIO)
 
 main :: IO ()
 main = do
-  [userCreate, user, name, iniPath, limit, corpusPath] <- getArgs
+  [fun, user, name, iniPath, limit, corpusPath] <- getArgs
 
   --{-
+
   let createUsers :: Cmd GargError Int64
       createUsers = insertUsersDemo
   
@@ -51,8 +52,13 @@ main = do
     --tt = (Unsupervised EN 6 0 Nothing)
     tt = (Multi EN)
     format = CsvGargV3 -- CsvHalFormat --WOS
-    cmd :: forall m. FlowCmdM DevEnv GargError m => m CorpusId
-    cmd = flowCorpusFile (cs user) (Left (cs name :: Text)) (read limit :: Int) tt  format corpusPath
+    corpus :: forall m. FlowCmdM DevEnv GargError m => m CorpusId
+    corpus = flowCorpusFile (cs user) (Left (cs name :: Text)) (read limit :: Int) tt  format corpusPath
+
+    annuaire :: forall m. FlowCmdM DevEnv GargError m => m CorpusId
+    annuaire = flowAnnuaire (cs user) (Left "Annuaire") (Multi EN) corpusPath
+
+
   {-
   let debatCorpus :: forall m. FlowCmdM DevEnv GargError m => m CorpusId
       debatCorpus = do
@@ -64,13 +70,18 @@ main = do
         flowCorpus (Text.pack user) (Text.pack name) (Multi FR) (map (map toHyperdataDocument) docs)
   --}
 
-
   withDevEnv iniPath $ \env -> do
-    _ <- if userCreate == "true"
+    _ <- if fun == "users"
           then runCmdDev env createUsers
           else pure 0 --(cs "false")
 
-    _ <- runCmdDev env cmd
+    _ <- if fun == "corpus"
+          then runCmdDev env corpus
+          else pure 0 --(cs "false")
+    
+    _ <- if fun == "annuaire"
+            then runCmdDev env annuaire
+            else pure 0
     {-
     _ <- if corpusType == "csv"
             then runCmdDev env csvCorpus

src/Gargantext/API.hs

@@ -70,7 +70,7 @@ import           Text.Blaze.Html (Html)
 
 --import Gargantext.API.Swagger
 
---import Gargantext.Database.Node.Contact (HyperdataContact)
+import Gargantext.Database.Node.Contact (HyperdataContact)
 import Gargantext.API.Auth (AuthRequest, AuthResponse, AuthenticatedUser(..), AuthContext, auth, withAccess, PathId(..))
 import Gargantext.API.Count  ( CountAPI, count, Query)
 import Gargantext.API.FrontEnd (FrontEndAPI, frontEndServer)
@@ -249,6 +249,11 @@ type GargPrivateAPI' =
            :<|> "annuaire":> Summary "Annuaire endpoint"
                           :> Capture "id" AnnuaireId      :> NodeAPI HyperdataAnnuaire
 
+           :<|> "annuaire" :> Summary "Contact endpoint"
+                           :> Capture "annuaire_id" NodeId
+                           :> "contact" :> Capture "contact_id" NodeId
+                           :> NodeNodeAPI HyperdataContact
+
            -- Document endpoint
            :<|> "document":> Summary "Document endpoint"
                           :> Capture "id" DocId    :> "ngrams" :> TableNgramsApi
@@ -325,11 +330,12 @@ serverGargAdminAPI
 serverPrivateGargAPI' :: AuthenticatedUser -> GargServer GargPrivateAPI'
 serverPrivateGargAPI' (AuthenticatedUser (NodeId uid))
        =  serverGargAdminAPI
-     :<|> nodeAPI  (Proxy :: Proxy HyperdataAny)      uid
-     :<|> nodeAPI  (Proxy :: Proxy HyperdataCorpus)   uid
-     :<|> nodeNodeAPI  (Proxy :: Proxy HyperdataAny) uid
-     :<|> nodeAPI  (Proxy :: Proxy HyperdataAnnuaire)   uid
-     :<|> withAccess (Proxy :: Proxy TableNgramsApi) Proxy uid <$> PathNode <*> apiNgramsTableDoc
+     :<|> nodeAPI     (Proxy :: Proxy HyperdataAny)      uid
+     :<|> nodeAPI     (Proxy :: Proxy HyperdataCorpus)   uid
+     :<|> nodeNodeAPI (Proxy :: Proxy HyperdataAny)      uid
+     :<|> nodeAPI     (Proxy :: Proxy HyperdataAnnuaire) uid
+     :<|> nodeNodeAPI (Proxy :: Proxy HyperdataContact)      uid
+     :<|> withAccess  (Proxy :: Proxy TableNgramsApi) Proxy uid <$> PathNode <*> apiNgramsTableDoc
      :<|> count -- TODO: undefined
      :<|> withAccess (Proxy :: Proxy SearchPairsAPI) Proxy uid <$> PathNode <*> searchPairs -- TODO: move elsewhere
      :<|> withAccess (Proxy :: Proxy GraphAPI)       Proxy uid <$> PathNode <*> graphAPI -- TODO: mock

src/Gargantext/API/Auth.hs

@@ -102,7 +102,7 @@ checkAuthRequest u p
   | not (u `elem` arbitraryUsername) = pure InvalidUser
   | u /= reverse p = pure InvalidPassword
   | otherwise = do
-      muId <- head <$> getRoot "user1" -- TODO user1 hard-coded
+      muId <- head <$> getRoot u
       case _node_id <$> muId of
         Nothing  -> pure InvalidUser
         Just uid -> do
@@ -179,7 +179,7 @@ instance Arbitrary AuthValid where
                        , tr <- [1..3]
                        ]
 
-data PathId = PathNode NodeId | PathDoc ListId DocId
+data PathId = PathNode NodeId | PathNodeNode ListId DocId
 
 withAccessM :: (CmdM env err m, HasServerError err)
             => UserId
@@ -190,13 +190,12 @@ withAccessM uId (PathNode id) m = do
   d <- id `isDescendantOf` NodeId uId
   if d then m else m -- serverError err401
 
-withAccessM uId (PathDoc cId docId) m = do
-  a <- isIn cId docId -- TODO use one query for all ?
-  d <- cId `isDescendantOf` NodeId uId
-  if a && d
+withAccessM uId (PathNodeNode cId docId) m = do
+  _a <- isIn cId docId -- TODO use one query for all ?
+  _d <- cId `isDescendantOf` NodeId uId
+  if True -- a && d
      then m
-     else m -- serverError err401
-
+     else m
 
 withAccess :: forall env err m api.
               (GargServerC env err m, HasServer api '[]) =>
@@ -208,16 +207,9 @@ withAccess p _ uId id = hoistServer p f
     f :: forall a. m a -> m a
     f = withAccessM uId id
 
-
 {- | Collaborative Schema
-
 User at his root can create Teams Folder
 User can create Team in Teams Folder.
 User can invite User in Team as NodeNode only if Team in his parents.
 All users can access to the Team folder as if they were owner.
-
 -}
-
-
-
-

src/Gargantext/API/Node.hs

@@ -164,11 +164,13 @@ type ChildrenApi a = Summary " Summary children"
 type NodeNodeAPI a = Get '[JSON] (Node a)
 
 nodeNodeAPI :: forall proxy a. (JSONB a, ToJSON a) => proxy a -> UserId -> CorpusId -> NodeId -> GargServer (NodeNodeAPI a)
-nodeNodeAPI p uId cId nId = withAccess (Proxy :: Proxy (NodeNodeAPI a)) Proxy uId (PathDoc cId nId) nodeNodeAPI'
+nodeNodeAPI p uId cId nId = withAccess (Proxy :: Proxy (NodeNodeAPI a)) Proxy uId (PathNodeNode cId nId) nodeNodeAPI'
   where
     nodeNodeAPI' :: GargServer (NodeNodeAPI a)
     nodeNodeAPI' = getNode nId p
 
+
+
 ------------------------------------------------------------------------
 -- TODO: make the NodeId type indexed by `a`, then we no longer need the proxy.
 nodeAPI :: forall proxy a. (JSONB a, ToJSON a) => proxy a -> UserId -> NodeId -> GargServer (NodeAPI a)
@@ -204,9 +206,11 @@ nodeAPI p uId id = withAccess (Proxy :: Proxy (NodeAPI a)) Proxy uId (PathNode i
       if _node_typename node == nodeTypeId NodeUser
          then panic "not allowed"  -- TODO add proper Right Management Type
          else deleteNode id'
-           
+
            -- Annuaire
            -- :<|> query
+
+
 ------------------------------------------------------------------------
 data RenameNode = RenameNode { r_name :: Text }
   deriving (Generic)

src/Gargantext/Database/Flow.hs

@@ -37,6 +37,7 @@ module Gargantext.Database.Flow -- (flowDatabase, ngrams2list)
   , flowCorpusSearchInDatabase
   , getOrMkRoot
   , getOrMkRootWithCorpus
+  , flowAnnuaire
   )
     where
 import Prelude (String)
@@ -120,9 +121,9 @@ _flowCorpusApi u n tt l q = do
 ------------------------------------------------------------------------
 
 -- UNUSED
-_flowAnnuaire :: FlowCmdM env err m
+flowAnnuaire :: FlowCmdM env err m
              => Username -> Either CorpusName [CorpusId] -> (TermType Lang) -> FilePath -> m AnnuaireId
-_flowAnnuaire u n l filePath = do
+flowAnnuaire u n l filePath = do
   docs <- liftIO $ (( splitEvery 500 <$> deserialiseImtUsersFromFile filePath) :: IO [[HyperdataContact]])
   flow (Nothing :: Maybe HyperdataAnnuaire) u n l docs
 

src/Gargantext/Database/Node/Contact.hs

@@ -76,15 +76,15 @@ data ContactWho =
 data ContactWhere =
      ContactWhere { _cw_organization :: [Text]
                   , _cw_labTeamDepts :: [Text]
-                  
+
                   , _cw_role         :: Maybe Text
-                  
+
                   , _cw_office       :: Maybe Text
                   , _cw_country      :: Maybe Text
                   , _cw_city         :: Maybe Text
-                  
+
                   , _cw_touch        :: Maybe ContactTouch
-                  
+
                   , _cw_entry        :: Maybe UTCTime
                   , _cw_exit         :: Maybe UTCTime
   } deriving (Eq, Show, Generic)