Merge branch 'develop' of https://github.com/MR-medreport/MRB2B into MED-103

app/home/(user)/(dashboard)/analysis-results/[id]/page.tsx

@@ -1,4 +1,5 @@
 import Link from 'next/link';
+import { redirect } from 'next/navigation';
 
 import { ButtonTooltip } from '@kit/shared/components/ui/button-tooltip';
 import { pathsConfig } from '@kit/shared/config';
@@ -22,14 +23,15 @@ export default async function AnalysisResultsPage({
     id: string;
   }>;
 }) {
-  const account = await loadCurrentUserAccount();
+  const { id: analysisOrderId } = await params;
 
-  const { id: analysisResponseId } = await params;
+  const [{ account }, analysisResponse] = await Promise.all([
+    loadCurrentUserAccount(),
+    loadUserAnalysis(Number(analysisOrderId)),
+  ]);
 
-  const analysisResponse = await loadUserAnalysis(Number(analysisResponseId));
-
-  if (!account?.id || !analysisResponse) {
-    return null;
+  if (!account?.id) {
+    return redirect("/");
   }
 
   await createPageViewLog({
@@ -37,6 +39,19 @@ export default async function AnalysisResultsPage({
     action: PageViewAction.VIEW_ANALYSIS_RESULTS,
   });
 
+  if (!analysisResponse) {
+    return (
+      <>
+        <PageHeader
+          title={<Trans i18nKey="analysis-results:pageTitle" />}
+          description={<Trans i18nKey="analysis-results:descriptionEmpty" />}
+        />
+        <PageBody className="gap-4">
+        </PageBody>
+      </>
+    );
+  }
+
   return (
     <>
       <PageHeader />

app/home/(user)/(dashboard)/booking/page.tsx

@@ -28,9 +28,13 @@ function BookingPage() {
     return (
       <>
         <AppBreadcrumbs />
-        <h3 className="mt-8">
+        <HomeLayoutPageHeader
+          title={<Trans i18nKey={'booking:title'} />}
+          description={<Trans i18nKey={'booking:description'} />}
+        />
+        <h4 className="mt-8">
           <Trans i18nKey="booking:noCategories" />
-        </h3>
+        </h4>
       </>
     );
   }

app/home/(user)/(dashboard)/cart/montonio-callback/actions.ts

@@ -7,13 +7,15 @@ import { loadCurrentUserAccount } from "@/app/home/(user)/_lib/server/load-user-
 import { listProductTypes } from "@lib/data/products";
 import { placeOrder, retrieveCart } from "@lib/data/cart";
 import { createI18nServerInstance } from "~/lib/i18n/i18n.server";
-import { createOrder } from '~/lib/services/order.service';
+import { createAnalysisOrder, getAnalysisOrder } from '~/lib/services/order.service';
 import { getOrderedAnalysisIds, sendOrderToMedipost } from '~/lib/services/medipost.service';
 import { createNotificationsApi } from '@kit/notifications/api';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
-import { AccountWithParams } from '@kit/accounts/api';
+import type { AccountWithParams } from '@kit/accounts/api';
+import type { StoreOrder } from '@medusajs/types';
 
 const ANALYSIS_PACKAGES_TYPE_HANDLE = 'analysis-packages';
+const ANALYSIS_TYPE_HANDLE = 'synlab-analysis';
 const MONTONIO_PAID_STATUS = 'PAID';
 
 const env = () => z
@@ -28,24 +30,27 @@ const env = () => z
         error: 'NEXT_PUBLIC_SITE_URL is required',
       })
       .min(1),
+    isEnabledDispatchOnMontonioCallback: z
+      .boolean({
+        error: 'MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK is required',
+      }),
   })
   .parse({
     emailSender: process.env.EMAIL_SENDER,
     siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,
+    isEnabledDispatchOnMontonioCallback: process.env.MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK === 'true',
   });
 
 const sendEmail = async ({
   account,
   email,
   analysisPackageName,
-  personName,
   partnerLocationName,
   language,
 }: {
-  account: AccountWithParams,
+  account: Pick<AccountWithParams, 'name' | 'id'>,
   email: string,
   analysisPackageName: string,
-  personName: string,
   partnerLocationName: string,
   language: string,
 }) => {
@@ -58,7 +63,7 @@ const sendEmail = async ({
 
     const { html, subject } = await renderSynlabAnalysisPackageEmail({
       analysisPackageName,
-      personName,
+      personName: account.name,
       partnerLocationName,
       language,
     });
@@ -83,9 +88,7 @@ const sendEmail = async ({
   }
 }
 
-export async function processMontonioCallback(orderToken: string) {
-  const { language } = await createI18nServerInstance();
-
+async function decodeOrderToken(orderToken: string) {
   const secretKey = process.env.MONTONIO_SECRET_KEY as string;
 
   const decoded = jwt.verify(orderToken, secretKey, {
@@ -96,54 +99,120 @@ export async function processMontonioCallback(orderToken: string) {
     throw new Error("Payment not successful");
   }
 
-  const account = await loadCurrentUserAccount();
+  return decoded;
+}
+
+async function getCartByOrderToken(decoded: MontonioOrderToken) {
+  const [, , cartId] = decoded.merchantReferenceDisplay.split(':');
+  if (!cartId) {
+    throw new Error("Cart ID not found");
+  }
+  const cart = await retrieveCart(cartId);
+  if (!cart) {
+    throw new Error("Cart not found");
+  }
+  return cart;
+}
+
+async function getOrderResultParameters(medusaOrder: StoreOrder) {
+  const { productTypes } = await listProductTypes();
+  const analysisPackagesType = productTypes.find(({ metadata }) => metadata?.handle === ANALYSIS_PACKAGES_TYPE_HANDLE);
+  const analysisType = productTypes.find(({ metadata }) => metadata?.handle === ANALYSIS_TYPE_HANDLE);
+
+  const analysisPackageOrderItem = medusaOrder.items?.find(({ product_type_id }) => product_type_id === analysisPackagesType?.id);
+  const analysisItems = medusaOrder.items?.filter(({ product_type_id }) => product_type_id === analysisType?.id);
+
+  return {
+    medusaOrderId: medusaOrder.id,
+    email: medusaOrder.email,
+    analysisPackageOrder: analysisPackageOrderItem
+      ? {
+        partnerLocationName: analysisPackageOrderItem?.metadata?.partner_location_name as string ?? '',
+        analysisPackageName: analysisPackageOrderItem?.title ?? '',
+      }
+      : null,
+    analysisItemsOrder: Array.isArray(analysisItems) && analysisItems.length > 0
+      ? analysisItems.map(({ product }) => ({
+          analysisName: product?.title ?? '',
+          analysisId: product?.metadata?.analysisIdOriginal as string ?? '',
+        }))
+      : null,
+  };
+}
+
+async function sendAnalysisPackageOrderEmail({
+  account,
+  email,
+  analysisPackageOrder,
+}: {
+  account: AccountWithParams,
+  email: string,
+  analysisPackageOrder: {
+    partnerLocationName: string,
+    analysisPackageName: string,
+  },
+}) {
+  const { language } = await createI18nServerInstance();
+  const { analysisPackageName, partnerLocationName } = analysisPackageOrder;
+  try {
+    await sendEmail({
+      account: { id: account.id, name: account.name },
+      email,
+      analysisPackageName,
+      partnerLocationName,
+      language,
+    });
+  } catch (error) {
+    console.error("Failed to send email", error);
+  }
+}
+
+export async function processMontonioCallback(orderToken: string) {
+  const { account } = await loadCurrentUserAccount();
   if (!account) {
     throw new Error("Account not found in context");
   }
 
   try {
-    const [, , cartId] = decoded.merchantReferenceDisplay.split(':');
-    if (!cartId) {
-      throw new Error("Cart ID not found");
-    }
+    const decoded = await decodeOrderToken(orderToken);
+    const cart = await getCartByOrderToken(decoded);
 
-    const cart = await retrieveCart(cartId);
-    if (!cart) {
-      throw new Error("Cart not found");
-    }
-
-
-    const medusaOrder = await placeOrder(cartId, { revalidateCacheTags: false });
+    const medusaOrder = await placeOrder(cart.id, { revalidateCacheTags: false });
     const orderedAnalysisElements = await getOrderedAnalysisIds({ medusaOrder });
-    const orderId = await createOrder({ medusaOrder, orderedAnalysisElements });
 
-    const { productTypes } = await listProductTypes();
-    const analysisPackagesType = productTypes.find(({ metadata }) => metadata?.handle === ANALYSIS_PACKAGES_TYPE_HANDLE);
-    const analysisPackageOrderItem = medusaOrder.items?.find(({ product_type_id }) => product_type_id === analysisPackagesType?.id);
+    try {
+      const existingAnalysisOrder = await getAnalysisOrder({ medusaOrderId: medusaOrder.id });
+      console.info(`Analysis order already exists for medusaOrderId=${medusaOrder.id}, orderId=${existingAnalysisOrder.id}`);
+      return { success: true, orderId: existingAnalysisOrder.id };
+    } catch {
+      // ignored
+    }
 
-    const orderResult = {
-      medusaOrderId: medusaOrder.id,
-      email: medusaOrder.email,
-      partnerLocationName: analysisPackageOrderItem?.metadata?.partner_location_name as string ?? '',
-      analysisPackageName: analysisPackageOrderItem?.title ?? '',
-      orderedAnalysisElements,
-    };
+    const orderId = await createAnalysisOrder({ medusaOrder, orderedAnalysisElements });
+    const orderResult = await getOrderResultParameters(medusaOrder);
 
-    const { medusaOrderId, email, partnerLocationName, analysisPackageName } = orderResult;
-    const personName = account.name;
+    const { medusaOrderId, email, analysisPackageOrder, analysisItemsOrder } = orderResult;
 
-    if (email && analysisPackageName) {
-      try {
-        await sendEmail({ account, email, analysisPackageName, personName, partnerLocationName, language });
-      } catch (error) {
-        console.error("Failed to send email", error);
+    if (email) {
+      if (analysisPackageOrder) {
+        await sendAnalysisPackageOrderEmail({ account, email, analysisPackageOrder });
+      } else {
+        console.info(`Order has no analysis package, skipping email.`);
+      }
+
+      if (analysisItemsOrder) {
+        // @TODO send email for separate analyses
+        console.warn(`Order has analysis items, but no email template exists yet`);
+      } else {
+        console.info(`Order has no analysis items, skipping email.`);
       }
     } else {
-      // @TODO send email for separate analyses
-      console.error("Missing email or analysisPackageName", orderResult);
+      console.error("Missing email to send order result email", orderResult);
     }
 
-    await sendOrderToMedipost({ medusaOrderId, orderedAnalysisElements });
+    if (env().isEnabledDispatchOnMontonioCallback) {
+      await sendOrderToMedipost({ medusaOrderId, orderedAnalysisElements });
+    }
 
     return { success: true, orderId };
   } catch (error) {

app/home/(user)/(dashboard)/cart/page.tsx

@@ -8,6 +8,7 @@ import Cart from '../../_components/cart';
 import { listProductTypes } from '@lib/data/products';
 import CartTimer from '../../_components/cart/cart-timer';
 import { Trans } from '@kit/ui/trans';
+import { withI18n } from '~/lib/i18n/with-i18n';
 
 export async function generateMetadata() {
   const { t } = await createI18nServerInstance();
@@ -17,9 +18,9 @@ export async function generateMetadata() {
   };
 }
 
-export default async function CartPage() {
+async function CartPage() {
   const cart = await retrieveCart().catch((error) => {
-    console.error(error);
+    console.error("Failed to retrieve cart", error);
     return notFound();
   });
 
@@ -50,3 +51,5 @@ export default async function CartPage() {
     </PageBody>
   );
 }
+
+export default withI18n(CartPage);

app/home/(user)/(dashboard)/order-analysis/page.tsx

@@ -18,7 +18,7 @@ export const generateMetadata = async () => {
 };
 
 async function OrderAnalysisPage() {
-  const account = await loadCurrentUserAccount();
+  const { account } = await loadCurrentUserAccount();
   if (!account) {
     throw new Error('Account not found');
   }

app/home/(user)/(dashboard)/order-health-analysis/page.tsx

@@ -21,6 +21,9 @@ async function OrderHealthAnalysisPage() {
         description={<Trans i18nKey={'order-health-analysis:description'} />}
       />
       <PageBody>
+        <h4 className="mt-8">
+          <Trans i18nKey="booking:noCategories" />
+        </h4>
       </PageBody>
     </>
   );

app/home/(user)/(dashboard)/order/[orderId]/confirmed/page.tsx

@@ -4,7 +4,7 @@ import { PageBody, PageHeader } from '@kit/ui/page';
 import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
-import { getOrder } from '~/lib/services/order.service';
+import { getAnalysisOrder } from '~/lib/services/order.service';
 import { retrieveOrder } from '@lib/data/orders';
 import { pathsConfig } from '@kit/shared/config';
 
@@ -27,7 +27,7 @@ async function OrderConfirmedPage(props: {
 }) {
   const params = await props.params;
 
-  const order = await getOrder({ orderId: Number(params.orderId) }).catch(() => null);
+  const order = await getAnalysisOrder({ analysisOrderId: Number(params.orderId) }).catch(() => null);
   if (!order) {
     redirect(pathsConfig.app.myOrders);
   }

app/home/(user)/(dashboard)/order/[orderId]/page.tsx

@@ -4,7 +4,7 @@ import { PageBody, PageHeader } from '@kit/ui/page';
 import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
-import { getOrder } from '~/lib/services/order.service';
+import { getAnalysisOrder } from '~/lib/services/order.service';
 import { retrieveOrder } from '@lib/data/orders';
 import { pathsConfig } from '@kit/shared/config';
 
@@ -27,7 +27,7 @@ async function OrderConfirmedPage(props: {
 }) {
   const params = await props.params;
 
-  const order = await getOrder({ orderId: Number(params.orderId) }).catch(() => null);
+  const order = await getAnalysisOrder({ analysisOrderId: Number(params.orderId) }).catch(() => null);
   if (!order) {
     redirect(pathsConfig.app.myOrders);
   }

app/home/(user)/(dashboard)/order/page.tsx

@@ -61,6 +61,11 @@ async function OrdersPage() {
             </React.Fragment>
           )
         })}
+        {analysisOrders.length === 0 && (
+          <h5 className="mt-6">
+            <Trans i18nKey="orders:noOrders" />
+          </h5>
+        )}
       </PageBody>
     </>
   );

app/home/(user)/(dashboard)/page.tsx

@@ -26,8 +26,8 @@ export const generateMetadata = async () => {
 async function UserHomePage() {
   const client = getSupabaseServerClient();
 
-  const account = await loadCurrentUserAccount();
-  const api = await createAccountsApi(client);
+  const { account } = await loadCurrentUserAccount();
+  const api = createAccountsApi(client);
   const bmiThresholds = await api.fetchBmiThresholds();
 
   if (!account) {