feat(MED-131): fix medusa vs medipost vs b2b product ids mixed

app/api/order/medipost-test-response/route.ts

@@ -3,6 +3,7 @@ import { getOrder } from "~/lib/services/order.service";
 import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service";
 import { retrieveOrder } from "@lib/data";
 import { getAccountAdmin } from "~/lib/services/account.service";
+import { getOrderedAnalysisElementsIds } from "~/lib/services/medipost.service";
 
 export async function POST(request: Request) {
   const isDev = process.env.NODE_ENV === 'development';
@@ -16,19 +17,9 @@ export async function POST(request: Request) {
   const medreportOrder = await getOrder({ medusaOrderId });
 
   const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id });
+  const orderedAnalysisElementsIds = await getOrderedAnalysisElementsIds({ medusaOrder });
 
-  const ANALYSIS_ELEMENT_HANDLE_PREFIX = 'analysis-element-';
-  const orderedAnalysisElementsIds = (medusaOrder?.items ?? [])
-    .filter((item) => item.product?.handle?.startsWith(ANALYSIS_ELEMENT_HANDLE_PREFIX))
-    .map((item) => {
-      const id = Number(item.product?.handle?.replace(ANALYSIS_ELEMENT_HANDLE_PREFIX, ''));
-      if (Number.isNaN(id)) {
-        return null;
-      }
-      return id;
-    })
-    .filter(Boolean) as number[];
-
+  console.info(`Sending test response for order=${medusaOrderId} with ${orderedAnalysisElementsIds.length} ordered analysis elements`);
   const messageXml = await composeOrderTestResponseXML({
     person: {
       idCode: account.personal_code!,
@@ -36,7 +27,7 @@ export async function POST(request: Request) {
       lastName: account.last_name ?? '',
       phone: account.phone ?? '',
     },
-    orderedAnalysisElementsIds,
+    orderedAnalysisElementsIds: orderedAnalysisElementsIds.map(({ analysisElementId }) => analysisElementId),
     orderedAnalysesIds: [],
     orderId: medusaOrderId,
     orderCreatedAt: new Date(medreportOrder.created_at),

app/home/(user)/(dashboard)/cart/montonio-callback/[montonioId]/route.ts

@@ -6,7 +6,7 @@ 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 { sendOrderToMedipost } from '~/lib/services/medipost.service';
+import { getOrderedAnalysisElementsIds, sendOrderToMedipost } from '~/lib/services/medipost.service';
 
 const emailSender = process.env.EMAIL_SENDER;
 const siteUrl = process.env.NEXT_PUBLIC_SITE_URL!;
@@ -88,7 +88,8 @@ const handleOrderToken = async (orderToken: string) => {
     }
 
     const medusaOrder = await placeOrder(cartId, { revalidateCacheTags: true });
-    await createOrder({ medusaOrder: medusaOrder });
+    const orderedAnalysisElements = await getOrderedAnalysisElementsIds({ medusaOrder });
+    await createOrder({ medusaOrder, orderedAnalysisElements });
 
     const { productTypes } = await listProductTypes();
     const analysisPackagesType = productTypes.find(({ metadata }) => metadata?.handle === ANALYSIS_PACKAGES_TYPE_HANDLE);
@@ -98,6 +99,7 @@ const handleOrderToken = async (orderToken: string) => {
       email: medusaOrder.email,
       partnerLocationName: analysisPackageOrderItem?.metadata?.partner_location_name as string ?? '',
       analysisPackageName: analysisPackageOrderItem?.title ?? '',
+      orderedAnalysisElements,
     };
   } catch (error) {
     console.error("Failed to place order", error);
@@ -124,15 +126,19 @@ export async function GET(request: Request) {
       throw new Error("Order result is missing");
     }
 
-    const { medusaOrderId, email, partnerLocationName, analysisPackageName } = orderResult;
+    const { medusaOrderId, email, partnerLocationName, analysisPackageName, orderedAnalysisElements } = orderResult;
     const personName = account.name;
     if (email && analysisPackageName) {
-      await sendEmail({ email, analysisPackageName, personName, partnerLocationName, language });
+      try {
+        await sendEmail({ email, analysisPackageName, personName, partnerLocationName, language });
+      } catch (error) {
+        console.error("Failed to send email", error);
+      }
     } else {
       // @TODO send email for separate analyses
       console.error("Missing email or analysisPackageName", orderResult);
     }
-    sendOrderToMedipost({ medusaOrderId })
+    sendOrderToMedipost({ medusaOrderId, orderedAnalysisElements })
     return Response.redirect(new URL('/home/order', baseUrl))
   } catch (error) {
     console.error("Failed to place order", error);