Fix purchase recording

Author: zackproser

src/app/api/webhooks/stripe/route.ts

@@ -5,7 +5,7 @@ import { sendReceiptEmail, SendReceiptEmailInput } from '@/lib/postmark'
 import { getContentItemByDirectorySlug } from '@/lib/content-handlers'
 import { COURSES_DISABLED } from '@/types'
 import { stripeLogger as logger } from '@/utils/logger' // Import centralized logger
-import { getContentUrl } from '@/lib/content-url'
+import { getContentUrlFromObject } from '@/lib/content-url'
 import { normalizeRouteOrFileSlug } from '@/lib/content-handlers'
 
 // Initialize Stripe and Prisma
@@ -196,7 +196,12 @@ export async function POST(req: Request) {
         })
         logger.info('WEBHOOK: Existing email notifications found:', existingNotification ? 1 : 0)
         // Always use directorySlug for URLs to avoid double-prepending
-        const productUrl = `${process.env.NEXT_PUBLIC_SITE_URL}${getContentUrl(type, directorySlug)}`;
+        let productUrl = '';
+        if (loadedContent) {
+          productUrl = `${process.env.NEXT_PUBLIC_SITE_URL}${getContentUrlFromObject(loadedContent)}`;
+        } else {
+          productUrl = `${process.env.NEXT_PUBLIC_SITE_URL}/${type}/${directorySlug}`;
+        }
         logger.info('WEBHOOK: Preparing to send email')
         const emailInput: SendReceiptEmailInput = {
           From: "[email protected]",

src/app/checkout/result/page.tsx

@@ -8,7 +8,7 @@ import { ContentCard } from '@/components/ContentCard';
 import { Blog } from '@/types';
 import { useSession, signIn } from 'next-auth/react';
 import { sendGTMEvent } from '@next/third-parties/google';
-import { getContentUrl } from '@/lib/content-url';
+import { getContentUrlFromObject } from '@/lib/content-url';
 
 interface PurchasedContent {
   content: Blog;
@@ -68,7 +68,7 @@ function CheckoutResultContent() {
         }
 
         if (authStatus === 'authenticated') {
-          const contentUrl = getContentUrl(data.content.type || 'blog', data.content.directorySlug || '', true);
+          const contentUrl = getContentUrlFromObject(data.content, true);
           setTimeout(() => router.push(contentUrl), 1000);
         }
       } catch (err) {
@@ -166,7 +166,7 @@ function CheckoutResultContent() {
     );
   }
 
-  const contentUrl = getContentUrl(content.content.type || 'blog', content.content.directorySlug || '', true);
+  const contentUrl = getContentUrlFromObject(content.content, true);
 
   return (
     <Container>

src/lib/content-handlers.ts

@@ -1,6 +1,5 @@
-// use server directive might be needed depending on your Next.js setup, 
 // Next.js 15.3 often benefits from it for RSCs involving file system/db
-import 'server-only';
+// import 'server-only';
 
 import { Metadata } from 'next';
 import fs from 'fs';

src/lib/content-url.ts

@@ -1,26 +1,25 @@
+import type { Content } from '@/types/content';
+
 /**
- * Get the content URL based on content type and slug
- * @param contentType The content type (e.g., 'article', 'blog', 'course')
- * @param slug The content slug
- * @param keepLeadingSlash Whether to keep the leading slash (default: true)
- * @returns The URL path for the content
+ * Returns the canonical relative URL path for a given Content object.
+ * Throws if required fields are missing. Never prefixes with baseUrl.
+ * @param content The Content object
+ * @returns The canonical relative URL path for the content
  */
-export function getContentUrl(contentType: string, slug: string, keepLeadingSlash = true) {
+export function getContentUrlFromObject(content: Content, keepLeadingSlash = true): string {
+  if (!content) throw new Error('No content object provided');
+  const { type, directorySlug } = content as any;
+  if (!type) throw new Error('Content object missing type');
+  if (!directorySlug) throw new Error('Content object missing directorySlug');
   // Remove any leading slashes from the slug
-  const cleanSlug = slug.replace(/^\/+/, '');
-  
-  // Generate the URL path based on content type
+  const cleanSlug = directorySlug.replace(/^\/+/,'');
   let url = '';
-  
-  if (contentType === 'article' || contentType === 'blog') {
+  if (type === 'article' || type === 'blog') {
     url = `/blog/${cleanSlug}`;
-  } else if (contentType === 'course') {
+  } else if (type === 'course') {
     url = `/learn/courses/${cleanSlug}/0`;
   } else {
-    // Fallback to a generic path
-    url = `/${contentType}/${cleanSlug}`;
+    url = `/${type}/${cleanSlug}`;
   }
-  
-  // Remove leading slash if needed
   return (keepLeadingSlash || !url.startsWith('/')) ? url : url.substring(1);
 } 

src/lib/postmark.ts

@@ -3,6 +3,7 @@ import { ServerClient } from 'postmark'
 import { getContentWithComponentByDirectorySlug } from "./content-handlers"; // Use this instead of loadContent
 import { ExtendedMetadata } from '@/types'
 import { emailLogger as logger } from '@/utils/logger' // Import centralized email logger
+import { getContentUrlFromObject } from './content-url'
 
 // Define the MessageSendingResponse interface based on Postmark API response
 interface MessageSendingResponse {
@@ -100,15 +101,6 @@ interface SendFreeChaptersEmailInput {
 	}[];
 }
 
-// Function to get the content URL based on content type
-const getContentUrl = (type: string, slug: string) => {
-	// Remove any leading slashes from the slug
-	const cleanSlug = slug.replace(/^\/+/, '');
-	
-	// For all content types, use the /blog/ path since we're only selling blog content
-	return `/blog/${cleanSlug}`;
-};
-
 /**
  * Extract preview content from a product's MDX content using server-side approach
  * @param productSlug The slug of the product
@@ -121,12 +113,10 @@ const getContentUrl = (type: string, slug: string) => {
  */
 async function extractPreviewContent(productSlug: string): Promise<PreviewContentResult | null> {
 	// Remove any leading slashes from the productSlug
-	const normalizedSlug = productSlug.replace(/^\/+/, '');
-	
+	const normalizedSlug = productSlug.replace(/^\/+/,'');
 	// For blog posts, the content type is 'blog'
 	// This assumes all products are blog posts - adjust if you have different content types
 	const contentType = 'blog';
-	
 	logger.info(`Extracting preview content for: ${contentType}/${normalizedSlug}`);
 	// Use getContentWithComponentByDirectorySlug to load content + metadata
 	const result = await getContentWithComponentByDirectorySlug(contentType, normalizedSlug);
@@ -136,13 +126,11 @@ async function extractPreviewContent(productSlug: string): Promise<PreviewConten
 	}
 	// Access the metadata via result.content
 	const { content: metadata } = result;
-	
-	// Create a simple HTML preview with a link to the content
 	logger.info(`Creating preview content...`);
 	try {
 		// Get the base URL
 		const baseUrl = process.env.NEXT_PUBLIC_SITE_URL || 'http://localhost:3000';
-		const productUrl = `${baseUrl}${getContentUrl(contentType, normalizedSlug)}`;
+		const productUrl = `${baseUrl}${getContentUrlFromObject(metadata)}`;
 
 		// Create a simple HTML preview with the description and a link
 		const title = typeof metadata.title === 'string' 
@@ -201,22 +189,29 @@ const sendFreeChaptersEmail = async (
 	logger.debug(`[CONFIG] Base URL: ${baseUrl}`);
 
 	// Normalize the slug and construct the product URL
-	const normalizedSlug = input.ProductSlug.replace(/^\/+/, '');
-	const productUrl = `${baseUrl}${getContentUrl('article', normalizedSlug)}`;
+	const normalizedSlug = input.ProductSlug.replace(/^\/+/,'');
+	let productUrl = '';
+	const result = await getContentWithComponentByDirectorySlug('blog', normalizedSlug);
+	if (result && result.content) {
+		productUrl = `${baseUrl}${getContentUrlFromObject(result.content)}`;
+	} else {
+		logger.warn(`Could not load content for slug: ${input.ProductSlug} to generate product URL.`);
+		productUrl = `${baseUrl}/blog/${normalizedSlug}`; // fallback
+	}
 	logger.debug(`[CONFIG] Product URL: ${productUrl}`);
 
 	// Extract preview content from the actual product
 	logger.info(`[PROCESS] Starting content extraction...`);
 
-	const result = await extractPreviewContent(normalizedSlug);
+	const previewResult = await extractPreviewContent(normalizedSlug);
 
-	if (!result) {
+	if (!previewResult) {
 		logger.warn(`No content found for slug: ${input.ProductSlug}`);
 		return null;
 	}
 
 	// The result from extractPreviewContent already contains the correct metadata
-	const { previewContent, metadata } = result;
+	const { previewContent, metadata } = previewResult;
 
 	logger.debug(`[DEBUG] Result extracted content length: ${previewContent.length} characters`);
 

src/utils/createMetadata.ts

@@ -3,6 +3,7 @@ import { generateOgUrl } from '@/utils/ogUrl'
 import path from 'path'
 import { Metadata } from 'next'
 import { logger } from './logger'
+import { getContentUrlFromObject } from '@/lib/content-url'
 
 // Create a specialized logger for metadata operations
 const metaLogger = logger.forCategory('metadata');
@@ -115,22 +116,6 @@ function getTypeFromPath(filePath: string): 'blog' | 'course' | 'video' | 'demo'
   return 'blog';
 }
 
-/**
- * Generate a URL for any content type and slug
- * @param type Content type
- * @param slug Content slug
- * @returns Full URL path
- */
-function getUrlForContent(type: string, slug: string): string {
-  const baseDir = TYPE_PATHS[type];
-
-  if (!baseDir) {
-    return `/${type}/${slug}`;
-  }
-  
-  return `/${baseDir}/${slug}`;
-}
-
 /**
  * Creates a fully typed ExtendedMetadata object with all required fields
  * @param params Partial metadata parameters
@@ -240,7 +225,10 @@ export function createMetadata(params: MetadataParams): ExtendedMetadata {
   }
 
   // Generate a URL using the type and slug
-  const contentUrl = finalSlug ? getUrlForContent(contentType, finalSlug) : undefined;
+  let contentUrl: string | undefined = undefined;
+  if (contentType && finalSlug) {
+    contentUrl = getContentUrlFromObject({ type: contentType, directorySlug: finalSlug } as any);
+  }
 
   // Fix the type error: pass null for slug parameter to match the expected type
   const ogImageUrl = generateOgUrl({