Append arbitraries expressions to Zenodo queries

Note this is unused. Refs #1742, https://help.zenodo.org/guides/search/
PREreview · Jun 10, 2024 · dd12c3b · dd12c3b
1 parent b6eafdf
commit dd12c3b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/zenodo.ts b/src/zenodo.ts
@@ -64,6 +64,7 @@ import {
   fromUrl,
 } from './types/preprint-id'
 import type { ProfileId } from './types/profile-id'
+import type { NonEmptyString } from './types/string'
 import { isSubfieldId } from './types/subfield'
 import type { User } from './user'
 import type { NewPrereview } from './write-review'
@@ -120,16 +121,19 @@ export const getRecentPrereviewsFromZenodo = ({
   field,
   language,
   page,
+  query,
 }: {
   field?: FieldId
   language?: LanguageCode
   page: number
+  query?: NonEmptyString
 }) =>
   pipe(
     RTE.Do,
     RTE.let('currentPage', () => page),
     RTE.let('field', () => field),
     RTE.let('language', () => language),
+    RTE.let('query', () => query),
     RTE.filterOrElse(
       ({ currentPage }) => currentPage > 0,
       () => 'not-found' as const,
@@ -146,6 +150,7 @@ export const getRecentPrereviewsFromZenodo = ({
             q: [
               field ? `custom_fields.legacy\\:subjects.identifier:"https://openalex.org/fields/${field}"` : '',
               language ? `language:"${iso6391To3(language)}"` : '',
+              query ?? '',
             ]
               .filter(a => a !== '')
               .join(' AND '),
@@ -192,10 +197,11 @@ export const getRecentPrereviewsFromZenodo = ({
           match(error)
             .with('not-found', identity)
             .otherwise(() => 'unavailable' as const),
-        ({ currentPage, recentPrereviews, field, language, records }) => ({
+        ({ currentPage, recentPrereviews, field, language, records, query }) => ({
           currentPage,
           field,
           language,
+          query,
           recentPrereviews,
           totalPages: Math.ceil(records.hits.total / 5),
         }),

diff --git a/test/zenodo.test.ts b/test/zenodo.test.ts
@@ -43,9 +43,10 @@ describe('getRecentPrereviewsFromZenodo', () => {
     fc.integer({ min: 1 }),
     fc.option(fc.fieldId(), { nil: undefined }),
     fc.option(fc.languageCode(), { nil: undefined }),
+    fc.option(fc.nonEmptyString(), { nil: undefined }),
     fc.preprintTitle(),
     fc.preprintTitle(),
-  ])('when the PREreviews can be loaded', async (page, field, language, preprint1, preprint2) => {
+  ])('when the PREreviews can be loaded', async (page, field, language, query, preprint1, preprint2) => {
     const records: Records = {
       hits: {
         total: 2,
@@ -183,7 +184,7 @@ describe('getRecentPrereviewsFromZenodo', () => {
       },
     }
 
-    const actual = await _.getRecentPrereviewsFromZenodo({ field, language, page })({
+    const actual = await _.getRecentPrereviewsFromZenodo({ field, language, page, query })({
       clock: SystemClock,
       fetch: fetchMock.sandbox().getOnce(
         {
@@ -195,7 +196,7 @@ describe('getRecentPrereviewsFromZenodo', () => {
             resource_type: 'publication::publication-peerreview',
             q: `${
               field ? `custom_fields.legacy\\:subjects.identifier:"https://openalex.org/fields/${field}"` : ''
-            }${field && language ? ' AND ' : ''}${language ? `language:"${iso6391To3(language)}"` : ''}`,
+            }${field && language ? ' AND ' : ''}${language ? `language:"${iso6391To3(language)}"` : ''}${(field || language) && query ? ' AND ' : ''}${query ?? ''}`,
           },
         },
         {
@@ -217,6 +218,7 @@ describe('getRecentPrereviewsFromZenodo', () => {
         currentPage: page,
         field,
         language,
+        query,
         recentPrereviews: [
           {
             club: undefined,
@@ -336,6 +338,7 @@ describe('getRecentPrereviewsFromZenodo', () => {
           currentPage: page,
           field: undefined,
           language: undefined,
+          query: undefined,
           recentPrereviews: [
             {
               club: undefined,
@@ -477,6 +480,7 @@ describe('getRecentPrereviewsFromZenodo', () => {
           currentPage: page,
           field: undefined,
           language: undefined,
+          query: undefined,
           recentPrereviews: [
             {
               club: undefined,