fix conflict duplicates

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

@@ -1,10 +1,5 @@
 'use server';
 
-import { MontonioOrderToken } from '@/app/home/(user)/_components/cart/types';
-import { loadCurrentUserAccount } from '@/app/home/(user)/_lib/server/load-user-account';
-import { placeOrder, retrieveCart } from '@lib/data/cart';
-import { listProductTypes } from '@lib/data/products';
-import type { StoreOrder } from '@medusajs/types';
 import { MontonioOrderToken } from '@/app/home/(user)/_components/cart/types';
 import { loadCurrentUserAccount } from '@/app/home/(user)/_lib/server/load-user-account';
 import { placeOrder, retrieveCart } from '@lib/data/cart';
@@ -12,37 +7,26 @@ import { listProductTypes } from '@lib/data/products';
 import type { StoreOrder } from '@medusajs/types';
 import jwt from 'jsonwebtoken';
 import { z } from 'zod';
+
+import { AccountWithParams } from '@kit/accounts/types/accounts';
 import { createNotificationsApi } from '@kit/notifications/api';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
+
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
-import {
-  bookAppointment,
-} from '~/lib/services/connected-online.service';
-import { FailureReason } from '~/lib/types/connected-online';
-import { createAnalysisOrder, getAnalysisOrder } from '~/lib/services/order.service';
+import { bookAppointment } from '~/lib/services/connected-online.service';
 import { sendOrderToMedipost } from '~/lib/services/medipost/medipostPrivateMessage.service';
 import { getOrderedAnalysisIds } from '~/lib/services/medusaOrder.service';
-import { AccountWithParams } from '@kit/accounts/types/accounts';
+import {
+  createAnalysisOrder,
+  getAnalysisOrder,
+} from '~/lib/services/order.service';
 import { getOrderedTtoServices } from '~/lib/services/reservation.service';
+import { FailureReason } from '~/lib/types/connected-online';
 
 const ANALYSIS_PACKAGES_TYPE_HANDLE = 'analysis-packages';
 const ANALYSIS_TYPE_HANDLE = 'synlab-analysis';
 const MONTONIO_PAID_STATUS = 'PAID';
 
