[API] PairWith with Maybe ListId

src/Gargantext/API/Node.hs

@@ -276,7 +276,7 @@ pairs cId = do
 
 type PairWith = Summary "Pair a Corpus with an Annuaire"
               :> "annuaire" :> Capture "annuaire_id" AnnuaireId
-              :> "list"     :> Capture "list_id"     ListId
+              :> QueryParam "list_id"     ListId
               :> Post '[JSON] Int
 
 pairWith :: CorpusId -> GargServer PairWith

src/Gargantext/API/Search.hs

@@ -49,27 +49,6 @@ instance Arbitrary SearchQuery where
   arbitrary = elements [SearchQuery ["electrodes"]]
 
 -----------------------------------------------------------------------
-data SearchDocResults = SearchDocResults { sdr_results :: [FacetDoc]}
-  deriving (Generic)
-$(deriveJSON (unPrefix "sdr_") ''SearchDocResults)
-
-instance Arbitrary SearchDocResults where
-  arbitrary = SearchDocResults <$> arbitrary
-
-instance ToSchema SearchDocResults where
-  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "sdr_")
-
-data SearchPairedResults =
-     SearchPairedResults { spr_results :: [FacetPaired Int UTCTime HyperdataContact Int] }
-  deriving (Generic)
-$(deriveJSON (unPrefix "spr_") ''SearchPairedResults)
-
-instance Arbitrary SearchPairedResults where
-  arbitrary = SearchPairedResults <$> arbitrary
-
-instance ToSchema SearchPairedResults where
-  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "spr_")
-
 -----------------------------------------------------------------------
 -- TODO-ACCESS: CanSearch? or is it part of CanGetNode
 -- TODO-EVENTS: No event, this is a read-only query.
@@ -86,15 +65,37 @@ searchDocs nId (SearchQuery q) o l order =
   SearchDocResults <$> searchInCorpus nId False q o l order
   --SearchResults <$> searchInCorpusWithContacts nId q o l order
 
+data SearchDocResults = SearchDocResults { sdr_results :: [FacetDoc]}
+  deriving (Generic)
+$(deriveJSON (unPrefix "sdr_") ''SearchDocResults)
+
+instance Arbitrary SearchDocResults where
+  arbitrary = SearchDocResults <$> arbitrary
+
+instance ToSchema SearchDocResults where
+  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "sdr_")
+
+
+
 -----------------------------------------------------------------------
 type SearchPairsAPI = Summary ""
                     :> "list"
                     :> Capture "annuaire" AnnuaireId
                     :> SearchAPI SearchPairedResults
 searchPairs :: NodeId -> GargServer SearchPairsAPI
-
 searchPairs pId aId (SearchQuery q) o l order =
   SearchPairedResults <$> searchInCorpusWithContacts pId aId q o l order
 
+
+data SearchPairedResults =
+     SearchPairedResults { spr_results :: [FacetPaired Int UTCTime HyperdataContact Int] }
+  deriving (Generic)
+$(deriveJSON (unPrefix "spr_") ''SearchPairedResults)
+
+instance Arbitrary SearchPairedResults where
+  arbitrary = SearchPairedResults <$> arbitrary
+
+instance ToSchema SearchPairedResults where
+  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "spr_")
 -----------------------------------------------------------------------
 

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

@@ -35,6 +35,7 @@ import Gargantext.Database.Prelude (Cmd, runOpaQuery)
 import Gargantext.Database.Query.Prelude (leftJoin2, returnA, queryNodeNodeTable)
 import Gargantext.Database.Query.Table.Node.Children (getAllContacts)
 import Gargantext.Database.Query.Table.Node.Select (selectNodesWithUsername)
+import Gargantext.Database.Query.Table.Node (defaultList)
 import Gargantext.Database.Schema.Ngrams -- (NgramsType(..))
 import Gargantext.Database.Schema.Node
 import Gargantext.Prelude hiding (sum)
@@ -65,11 +66,12 @@ isPairedWith nt nId = runOpaQuery (selectQuery nt nId)
         cond (node, node_node) = node^.node_id .== node_node^. nn_node2_id
 
 
-
-
 -----------------------------------------------------------------------
-pairing :: AnnuaireId -> CorpusId -> ListId -> GargNoServer Int
-pairing a c l = do
+pairing :: AnnuaireId -> CorpusId -> Maybe ListId -> GargNoServer Int
+pairing a c l' = do
+  l <- case l' of
+    Nothing -> defaultList c
+    Just l'' -> pure l''
   dataPaired <- dataPairing a (c,l,Authors) takeName takeName
   insertDB $ prepareInsert dataPaired