Compare commits

...

40 Commits

Author SHA1 Message Date
Konstantina Galouni 5f4e40a834 Merge remote-tracking branch 'origin/develop' 2024-09-23 14:11:11 +03:00
Konstantina Galouni 7abfb0bb49 Updating openaireLibrary 2024-09-23 14:09:01 +03:00
Konstantina Galouni e356b58380 Updating openaireLibrary & common-assets 2024-09-23 14:04:53 +03:00
Konstantina Galouni 7ab767aec8 Updating openaireLibrary 2024-09-23 13:20:14 +03:00
argirok 4ca47d7f36 [develop | DONE | ADDED ] utils service: add calculation date for grouped requests (useful when the response is cached) 2024-09-19 13:51:22 +03:00
Konstantina Galouni 974c43b00d Updating openaireLibrary 2024-09-18 14:27:44 +03:00
Konstantina Galouni 8c3f17cc20 Updating openaireLibrary & common-assets 2024-09-10 02:56:55 +03:00
Konstantina Galouni 7d986a7028 Merge remote-tracking branch 'origin/develop' 2024-08-02 10:41:44 +03:00
Konstantina Galouni 24895a85a2 Updating openaireLibrary 2024-08-02 10:41:28 +03:00
Konstantina Galouni a1ec284c63 Merge remote-tracking branch 'origin/develop' 2024-07-23 11:24:11 +03:00
Konstantina Galouni 3acffc3d79 Updating openaireLibrary 2024-07-23 11:24:04 +03:00
Konstantina Galouni 4fc4182696 Merge remote-tracking branch 'origin/develop' 2024-07-12 11:29:46 +03:00
Konstantina Galouni 2754736693 Updating libraries 2024-07-12 11:26:47 +03:00
Konstantina Galouni b059b300ba Merge remote-tracking branch 'origin/develop' 2024-06-04 17:36:04 +03:00
Konstantina Galouni d05209a54c Updating openaireLibrary & common-assets 2024-06-04 17:35:55 +03:00
Konstantina Galouni dbdb929a8f Merge remote-tracking branch 'origin/develop' 2024-05-23 19:30:32 +03:00
Konstantina Galouni 58770771ca Updating libraries 2024-05-23 19:30:19 +03:00
Konstantina Galouni 2a4b92ba00 Merge remote-tracking branch 'origin/develop' 2024-03-05 13:53:24 +02:00
Konstantina Galouni 3d2ad5336b Merge remote-tracking branch 'origin/develop' 2024-03-04 18:46:56 +02:00
Konstantina Galouni 60de7eb2a0 Updating libraries 2024-03-04 18:46:36 +02:00
Konstantina Galouni 9f53423ae3 Merge remote-tracking branch 'origin/develop' 2024-02-12 14:50:33 +02:00
Konstantina Galouni 15499aa4ca Updating openaireLibrary 2024-02-12 14:50:19 +02:00
Konstantina Galouni b6db196e68 Merge pull request 'Production release February 2024 - Fixes and updates in cache' (#13) from develop into master
Reviewed-on: #13
2024-02-12 12:30:21 +01:00
Konstantina Galouni 4258055e51 Merge pull request 'Production release February 2024 - Home page logos update' (#12) from develop into master
Reviewed-on: #12
2024-02-12 08:08:29 +01:00
Konstantina Galouni 134c21d6be Merge pull request 'Production release February 2024 - Fix' (#11) from develop into master
Reviewed-on: #11
2024-02-08 18:44:55 +01:00
Konstantina Galouni a5019e083c Merge remote-tracking branch 'origin/develop' 2024-02-08 19:10:13 +02:00
Konstantina Galouni ee38203ee4 Updating openaireLibrary & openaire-theme 2024-02-08 19:10:04 +02:00
Konstantina Galouni 414ff59fd0 Merge remote-tracking branch 'origin/develop' 2024-02-07 22:41:04 +02:00
Konstantina Galouni 5408bd9f82 Updating openaireLibrary & common-assets 2024-02-07 22:39:56 +02:00
Konstantina Galouni 278fefb45a Merge remote-tracking branch 'origin/develop' 2024-02-01 21:52:27 +02:00
Konstantina Galouni 3562d4f6c6 Updating openaireLibrary 2024-02-01 21:52:17 +02:00
Konstantina Galouni b21d7dcd93 Merge remote-tracking branch 'origin/develop' 2024-02-01 21:12:13 +02:00
Konstantina Galouni 2adb378467 Updating libraries 2024-02-01 21:10:48 +02:00
Konstantina Galouni c3587bb2c4 Merge remote-tracking branch 'origin/develop' 2023-11-28 13:15:23 +02:00
Konstantina Galouni 288e106779 Updating libraries 2023-11-28 13:12:26 +02:00
Konstantina Galouni 11f0f8befb Merge remote-tracking branch 'origin/develop' 2023-11-10 19:33:22 +02:00
Konstantina Galouni ab839498a8 Updating libraries 2023-11-10 19:31:34 +02:00
Konstantina Galouni 4aa01517f2 Merge remote-tracking branch 'origin/develop' 2023-10-16 13:43:23 +03:00
Konstantina Galouni fb2e542c4d Updating openaireLibrary (after it was merged from develop to master). 2023-10-16 13:43:09 +03:00
Konstantina Galouni c676603faa Updating libraries 2023-10-16 13:34:18 +03:00
4 changed files with 11 additions and 7 deletions

@ -1 +1 @@
Subproject commit 8d6c45abe39953e70764bca0fb0e5446055d6325 Subproject commit f1fd1ef60c5a964e283ced7840876dc5896af9be

@ -1 +1 @@
Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2 Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b

@ -1 +1 @@
Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13 Subproject commit 55765bf0829910661a55337e0e7ca7b1262b7298

View File

@ -131,7 +131,8 @@ app.get('/explore/home', async function (req, res) {
funders: parseNoOfFunders(dataResponses[1].data, dataResponses[4].data), funders: parseNoOfFunders(dataResponses[1].data, dataResponses[4].data),
datasetsInterlinked:dataResponses[5].data.meta.total, datasetsInterlinked:dataResponses[5].data.meta.total,
softwareInterlinked:dataResponses[6].data.meta.total, softwareInterlinked:dataResponses[6].data.meta.total,
success:allRequestsSuccessful success:allRequestsSuccessful,
calculated_at: (new Date()).toUTCString()
}; };
// Send the aggregated data as the response // Send the aggregated data as the response
@ -162,7 +163,8 @@ app.get('/explore/search', async function (req, res) {
datasources: dataResponses[1].data.total, datasources: dataResponses[1].data.total,
organizations: dataResponses[2].data.meta.total, organizations: dataResponses[2].data.meta.total,
projects:dataResponses[3].data.total, projects:dataResponses[3].data.total,
success:allRequestsSuccessful success:allRequestsSuccessful,
calculated_at: (new Date()).toUTCString()
}; };
@ -204,7 +206,8 @@ app.get('/portals/countResults', async function (req, res) {
datasets: dataResponses[1].data.total, datasets: dataResponses[1].data.total,
software: dataResponses[2].data.total, software: dataResponses[2].data.total,
other:dataResponses[3].data.total, other:dataResponses[3].data.total,
success:allRequestsSuccessful success:allRequestsSuccessful,
calculated_at: (new Date()).toUTCString()
}; };
@ -357,7 +360,8 @@ app.get('/explore/funders', async function (req, res) {
results: dataResponses[0].data.meta.total, results: dataResponses[0].data.meta.total,
projects: dataResponses[2].data.meta.total, projects: dataResponses[2].data.meta.total,
funders: Array.from(fundersMap.values()), funders: Array.from(fundersMap.values()),
success:allRequestsSuccessful success:allRequestsSuccessful,
calculated_at: (new Date()).toUTCString()
}; };
res.status(allRequestsSuccessful?200:207).json(aggregatedData); res.status(allRequestsSuccessful?200:207).json(aggregatedData);