-const env = () =>
-  z
-    .object({
-      emailSender: z
-        .string({
-          error: 'EMAIL_SENDER is required',
-        })
-        .min(1),
-      siteUrl: z
-        .string({
-          error: 'NEXT_PUBLIC_SITE_URL is required',
-        })
-        .min(1),
-      isEnabledDispatchOnMontonioCallback: z.boolean({
 const env = () =>
   z
     .object({
@@ -66,13 +50,6 @@ const env = () =>
       isEnabledDispatchOnMontonioCallback:
         process.env.MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK === 'true',
     });
-    })
-    .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,
@@ -86,17 +63,9 @@ const sendEmail = async ({
   analysisPackageName: string;
   partnerLocationName: string;
   language: string;
-  account: Pick<AccountWithParams, 'name' | 'id'>;
-  email: string;
-  analysisPackageName: string;
-  partnerLocationName: string;
-  language: string;
 }) => {
   const client = getSupabaseServerAdminClient();
   try {
-    const { renderSynlabAnalysisPackageEmail } = await import(
-      '@kit/email-templates'
-    );
     const { renderSynlabAnalysisPackageEmail } = await import(
       '@kit/email-templates'
     );
@@ -133,7 +102,6 @@ const sendEmail = async ({
     throw new Error(`Failed to send email, message=${error}`);
   }
 };
-};
 
 async function decodeOrderToken(orderToken: string) {
   const secretKey = process.env.MONTONIO_SECRET_KEY as string;
@@ -144,7 +112,6 @@ async function decodeOrderToken(orderToken: string) {
 
   if (decoded.paymentStatus !== MONTONIO_PAID_STATUS) {
     throw new Error('Payment not successful');
-    throw new Error('Payment not successful');
   }
 
   return decoded;
@@ -154,12 +121,10 @@ async function getCartByOrderToken(decoded: MontonioOrderToken) {
   const [, , cartId] = decoded.merchantReferenceDisplay.split(':');
   if (!cartId) {
     throw new Error('Cart ID not found');
-    throw new Error('Cart ID not found');
   }
   const cart = await retrieveCart(cartId);
   if (!cart) {
     throw new Error('Cart not found');
-    throw new Error('Cart not found');
   }
   return cart;
 }
@@ -206,17 +171,12 @@ async function sendAnalysisPackageOrderEmail({
   email,
   analysisPackageOrder,
 }: {
-  account: AccountWithParams;
-  email: string;
   account: AccountWithParams;
   email: string;
   analysisPackageOrder: {
     partnerLocationName: string;
     analysisPackageName: string;
   };
-    partnerLocationName: string;
-    analysisPackageName: string;
-  };
 }) {
   const { language } = await createI18nServerInstance();
   const { analysisPackageName, partnerLocationName } = analysisPackageOrder;
@@ -238,15 +198,18 @@ export async function processMontonioCallback(orderToken: string) {
   const { account } = await loadCurrentUserAccount();
   if (!account) {
     throw new Error('Account not found in context');
-    throw new Error('Account not found in context');
   }
 
   try {
     const decoded = await decodeOrderToken(orderToken);
     const cart = await getCartByOrderToken(decoded);
 
-    const medusaOrder = await placeOrder(cart.id, { revalidateCacheTags: false });
-    const orderedAnalysisElements = await getOrderedAnalysisIds({ medusaOrder });
+    const medusaOrder = await placeOrder(cart.id, {
+      revalidateCacheTags: false,
+    });
+    const orderedAnalysisElements = await getOrderedAnalysisIds({
+      medusaOrder,
+    });
 
     const orderContainsSynlabItems = !!orderedAnalysisElements?.length;
 
@@ -272,7 +235,8 @@ export async function processMontonioCallback(orderToken: string) {
 
     const orderResult = await getOrderResultParameters(medusaOrder);
 
-    const { medusaOrderId, email, analysisPackageOrder, analysisItemsOrder } = orderResult;
+    const { medusaOrderId, email, analysisPackageOrder, analysisItemsOrder } =
+      orderResult;
 
     const orderedTtoServices = await getOrderedTtoServices({ medusaOrder });
     let bookServiceResults: {
@@ -314,7 +278,6 @@ export async function processMontonioCallback(orderToken: string) {
       }
     } else {
       console.error('Missing email to send order result email', orderResult);
-      console.error('Missing email to send order result email', orderResult);
     }
 
     if (env().isEnabledDispatchOnMontonioCallback && orderContainsSynlabItems) {
@@ -334,7 +297,6 @@ export async function processMontonioCallback(orderToken: string) {
 
     return { success: true, orderId };
   } catch (error) {
-    console.error('Failed to place order', error);
     console.error('Failed to place order', error);
     throw new Error(`Failed to place order, message=${error}`);
   }

app/home/(user)/(dashboard)/cart/montonio-callback/error/page.tsx

@@ -2,20 +2,15 @@ import { use } from 'react';
 
 import Link from 'next/link';
 
-import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
 import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
 import { PageBody, PageHeader } from '@/packages/ui/src/makerkit/page';
 
-import { Button } from '@kit/ui/button';
-
+import { toArray } from '@kit/shared/utils';
 import { Button } from '@kit/ui/button';
 import { Alert, AlertDescription } from '@kit/ui/shadcn/alert';
 import { AlertTitle } from '@kit/ui/shadcn/alert';
 import { Trans } from '@kit/ui/trans';
 
-import { FailureReason } from '~/lib/types/connected-online';
-import { toArray } from '~/lib/utils';
-
 export async function generateMetadata() {
   const { t } = await createI18nServerInstance();