Merge branch 'develop' into MED-177

lib/services/doctor-jobs.service.ts

@@ -7,6 +7,7 @@ async function getAssignedOrderIds() {
     .schema('medreport')
     .from('doctor_analysis_feedback')
     .select('analysis_order_id')
+    .not('status', 'is', 'COMPLETED')
     .not('doctor_user_id', 'is', null)
     .throwOnError();
 

lib/services/medipost/medipostPrivateMessage.service.ts

@@ -120,7 +120,7 @@ export async function canCreateAnalysisResponseElement({
 
   if (existingAnalysisResponseElement.response_value && !responseValue) {
     log(
-      `Analysis response element id=${analysisElementOriginalId} already exists for order with response value ${existingAnalysisResponseElement.response_value} but new response has no value`,
+      `Analysis response element id=${analysisElementOriginalId}   ${existingAnalysisResponseElement.response_value} but new response has no value`,
     );
     return false;
   }
@@ -371,8 +371,13 @@ export async function readPrivateMessageResponse({
     const hasInvalidOrderId = isNaN(analysisOrderId);
 
     if (hasInvalidOrderId || !messageResponse || !patientPersonalCode) {
+      console.log({
+        privateMessageContent,
+        saadetis: privateMessageContent?.Saadetis,
+        messageResponse,
+      });
       console.error(
-        `Invalid order id or message response or patient personal code, medipostExternalOrderId=${medipostExternalOrderId}, privateMessageId=${privateMessageId}`,
+        `Invalid !order id or message response or patient personal code, medipostExternalOrderId=${medipostExternalOrderId}, privateMessageId=${privateMessageId}`,
       );
       await upsertMedipostActionLog({
         action: 'sync_analysis_results_from_medipost',
@@ -397,7 +402,7 @@ export async function readPrivateMessageResponse({
     try {
       analysisOrder = await getAnalysisOrder({ analysisOrderId });
       medusaOrderId = analysisOrder.medusa_order_id;
-    } catch (e) {
+    } catch {
       if (IS_ENABLED_DELETE_PRIVATE_MESSAGE) {
         await deletePrivateMessage(privateMessageId);
       }
@@ -568,7 +573,6 @@ export async function sendOrderToMedipost({
       phone: account.phone ?? '',
     },
     orderId: medreportOrder.id,
-    orderCreatedAt: new Date(medreportOrder.created_at),
     comment: '',
   });
 

lib/services/medipost/medipostXML.service.ts

@@ -33,7 +33,6 @@ export async function composeOrderXML({
   analysisElements,
   person,
   orderId,
-  orderCreatedAt,
   comment,
 }: {
   analyses: AnalysesWithGroupsAndElements;
@@ -45,7 +44,6 @@ export async function composeOrderXML({
     phone: string;
   };
   orderId: number;
-  orderCreatedAt: Date;
   comment?: string;
 }) {
   const analysisGroups: Tables<{ schema: 'medreport' }, 'analysis_groups'>[] =

lib/services/medusaCart.service.ts

@@ -2,6 +2,7 @@
 
 import { loadCurrentUserAccount } from '@/app/home/(user)/_lib/server/load-user-account';
 import { MontonioOrderHandlerService } from '@/packages/billing/montonio/src';
+import { getLogger } from '@/packages/shared/src/logger';
 import { addToCart, deleteLineItem, retrieveCart } from '@lib/data/cart';
 import { getCartId } from '@lib/data/cookies';
 import { StoreCartLineItem, StoreProductVariant } from '@medusajs/types';
@@ -44,12 +45,17 @@ export async function handleAddToCart({
   selectedVariant: Pick<StoreProductVariant, 'id'>;
   countryCode: string;
 }) {
-  try {
-  } catch (e) {
-    console.error('medusa card error: ', e);
-  }
+  const logger = await getLogger();
+  const ctx = {
+    countryCode,
+    selectedVariant,
+  };
+
+  logger.info(ctx, 'Adding to cart...');
+
   const { account } = await loadCurrentUserAccount();
   if (!account) {
+    logger.error(ctx, 'Account not found');
     throw new Error('Account not found');
   }