Add conditional fetch caching with revalidation option

src/data/queries/doiQuery.ts

@@ -3,6 +3,7 @@ import apolloClient from 'src/utils/apolloClient/apolloClient'
 import { WorkMetadata, Work } from 'src/data/types'
 import { workFragment } from 'src/data/queries/queryFragments'
 import { mapJsonToWork } from 'src/utils/helpers'
+import fetchConditionalCache from 'src/utils/fetchConditionalCache'
 
 function buildDoiSearchParams(id: string): URLSearchParams {
   return new URLSearchParams({
@@ -30,7 +31,7 @@ export async function fetchDoi(id: string) {
     }
     const searchParams = buildDoiSearchParams(id)
 
-    const res = await fetch(
+    const res = await fetchConditionalCache(
       `${process.env.NEXT_PUBLIC_API_URL}/dois?${searchParams.toString()}`,
       options
     )

src/utils/fetchConditionalCache.ts

@@ -0,0 +1,29 @@
+const ONE_HOUR = 60 * 60;
+interface FetchConditionalCacheOptions extends RequestInit {
+  revalidate?: number;
+}
+
+async function fetchConditionalCache(
+  url: string,
+  options?: FetchConditionalCacheOptions
+) {
+  // Destructure revalidate, spread the rest into fetchOptions
+  const { revalidate, ...fetchOptions } = options || {};
+  const isCacheEnabled = revalidate !== undefined;
+  const nextOptions = isCacheEnabled ? { revalidate: revalidate } : { revalidate: ONE_HOUR };
+
+  const response = await fetch(url, {
+    cache: 'no-store',
+    ...fetchOptions
+  });
+
+  if (response.ok) {
+    return fetch(url, {
+      ...fetchOptions,
+      next: nextOptions
+    });
+  }
+
+  return response;
+}
+export default fetchConditionalCache