Merge pull request #229 from mobeigi/improve-category-slugs-to-catego…

…ry-lookup

Improve category slugs to category lookup

app/src/app/(frontend)/blog/[...slug]/page.tsx

@@ -64,7 +64,7 @@ const getPayloadPostFromParams = ({ params }: { params: { slug: string[] } }) =>
 
       return postsMatchingCategorySlugUrl[0];
     },
-    [`get-payload-post-from-params-${params.slug.join('-')}`],
+    [`getPayloadPostFromParams:${params.slug.join('-')}`],
     { revalidate: revalidate },
   )();
 
@@ -117,7 +117,7 @@ const transformPostToBlogPostProps = (post: PayloadPost) =>
 
       return blogPostProps;
     },
-    [`transformPostToBlogPostProps-${post.id}`],
+    [`transformPostToBlogPostProps:${post.id}`],
     { revalidate: revalidate },
   )();
 

app/src/app/(frontend)/blog/category/[...slug]/page.tsx

@@ -4,7 +4,6 @@ import { getPayload } from 'payload';
 import config from '@payload-config';
 import { Category as PayloadCategory } from '@/payload-types';
 import { notFound } from 'next/navigation';
-import { PaginatedDocs } from 'payload';
 import { mapPostToPostMeta } from '@/utils/payload';
 import { BlogPostMeta, BlogPostRelatedMeta, Category } from '@/types/blog';
 import { sortBlogPostMetaByPublishedAtDate } from '@/utils/blog/post';
@@ -33,35 +32,43 @@ const getPayloadCategoryFromParams = ({ params }: { params: { slug: string[] } }
         return null;
       }
 
-      let currentParentId = null;
-      let category = null;
+      const categorySlug = categorySlugs[categorySlugs.length - 1];
+      const paramsCategorySlugUrl = joinUrl([...categorySlugs], false);
 
-      for (const slug of categorySlugs) {
-        const foundCategory: PaginatedDocs<PayloadCategory> = await payload.find({
-          collection: 'category',
-          where: {
-            slug: { equals: slug },
-            ...(currentParentId ? { parent: { equals: currentParentId } } : { parent: { exists: false } }),
+      // Find all categories matching the slug and breadcrumbs (filters by slug and URL but does not consider breadcrumb depth yet)
+      const payloadCategory = await payload.find({
+        collection: 'category',
+        where: {
+          slug: { equals: categorySlug },
+          'breadcrumbs.url': {
+            equals: paramsCategorySlugUrl,
           },
-          limit: 1, // We only expect one category with this slug and parent_id
-        });
+        },
+        depth: 1,
+        limit: 0,
+        pagination: false,
+      });
 
-        if (!foundCategory || foundCategory.docs.length === 0) {
-          return null;
-        }
+      if (!payloadCategory.docs.length) {
+        return null;
+      }
 
-        // Set the current category and update the parent ID for the next iteration
-        category = foundCategory.docs[0];
-        currentParentId = category.id; // Set the parent_id for the next slug
+      // Additionally, filter categories by breadcrumbs length to ensure we select the correct hierarchy level
+      const filteredPayloadCategory = payloadCategory.docs.filter(
+        (payloadCategory) => payloadCategory.breadcrumbs?.length === categorySlugs.length,
+      );
+
+      if (!filteredPayloadCategory.length) {
+        return null;
       }
 
-      return category;
+      return filteredPayloadCategory[0];
     },
-    [`getPayloadCategoryFromParams-${params.slug.join('-')}`],
+    [`getPayloadCategoryFromParams:${params.slug.join('-')}`],
     { revalidate: revalidate },
   )();
 
-const getData = (payloadCategory: PayloadCategory) =>
+const getCategoryData = (payloadCategory: PayloadCategory) =>
   unstable_cache_safe(
     async () => {
       const payload = await getPayload({
@@ -149,7 +156,7 @@ const getData = (payloadCategory: PayloadCategory) =>
         blogPostMetas,
       };
     },
-    [`getData-${payloadCategory.id}`],
+    [`getCategoryData:${payloadCategory.id}`],
     { revalidate: revalidate },
   )();
 
@@ -227,7 +234,7 @@ const CategoryDetailPageHandler = async ({ params: paramsPromise }: { params: Pr
     return null;
   }
 
-  const data = await getData(payloadCategory);
+  const data = await getCategoryData(payloadCategory);
   if (!data) {
     notFound();
     return null;

app/src/app/(frontend)/blog/page.tsx

@@ -58,7 +58,7 @@ const getAllBlogPostMetas = unstable_cache_safe(
       .filter((obj) => obj !== null)
       .sort(sortBlogPostMetaByPublishedAtDate);
   },
-  [`get-all-blog-post-metas`],
+  [`getAllBlogPostMetas`],
   { revalidate: revalidate },
 );
 

app/src/payload/utils/docs/getDocument.ts

@@ -20,7 +20,7 @@ export const getDocumentById = async (
 export const getCachedDocumentById = (relationTo: CollectionSlug, docId: number) =>
   unstable_cache_safe(
     async () => getDocumentById(relationTo, docId),
-    [`payload-get-document-by-id-${relationTo}-${docId}`],
+    [`payload:getDocumentById:${relationTo}:${docId}`],
     {
       tags: ['payload', `payload:collection:${relationTo}`, `payload:collection:${relationTo}:${docId}`],
     },

app/src/payload/utils/redirects/getRedirects.ts

@@ -20,6 +20,6 @@ export const getRedirects = async () => {
 /**
  * Cache all redirects together to avoid multiple fetches.
  */
-export const getCachedRedirects = unstable_cache_safe(async () => getRedirects(), ['redirects'], {
-  tags: ['redirects'],
+export const getCachedRedirects = unstable_cache_safe(async () => getRedirects(), ['payload:getRedirects'], {
+  tags: ['payload', 'redirects'],
 });

app/src/utils/gravatar/gravatar.ts

@@ -34,6 +34,6 @@ export const getCachedGravatarAvatarUrl = ({ email, size = 80, rating = 'pg' }:
     async () => {
       return getGravatarAvatarUrl({ email, size, rating });
     },
-    [`getGravatarAvatarUrl:${email}:${size}:${rating}`],
+    [`gravatar:getGravatarAvatarUrl:${email}:${size}:${rating}`],
     { tags: ['gravatar'], revalidate: 900 },
   )();

app/src/utils/photography/getLatestPhotographyImages.ts

@@ -51,7 +51,7 @@ export const getLatestPhotographyImages = async ({
 
 export const getCachedLatestPhotographyImages = unstable_cache_safe(
   async () => getLatestPhotographyImages({}),
-  ['getLatestPhotographyImages'],
+  ['photography:getLatestPhotographyImages'],
   {
     revalidate: 900,
   },