From cbc5dfd30bad9bb124cee47e48d32454a0fc6922 Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Sat, 18 May 2024 15:56:05 -0500
Subject: [PATCH] Apply request caching to core routes

---
 src/app/film/[simulation]/[photoId]/layout.tsx      | 3 +--
 src/app/film/[simulation]/page.tsx                  | 8 ++++++--
 src/app/film/[simulation]/share/page.tsx            | 8 ++++++--
 src/app/shot-on/[make]/[model]/[photoId]/layout.tsx | 3 +--
 src/app/shot-on/[make]/[model]/page.tsx             | 7 +++++--
 src/app/shot-on/[make]/[model]/share/page.tsx       | 7 +++++--
 src/app/tag/[tag]/page.tsx                          | 7 +++++--
 src/app/tag/[tag]/share/page.tsx                    | 7 +++++--
 8 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/app/film/[simulation]/[photoId]/layout.tsx b/src/app/film/[simulation]/[photoId]/layout.tsx
index 83297f2a..daafa883 100644
--- a/src/app/film/[simulation]/[photoId]/layout.tsx
+++ b/src/app/film/[simulation]/[photoId]/layout.tsx
@@ -15,8 +15,7 @@ import { ReactNode, cache } from 'react';
 import { FilmSimulation } from '@/simulation';
 import { getPhotosFilmSimulationDataCached } from '@/simulation/data';
 
