Merge branch 'develop' into MED-102

lib/services/audit/notificationEntries.service.ts

@@ -8,6 +8,7 @@ export enum NotificationAction {
   PATIENT_ORDER_PROCESSING = 'PATIENT_ORDER_PROCESSING',
   PATIENT_FIRST_RESULTS_RECEIVED = 'PATIENT_FIRST_RESULTS_RECEIVED',
   PATIENT_FULL_RESULTS_RECEIVED = 'PATIENT_FULL_RESULTS_RECEIVED',
+  TTO_ORDER_CONFIRMATION = 'TTO_ORDER_CONFIRMATION',
 }
 
 export const createNotificationLog = async ({

lib/services/medipost/medipostPrivateMessage.service.ts

@@ -28,7 +28,7 @@ import {
   upsertAnalysisResponseElement,
 } from '../analysis-order.service';
 import { logMedipostDispatch } from '../audit.service';
-import { getAnalysisOrder, updateAnalysisOrderStatus } from '../order.service';
+import { getAnalysisOrder } from '../order.service';
 import { parseXML } from '../util/xml.service';
 import { MedipostValidationError } from './MedipostValidationError';
 import {
@@ -43,7 +43,9 @@ const USER = process.env.MEDIPOST_USER!;
 const PASSWORD = process.env.MEDIPOST_PASSWORD!;
 const RECIPIENT = process.env.MEDIPOST_RECIPIENT!;
 
-const IS_ENABLED_DELETE_PRIVATE_MESSAGE = false as boolean;
+const IS_ENABLED_DELETE_PRIVATE_MESSAGE =
+  process.env.MEDIPOST_ENABLE_DELETE_RESPONSE_PRIVATE_MESSAGE_ON_READ ===
+  'true';
 
 export async function getLatestPrivateMessageListItem({
   excludedMessageIds,
@@ -430,14 +432,21 @@ export async function readPrivateMessageResponse({
       medipostExternalOrderId,
     });
     if (status.isPartial) {
-      await updateAnalysisOrderStatus({
+      await createUserAnalysesApi(
+        getSupabaseServerAdminClient(),
+      ).updateAnalysisOrderStatus({
         medusaOrderId,
         orderStatus: 'PARTIAL_ANALYSIS_RESPONSE',
       });
+      if (IS_ENABLED_DELETE_PRIVATE_MESSAGE) {
+        await deletePrivateMessage(privateMessageId);
+      }
       hasAnalysisResponse = true;
       hasPartialAnalysisResponse = true;
     } else if (status.isCompleted) {
-      await updateAnalysisOrderStatus({
+      await createUserAnalysesApi(
+        getSupabaseServerAdminClient(),
+      ).updateAnalysisOrderStatus({
         medusaOrderId,
         orderStatus: 'FULL_ANALYSIS_RESPONSE',
       });
@@ -622,5 +631,10 @@ export async function sendOrderToMedipost({
     hasAnalysisResults: false,
     medusaOrderId,
   });
-  await updateAnalysisOrderStatus({ medusaOrderId, orderStatus: 'PROCESSING' });
+  await createUserAnalysesApi(
+    getSupabaseServerAdminClient(),
+  ).updateAnalysisOrderStatus({
+    medusaOrderId,
+    orderStatus: 'PROCESSING',
+  });
 }

lib/services/medusaCart.service.ts

@@ -31,8 +31,11 @@ const env = () =>
         .min(1),
     })
     .parse({
+      // Use for local testing
       medusaBackendPublicUrl: 'http://webhook.site:3000',
       siteUrl: 'http://webhook.site:3000',
+      // medusaBackendPublicUrl: process.env.MEDUSA_BACKEND_PUBLIC_URL!,
+      // siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,
     });
 
 export async function handleAddToCart({
@@ -42,6 +45,10 @@ export async function handleAddToCart({
   selectedVariant: Pick<StoreProductVariant, 'id'>;
   countryCode: string;
 }) {
+  try {
+  } catch (e) {
+    console.error('medusa card error: ', e);
+  }
   const { account } = await loadCurrentUserAccount();
   if (!account) {
     throw new Error('Account not found');
@@ -85,9 +92,15 @@ export async function handleDeleteCartItem({ lineId }: { lineId: string }) {
 export async function handleNavigateToPayment({
   language,
   paymentSessionId,
+  amount,
+  currencyCode,
+  cartId,
 }: {
   language: string;
   paymentSessionId: string;
+  amount: number;
+  currencyCode: string;
+  cartId: string;
 }) {
   const { account } = await loadCurrentUserAccount();
   if (!account) {
@@ -130,11 +143,11 @@ export async function handleNavigateToPayment({
     await new MontonioOrderHandlerService().getMontonioPaymentLink({
       notificationUrl: `${env().medusaBackendPublicUrl}/hooks/payment/montonio_montonio`,
       returnUrl: `${env().siteUrl}/home/cart/montonio-callback`,
-      amount: cart.total,
-      currency: cart.currency_code.toUpperCase(),
+      amount,
+      currency: currencyCode.toUpperCase(),
       description: `Order from Medreport`,
       locale: language,
-      merchantReference: `${account.id}:${paymentSessionId}:${cart.id}`,
+      merchantReference: `${account.id}:${paymentSessionId}:${cartId}`,
     });
 
   await createCartEntriesLog({

lib/services/order.service.ts

@@ -51,48 +51,6 @@ export async function createAnalysisOrder({
   return orderResult.data.id;
 }
 
-export async function updateAnalysisOrder({
-  orderId,
-  orderStatus,
-}: {
-  orderId: number;
-  orderStatus: Tables<{ schema: 'medreport' }, 'analysis_orders'>['status'];
-}) {
-  console.info(`Updating order id=${orderId} status=${orderStatus}`);
-  await getSupabaseServerAdminClient()
-    .schema('medreport')
-    .from('analysis_orders')
-    .update({
-      status: orderStatus,
-    })
-    .eq('id', orderId)
-    .throwOnError();
-}
-
-export async function updateAnalysisOrderStatus({
-  orderId,
-  medusaOrderId,
-  orderStatus,
-}: {
-  orderId?: number;
-  medusaOrderId?: string;
-  orderStatus: Tables<{ schema: 'medreport' }, 'analysis_orders'>['status'];
-}) {
-  const orderIdParam = orderId;
-  const medusaOrderIdParam = medusaOrderId;
-  if (!orderIdParam && !medusaOrderIdParam) {
-    throw new Error('Either orderId or medusaOrderId must be provided');
-  }
-  await getSupabaseServerAdminClient()
-    .schema('medreport')
-    .rpc('update_analysis_order_status', {
-      order_id: orderIdParam ?? -1,
-      status_param: orderStatus,
-      medusa_order_id_param: medusaOrderIdParam ?? '',
-    })
-    .throwOnError();
-}
-
 export async function getAnalysisOrder({
   medusaOrderId,
   analysisOrderId,