fix(api): Restore datasets extraction

dataesr · Nov 20, 2023 · ca01a78 · ca01a78
1 parent 1e9d5c9
commit ca01a78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/server/src/routes/works.routes.js b/server/src/routes/works.routes.js
@@ -17,15 +17,14 @@ 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 }),
+          getBsoWorks({ options, index: process.env.VITE_BSO_PUBLICATIONS_INDEX, filter: 'q=-genre_raw:dataset' }),
           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' }),
+          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.datasets = [...results[2].results];
+        data.datasets = [...results[2].results, ...results[3].results];
         // Deduplicate publications by DOI or by hal_id
         const deduplicatedPublications = {};
         data.publications.forEach((publication) => {

diff --git a/server/src/utils.js b/server/src/utils.js
@@ -218,7 +218,7 @@ const getOpenAlexPublications = (options, page = '1', previousResponse = []) =>
         status: 'tobedecided',
         title: result?.display_name ?? result.title,
         type: getTypeFromOpenAlex(result.type),
-        year: Number(result?.publication_year) ?? Number(result.year),
+        year: result?.publication_year ?? result.year,
       })),
     }));
 };