-const getPhotoCachedCached =
-  cache((photoId: string) => getPhotoCached(photoId));
+const getPhotoCachedCached = cache(getPhotoCached);
 
 interface PhotoFilmSimulationProps {
   params: { photoId: string, simulation: FilmSimulation }
diff --git a/src/app/film/[simulation]/page.tsx b/src/app/film/[simulation]/page.tsx
index 959b610a..cc98546d 100644
--- a/src/app/film/[simulation]/page.tsx
+++ b/src/app/film/[simulation]/page.tsx
@@ -3,6 +3,10 @@ import { FilmSimulation, generateMetaForFilmSimulation } from '@/simulation';
 import FilmSimulationOverview from '@/simulation/FilmSimulationOverview';
 import { getPhotosFilmSimulationDataCached } from '@/simulation/data';
 import { Metadata } from 'next/types';
+import { cache } from 'react';
+
+const getPhotosFilmSimulationDataCachedCached =
+  cache(getPhotosFilmSimulationDataCached);
 
 interface FilmSimulationProps {
   params: { simulation: FilmSimulation }
@@ -14,7 +18,7 @@ export async function generateMetadata({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosFilmSimulationDataCached({
+  ] = await getPhotosFilmSimulationDataCachedCached({
     simulation,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
@@ -49,7 +53,7 @@ export default async function FilmSimulationPage({
   const [
     photos,
     { count, dateRange },
-  ] =  await getPhotosFilmSimulationDataCached({
+  ] =  await getPhotosFilmSimulationDataCachedCached({
     simulation,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
diff --git a/src/app/film/[simulation]/share/page.tsx b/src/app/film/[simulation]/share/page.tsx
index 8a6d8a3b..76c3aab5 100644
--- a/src/app/film/[simulation]/share/page.tsx
+++ b/src/app/film/[simulation]/share/page.tsx
@@ -4,6 +4,10 @@ import FilmSimulationOverview from '@/simulation/FilmSimulationOverview';
 import FilmSimulationShareModal from '@/simulation/FilmSimulationShareModal';
 import { getPhotosFilmSimulationDataCached } from '@/simulation/data';
 import { Metadata } from 'next/types';
+import { cache } from 'react';
+
+const getPhotosFilmSimulationDataCachedCached =
+  cache(getPhotosFilmSimulationDataCached);
 
 interface FilmSimulationProps {
   params: { simulation: FilmSimulation }
@@ -15,7 +19,7 @@ export async function generateMetadata({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosFilmSimulationDataCached({
+  ] = await getPhotosFilmSimulationDataCachedCached({
     simulation,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
@@ -50,7 +54,7 @@ export default async function Share({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosFilmSimulationDataCached({
+  ] = await getPhotosFilmSimulationDataCachedCached({
     simulation,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
diff --git a/src/app/shot-on/[make]/[model]/[photoId]/layout.tsx b/src/app/shot-on/[make]/[model]/[photoId]/layout.tsx
index f9a2b070..c081a2c3 100644
--- a/src/app/shot-on/[make]/[model]/[photoId]/layout.tsx
+++ b/src/app/shot-on/[make]/[model]/[photoId]/layout.tsx
@@ -15,8 +15,7 @@ import { PhotoCameraProps, cameraFromPhoto } from '@/camera';
 import { getPhotosCameraDataCached } from '@/camera/data';
 import { ReactNode, cache } from 'react';
 
-const getPhotoCachedCached =
-  cache((photoId: string) => getPhotoCached(photoId));
+const getPhotoCachedCached = cache(getPhotoCached);
 
 export async function generateMetadata({
   params: { photoId, make, model },
diff --git a/src/app/shot-on/[make]/[model]/page.tsx b/src/app/shot-on/[make]/[model]/page.tsx
index 19825bd0..3b911eda 100644
--- a/src/app/shot-on/[make]/[model]/page.tsx
+++ b/src/app/shot-on/[make]/[model]/page.tsx
@@ -7,6 +7,9 @@ import {
 } from '@/photo';
 import { getPhotosCameraDataCached } from '@/camera/data';
 import CameraOverview from '@/camera/CameraOverview';
+import { cache } from 'react';
+
+const getPhotosCameraDataCachedCached = cache(getPhotosCameraDataCached);
 
 export async function generateMetadata({
   params,
@@ -16,7 +19,7 @@ export async function generateMetadata({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosCameraDataCached({
+  ] = await getPhotosCameraDataCachedCached({
     camera,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
@@ -51,7 +54,7 @@ export default async function CameraPage({ params }: CameraProps) {
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosCameraDataCached({
+  ] = await getPhotosCameraDataCachedCached({
     camera,
     limit: INFINITE_SCROLL_INITIAL_GRID,
   });
diff --git a/src/app/shot-on/[make]/[model]/share/page.tsx b/src/app/shot-on/[make]/[model]/share/page.tsx
index 14ad5488..dac32b58 100644
--- a/src/app/shot-on/[make]/[model]/share/page.tsx
+++ b/src/app/shot-on/[make]/[model]/share/page.tsx
@@ -12,6 +12,9 @@ import {
 } from '@/photo';
 import { getPhotosCameraDataCached } from '@/camera/data';
 import CameraOverview from '@/camera/CameraOverview';
+import { cache } from 'react';
+
+const getPhotosCameraDataCachedCached = cache(getPhotosCameraDataCached);
 
 export async function generateMetadata({
   params,
@@ -21,7 +24,7 @@ export async function generateMetadata({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosCameraDataCached({
+  ] = await getPhotosCameraDataCachedCached({
     camera,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
@@ -56,7 +59,7 @@ export default async function Share({ params }: CameraProps) {
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosCameraDataCached({
+  ] = await getPhotosCameraDataCachedCached({
     camera: cameraFromParams,
     limit: INFINITE_SCROLL_INITIAL_GRID,
   });
diff --git a/src/app/tag/[tag]/page.tsx b/src/app/tag/[tag]/page.tsx
index 8ee15c8a..2b23d7e1 100644
--- a/src/app/tag/[tag]/page.tsx
+++ b/src/app/tag/[tag]/page.tsx
@@ -5,6 +5,9 @@ import TagOverview from '@/tag/TagOverview';
 import { getPhotosTagDataCached } from '@/tag/data';
 import type { Metadata } from 'next';
 import { redirect } from 'next/navigation';
+import { cache } from 'react';
+
+const getPhotosTagDataCachedCached = cache(getPhotosTagDataCached);
 
 interface TagProps {
   params: { tag: string }
@@ -18,7 +21,7 @@ export async function generateMetadata({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosTagDataCached({
+  ] = await getPhotosTagDataCachedCached({
     tag,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
@@ -57,7 +60,7 @@ export default async function TagPage({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosTagDataCached({
+  ] = await getPhotosTagDataCachedCached({
     tag,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
diff --git a/src/app/tag/[tag]/share/page.tsx b/src/app/tag/[tag]/share/page.tsx
index e50ad552..43041221 100644
--- a/src/app/tag/[tag]/share/page.tsx
+++ b/src/app/tag/[tag]/share/page.tsx
@@ -4,6 +4,9 @@ import TagOverview from '@/tag/TagOverview';
 import TagShareModal from '@/tag/TagShareModal';
 import { getPhotosTagDataCached } from '@/tag/data';
 import type { Metadata } from 'next';
+import { cache } from 'react';
+
+const getPhotosTagDataCachedCached = cache(getPhotosTagDataCached);
 
 interface TagProps {
   params: { tag: string }
@@ -17,7 +20,7 @@ export async function generateMetadata({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosTagDataCached({
+  ] = await getPhotosTagDataCachedCached({
     tag,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });
@@ -54,7 +57,7 @@ export default async function Share({
   const [
     photos,
     { count, dateRange },
-  ] = await getPhotosTagDataCached({
+  ] = await getPhotosTagDataCachedCached({
     tag,
     limit: GRID_THUMBNAILS_TO_SHOW_MAX,
   });