feat(api): Optimize the querying of FOSM

dataesr · Nov 21, 2023 · 0f5bdf5 · 0f5bdf5
1 parent ca01a78
commit 0f5bdf5
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/server/src/routes/works.routes.js b/server/src/routes/works.routes.js
@@ -17,14 +17,19 @@ router.route('/works')
         res.status(400).json({ message: 'You must provide at least one affiliation.' });
       } else {
         const results = await Promise.all([
-          getBsoWorks({ options, index: process.env.VITE_BSO_PUBLICATIONS_INDEX, filter: 'q=-genre_raw:dataset' }),
+          getBsoWorks({ options, index: process.env.VITE_BSO_PUBLICATIONS_INDEX }),
           getOpenAlexPublications(options),
           getBsoWorks({ options, index: process.env.VITE_BSO_DATASETS_INDEX, filter: 'q=genre:dataset' }),
-          getBsoWorks({ options, index: process.env.VITE_BSO_PUBLICATIONS_INDEX, filter: 'q=genre_raw:dataset' }),
         ]);
         const data = {};
-        data.publications = [...results[0].results, ...results[1].results];
-        data.datasets = [...results[2].results, ...results[3].results];
+        data.publications = [
+          ...results[0].results.filter((result) => result.genre_raw !== 'dataset'),
+          ...results[1].results,
+        ];
+        data.datasets = [
+          ...results[0].results.filter((result) => result.genre_raw === 'dataset'),
+          ...results[2].results,
+        ];
         // Deduplicate publications by DOI or by hal_id
         const deduplicatedPublications = {};
         data.publications.forEach((publication) => {